The branch, dharma-pre has been updated
via 7bab9a52a7d7caf73131024c3cddf1d95175470d (commit)
from 2925cfe9a1d00868b6828db2856a5b11742ac62a (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=7bab9a52a7d7caf73131024c3cddf1d95175470d
commit 7bab9a52a7d7caf73131024c3cddf1d95175470d
Author: amet <a...@nospam>
Date: Wed Oct 13 22:02:02 2010 +0400
[script.onmytv] - v0.0.2
* Fixed cache bug (listings were not being updated)
* Changed Addon Name to "On-My.TV Listings"
* Fixed vertical positioning of episode summary when no screen cap is
available.
diff --git a/script.onmytv/README.md b/script.onmytv/README.md
index 5ec2f7a..b1301b4 100644
--- a/script.onmytv/README.md
+++ b/script.onmytv/README.md
@@ -1,2 +1,7 @@
This is an XBMC script to view listings from on-my.tv.
+It supports both filtered and unfiltered listings. To enable this feature you
must
+visit http://on-my.tv/ and register. You will be given a 32-character 'UID'
which
+you must enter in the plugin cocnfiguration dialog.
+
+
diff --git a/script.onmytv/addon.xml b/script.onmytv/addon.xml
index 83517f1..df451a1 100644
--- a/script.onmytv/addon.xml
+++ b/script.onmytv/addon.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.onmytv"
- name="TV Listings"
- version="0.0.1"
- provider-name="andre_pl">
+ name="On-My.TV Listings"
+ version="0.0.2"
+ provider-name="Andre LeBlanc <[email protected]>">
<requires>
<import addon="xbmc.python" version="1.0"/>
<import addon="script.module.simplejson" version="2.0.9"/>
diff --git a/script.onmytv/changelog.txt b/script.onmytv/changelog.txt
index f72ce76..95ae7b2 100644
--- a/script.onmytv/changelog.txt
+++ b/script.onmytv/changelog.txt
@@ -1,2 +1,7 @@
Version 0.0.1
* Initial release
+
+Version 0.0.2
+ * Fixed cache bug (listings were not being updated)
+ * Changed Addon Name to "On-My.TV Listings"
+ * Fixed vertical positioning of episode summary when no screen cap is
available.
\ No newline at end of file
diff --git a/script.onmytv/resources/lib/gui.py
b/script.onmytv/resources/lib/gui.py
index a982d04..c860183 100644
--- a/script.onmytv/resources/lib/gui.py
+++ b/script.onmytv/resources/lib/gui.py
@@ -174,7 +174,7 @@ class EpisodeInfoGUI(xbmcgui.WindowXMLDialog):
left_margin = 50
top = 50
if not self.episode_set:
- self.getControl(1).setLabel("%s %sx%02d" %
(self.episode['show_name'], self.episode['season'],
int(self.episode['episode'])))
+ self.getControl(1).setLabel("%s - %sx%02d - %s" %
(self.episode['show_name'], self.episode['season'],
int(self.episode['episode']), self.episode['name']))
if self.episode['screen_cap']:
progress_dialog = xbmcgui.DialogProgress()
progress_dialog.create("Downloading Screenshot","")
@@ -193,11 +193,13 @@ class EpisodeInfoGUI(xbmcgui.WindowXMLDialog):
imctl =
xbmcgui.ControlImage(50,40,image.size[0]*(240/float(image.size[1])),240,filename)
self.addControl(imctl)
top = 50 + image.size[1]
-
except:
pass
progress_dialog.close()
-
+ else:
+ self.getControl(99).setPosition(50,top)
+ self.getControl(99).setHeight(480)
+
self.getControl(99).setText(self.episode['episode_summary'])
self.episode_set = True
# print "SIZE: %sx%s" % im.size
diff --git a/script.onmytv/resources/lib/onmytv.py
b/script.onmytv/resources/lib/onmytv.py
index 6518a36..69a73eb 100644
--- a/script.onmytv/resources/lib/onmytv.py
+++ b/script.onmytv/resources/lib/onmytv.py
@@ -22,18 +22,24 @@ class OnMyTV(object):
self.cache_dir = cache_dir
self.uid = uid
self.base_url = "http://next.seven.days.on-my.tv/?xml";
- self.max_age = max_cache_age or 60*60
+ self.max_age = int(max_cache_age) or 60*60
self.full_listing = {}
self.user_listing = {}
def check_cache(self, dest):
- now = time.time()
+ now = int(time.time())
+ print 'checking cache: NOW: %s' % (now,)
if not os.path.exists(dest):
+ print "%s doesn't exist" % (dest,)
return False
else:
- cachetime = os.path.getmtime(dest)
- if now - cachetime > self.max_age:
+ cachetime = int(os.path.getmtime(dest))
+ diff = int(now - cachetime)
+ print ">>> %d - %d = %d max age(%d)<<<" % (now, cachetime, diff,
self.max_age)
+ if diff > self.max_age:
+ print 'Too Old!'
return False
+ print 'not too old'
return True
def user_cache_file(self):
-----------------------------------------------------------------------
Summary of changes:
script.onmytv/README.md | 5 +++++
script.onmytv/addon.xml | 6 +++---
script.onmytv/changelog.txt | 5 +++++
script.onmytv/resources/lib/gui.py | 8 +++++---
script.onmytv/resources/lib/onmytv.py | 14 ++++++++++----
5 files changed, 28 insertions(+), 10 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
