The branch, gotham has been updated
via 41420f2df629e31b389665e9ed7d31caa28035b6 (commit)
via 914d17a3c3d22b55e3cdaa5ba71ee0e4c2a25f23 (commit)
via 479f7c5a47742699fe296d5c1ad05c0d7fbe5e5e (commit)
via 61cb906ff0eebf5b2d44032b27b7351befe691f0 (commit)
from 0cebb1d9b689b4f097c3a21875a3ddf25aa36d7f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=41420f2df629e31b389665e9ed7d31caa28035b6
commit 41420f2df629e31b389665e9ed7d31caa28035b6
Author: sphere <[email protected]>
Date: Fri Mar 28 11:42:54 2014 +0100
[service.subtitles.subscenter] updated to version 3.1.5
diff --git a/service.subtitles.subscenter/addon.xml
b/service.subtitles.subscenter/addon.xml
index 0cf0558..b912696 100644
--- a/service.subtitles.subscenter/addon.xml
+++ b/service.subtitles.subscenter/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.subscenter"
name="Subscenter.org"
- version="3.1.4"
+ version="3.1.5"
provider-name="CaTz">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
diff --git a/service.subtitles.subscenter/changelog.txt
b/service.subtitles.subscenter/changelog.txt
index 7d5d7bc..dae047a 100644
--- a/service.subtitles.subscenter/changelog.txt
+++ b/service.subtitles.subscenter/changelog.txt
@@ -1,3 +1,6 @@
+3.1.5 - by CaTz 28/03/2014
+- Bug fix, plugin crash if there is no downloads in the site (expected to str)
+
3.1.4 - by CaTz 23/03/2014
- Bug fix, handle HTML entities in the content show of the website
diff --git a/service.subtitles.subscenter/resources/lib/SUBUtilities.py
b/service.subtitles.subscenter/resources/lib/SUBUtilities.py
index 8c073aa..0bf6202 100644
--- a/service.subtitles.subscenter/resources/lib/SUBUtilities.py
+++ b/service.subtitles.subscenter/resources/lib/SUBUtilities.py
@@ -143,7 +143,7 @@ class SubscenterHelper:
'language_name':
xbmc.convertLanguage(language, xbmc.ENGLISH_NAME),
'language_flag': language,
'ID': current["id"],
- 'rating': current["downloaded"],
+ 'rating': str(current["downloaded"]),
'sync': subtitle_rate >= 4,
'hearing_imp':
current["hearing_impaired"] > 0
})
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=914d17a3c3d22b55e3cdaa5ba71ee0e4c2a25f23
commit 914d17a3c3d22b55e3cdaa5ba71ee0e4c2a25f23
Author: sphere <[email protected]>
Date: Fri Mar 28 11:42:52 2014 +0100
[service.subtitles.subtitle] updated to version 4.1.6
diff --git a/service.subtitles.subtitle/addon.xml
b/service.subtitles.subtitle/addon.xml
index f17d92b..4db8a97 100644
--- a/service.subtitles.subtitle/addon.xml
+++ b/service.subtitles.subtitle/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.subtitle"
name="Subtitle.co.il"
- version="4.1.5"
+ version="4.1.6"
provider-name="CaTz">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
diff --git a/service.subtitles.subtitle/changelog.txt
b/service.subtitles.subtitle/changelog.txt
index 15df192..5148d7e 100644
--- a/service.subtitles.subtitle/changelog.txt
+++ b/service.subtitles.subtitle/changelog.txt
@@ -1,3 +1,6 @@
+4.1.6 - By CaTz 28/03/2014
+- Bug fix, refresh cookie on ajax call
+
4.1.5 - By CaTz 23/03/2014
- Bug fix, handle HTML entities in the content show of the website
diff --git a/service.subtitles.subtitle/resources/lib/SUBUtilities.py
b/service.subtitles.subtitle/resources/lib/SUBUtilities.py
index 3aa8d8d..76cb129 100644
--- a/service.subtitles.subtitle/resources/lib/SUBUtilities.py
+++ b/service.subtitles.subtitle/resources/lib/SUBUtilities.py
@@ -224,7 +224,7 @@ class SubtitleHelper:
url = self.BASE_URL + "/getajax.php?" +
urllib.urlencode(
{"episodedetails": episode_id})
- subtitle_page =
self.urlHandler.request(url)
+ subtitle_page = self._is_logged_in(url)
x, i =
self._retrive_subtitles(subtitle_page, item)
total_downloads += i
@@ -320,7 +320,7 @@ class SubtitleHelper:
def _is_logged_in(self, url):
content = self.urlHandler.request(url)
- if content is not None and re.search(r'friends\.php', content):
#check if logged in
+ if content is not None and (re.search(r'friends\.php', content) or not
re.search(r'login\.php', content)): #check if logged in
return content
elif self.login():
return self.urlHandler.request(url)
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=479f7c5a47742699fe296d5c1ad05c0d7fbe5e5e
commit 479f7c5a47742699fe296d5c1ad05c0d7fbe5e5e
Author: sphere <[email protected]>
Date: Fri Mar 28 11:42:00 2014 +0100
[service.subtitles.supersubtitles] updated to version 0.0.9
diff --git a/service.subtitles.supersubtitles/addon.xml
b/service.subtitles.supersubtitles/addon.xml
index 8fec8d2..95f8e02 100644
--- a/service.subtitles.supersubtitles/addon.xml
+++ b/service.subtitles.supersubtitles/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.supersubtitles"
name="Super Subtitles"
- version="0.0.8"
+ version="0.0.9"
provider-name="fape">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
diff --git a/service.subtitles.supersubtitles/changelog.txt
b/service.subtitles.supersubtitles/changelog.txt
index 6f0b58c..e72d5fd 100644
--- a/service.subtitles.supersubtitles/changelog.txt
+++ b/service.subtitles.supersubtitles/changelog.txt
@@ -1,3 +1,7 @@
+0.0.9
+- fix sort order
+- fix type error
+
0.0.8
- improvements from Xbmc addons mailing list
diff --git a/service.subtitles.supersubtitles/service.py
b/service.subtitles.supersubtitles/service.py
index bcfc464..5a97a48 100644
--- a/service.subtitles.supersubtitles/service.py
+++ b/service.subtitles.supersubtitles/service.py
@@ -231,15 +231,19 @@ def search_subtitles(item):
debuglog("No subtitle found for %s" % item['tvshow'])
return None
+ # convert dict to list
+ if type(data) is dict:
+ data = data.values()
+
searchlist = []
- for st in data.values():
+ for st in data:
converted = convert(st)
if converted['language_eng'] in item['languages']:
searchlist.append(converted)
searchlist = remove_duplications(searchlist)
- searchlist.sort(key=lambda k: k['rating'], reverse=True)
+ searchlist.sort(key=lambda k: (k['score'], k['language_eng']),
reverse=True)
return searchlist
@@ -248,7 +252,9 @@ def search(item):
subtitles_list = search_subtitles(item)
if subtitles_list:
+ index = 0
for it in subtitles_list:
+ index += 1
#label="%s | %s | %s"%(it['name'], it['filename'], it['uploader'])
label = "%s [%s]" % (it['filename'], it['uploader'])
listitem = xbmcgui.ListItem(label=it['language_eng'],
@@ -259,7 +265,7 @@ def search(item):
listitem.setProperty('sync', ('false', 'true')[it['sync']])
listitem.setProperty('hearing_imp', ('false',
'true')[it.get('hearing', False)])
- qparams = {'action': 'download', 'id': it['id'], 'filename':
it['filename']}
+ qparams = {'action': 'download', 'actionsortorder':
str(index).zfill(2), 'id': it['id'], 'filename': it['filename']}
url = "plugin://%s/?%s" % (__scriptid__, urllib.urlencode(qparams))
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=url,
listitem=listitem, isFolder=False)
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=61cb906ff0eebf5b2d44032b27b7351befe691f0
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
service.subtitles.subdivx/README.md | 5 +
.../addon.xml | 16 +-
service.subtitles.subdivx/changelog.txt | 2 +
service.subtitles.subdivx/icon.png | Bin 0 -> 5853 bytes
service.subtitles.subdivx/logo.png | Bin 0 -> 9506 bytes
service.subtitles.subdivx/service.py | 351 ++++++++++++++++++++
service.subtitles.subscenter/addon.xml | 2 +-
service.subtitles.subscenter/changelog.txt | 3 +
.../resources/lib/SUBUtilities.py | 2 +-
service.subtitles.subtitle/addon.xml | 2 +-
service.subtitles.subtitle/changelog.txt | 3 +
.../resources/lib/SUBUtilities.py | 4 +-
service.subtitles.supersubtitles/addon.xml | 2 +-
service.subtitles.supersubtitles/changelog.txt | 4 +
service.subtitles.supersubtitles/service.py | 12 +-
16 files changed, 391 insertions(+), 17 deletions(-)
copy {screensaver.xbmc.slideshow => service.subtitles.subdivx}/LICENSE.txt
(100%)
create mode 100644 service.subtitles.subdivx/README.md
copy {service.subtitles.subtituloses => service.subtitles.subdivx}/addon.xml
(61%)
mode change 100755 => 100644
create mode 100644 service.subtitles.subdivx/changelog.txt
create mode 100644 service.subtitles.subdivx/icon.png
create mode 100644 service.subtitles.subdivx/logo.png
create mode 100644 service.subtitles.subdivx/service.py
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
