The branch, dharma-pre has been updated
via 2e5bd7fbae363204b2cbba90c81d4100bf2ee172 (commit)
from d5ac5fb53577c082984e451fade02b9b9241589a (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=2e5bd7fbae363204b2cbba90c81d4100bf2ee172
commit 2e5bd7fbae363204b2cbba90c81d4100bf2ee172
Author: amet <a...@nospam>
Date: Fri Oct 8 20:08:06 2010 +0400
[script.tvrage.com] -v0.9.5
- Bug fix: missing import for simplejson in addon.xml
diff --git a/script.tvrage.com/addon.xml b/script.tvrage.com/addon.xml
index 94be4e1..766d865 100644
--- a/script.tvrage.com/addon.xml
+++ b/script.tvrage.com/addon.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.tvrage.com"
name="TVRage-Eps"
- version="0.9.4"
+ version="0.9.5"
provider-name="Rick Phillips (ruuk)">
<requires>
<import addon="xbmc.python" version="1.0"/>
<import addon="script.module.elementtree" version="1.2.7"/>
+ <import addon="script.module.simplejson" version="2.0.9"/>
</requires>
<extension point="xbmc.python.script"
library="default.py" />
diff --git a/script.tvrage.com/changelog.txt b/script.tvrage.com/changelog.txt
index a49a21e..8e1f812 100644
--- a/script.tvrage.com/changelog.txt
+++ b/script.tvrage.com/changelog.txt
@@ -1,6 +1,10 @@
TVRage-Eps Changelog
-Current Version : 0.9.4
+Current Version : 0.9.5
+
+*** 0.9.5 ***
+
+Bug fix: missing import for simplejson in addon.xml
*** 0.9.4 ***
diff --git a/script.tvrage.com/default.py b/script.tvrage.com/default.py
index d767468..201edaa 100644
--- a/script.tvrage.com/default.py
+++ b/script.tvrage.com/default.py
@@ -8,7 +8,7 @@ import difflib
__author__ = 'ruuk'
__url__ = 'http://code.google.com/p/tvragexbmc/'
__date__ = '10-07-2010'
-__version__ = '0.9.4'
+__version__ = '0.9.5'
__settings__ = xbmcaddon.Addon(id='script.tvrage.com')
__language__ = __settings__.getLocalizedString
@@ -78,8 +78,14 @@ class Show:
self.status = show.find('status').text
if 'Ended' in self.status or 'Cancel' in self.status:
ended = show.find('ended').text
- if ended: self.canceled = time.strftime('%b %d
%Y',time.strptime(ended,'%Y-%m-%d'))
- else: self.canceled = '?'
+ sc = '?'
+ if ended:
+ try: sc = time.strftime('%b %d
%Y',time.strptime(ended,'%Y-%m-%d'))
+ except: pass
+ if not sc:
+ try: sc = time.strftime('%b
%Y',time.strptime(ended,'%Y-%m-00'))
+ except: pass
+ self.canceled = sc
last = show.find('latestepisode')
self.lastEp = self.epInfo(last)
@@ -180,7 +186,7 @@ class TVRageAPI:
return self.getTree(url)
def search(self,show):
- url = self._search_url + show
+ url = self._search_url + urllib.quote_plus(show)
return self.getTree(url)
def getEpList(self,showid):
@@ -383,7 +389,7 @@ class TVRageEps(xbmcgui.WindowXMLDialog):
pdialog = xbmcgui.DialogProgress()
pdialog.create(__language__(30017))
pdialog.update(0)
- result = API.search(term.replace(' ','_'))
+ result = API.search(term)
pdialog.close()
sid = self.userPickShow(result)
if not sid: return
@@ -426,7 +432,7 @@ class TVRageEps(xbmcgui.WindowXMLDialog):
print "SHOW: " + title + " -
EXISTS AS: " + c.name
break
else:
- result = API.search(title.replace('
','_'))
+ result = API.search(title)
#result =
API.search(re.sub('(.*?)','',title.lower().replace('the ','')))
matches = {}
for f in result.findall('show'):
@@ -435,7 +441,7 @@ class TVRageEps(xbmcgui.WindowXMLDialog):
if close:
print "SHOW: " + title + " -
MATCHES: " + close[0]
pdialog.update(int((ct/tot)*100),__language__(30028) + title)
-
self.doAddShow(matches[close[0]],skipCanceled=self.skipCanceled)
+
self.doAddShow(matches[close[0]],skipCanceled=self.skip_canceled)
else:
sid =
self.userPickShow(result,append=title)
if sid: self.doAddShow(sid)
-----------------------------------------------------------------------
Summary of changes:
script.tvrage.com/addon.xml | 3 ++-
script.tvrage.com/changelog.txt | 6 +++++-
script.tvrage.com/default.py | 20 +++++++++++++-------
3 files changed, 20 insertions(+), 9 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
