The branch, gotham has been updated
via 942d649a89be11f0308a46fbd0fe73de38f08265 (commit)
via 3247b97193db0bbef2be20f02b3b49aadb6af02e (commit)
via 7106025a3bd2affb1bf493412727b3ac49e6d9c6 (commit)
from 088f9674f8e595d34e9ce4eb243c13be70fb5874 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=942d649a89be11f0308a46fbd0fe73de38f08265
commit 942d649a89be11f0308a46fbd0fe73de38f08265
Author: Martijn Kaijser <[email protected]>
Date: Wed May 21 18:57:22 2014 +0200
[service.subtitles.subscenter] 3.2.2
diff --git a/service.subtitles.subscenter/addon.xml
b/service.subtitles.subscenter/addon.xml
index f7a6aeb..fe01a56 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.2.1"
+ version="3.2.2"
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 1f575ea..92d0677 100644
--- a/service.subtitles.subscenter/changelog.txt
+++ b/service.subtitles.subscenter/changelog.txt
@@ -1,3 +1,6 @@
+3.2.2 - by CaTz 18/05/2014
+- Bug fix with manual search
+
3.2.1 - by CaTz 16/05/2014
- Improvement of RLS title parsing
diff --git a/service.subtitles.subscenter/service.py
b/service.subtitles.subscenter/service.py
index ab18121..8322bf4 100644
--- a/service.subtitles.subscenter/service.py
+++ b/service.subtitles.subscenter/service.py
@@ -17,17 +17,16 @@ __scriptname__ = __addon__.getAddonInfo('name')
__version__ = __addon__.getAddonInfo('version')
__language__ = __addon__.getLocalizedString
-__cwd__ = unicode(xbmc.translatePath(__addon__.getAddonInfo('path')),'utf-8')
-__profile__ =
unicode(xbmc.translatePath(__addon__.getAddonInfo('profile')),'utf-8')
-__resource__ = unicode(xbmc.translatePath(os.path.join(__cwd__, 'resources',
'lib')),'utf-8')
-__temp__ = unicode(xbmc.translatePath(os.path.join(__profile__,
'temp')),'utf-8')
+__cwd__ = unicode(xbmc.translatePath(__addon__.getAddonInfo('path')), 'utf-8')
+__profile__ = unicode(xbmc.translatePath(__addon__.getAddonInfo('profile')),
'utf-8')
+__resource__ = unicode(xbmc.translatePath(os.path.join(__cwd__, 'resources',
'lib')), 'utf-8')
+__temp__ = unicode(xbmc.translatePath(os.path.join(__profile__, 'temp')),
'utf-8')
sys.path.append(__resource__)
from SUBUtilities import SubscenterHelper, log, normalizeString, clear_cache,
parse_rls_title, clean_title
-
def search(item):
helper = SubscenterHelper()
subtitles_list = helper.get_subtitle_list(item)
@@ -96,7 +95,7 @@ def get_params(string=""):
params = get_params()
if params['action'] in ['search', 'manualsearch']:
- log(__scriptname__, "Version: '%s'" % (__version__))
+ log(__scriptname__, "Version: '%s'" % (__version__,))
log(__scriptname__, "action '%s' called" % (params['action']))
if params['action'] == 'manualsearch':
@@ -105,30 +104,29 @@ if params['action'] in ['search', 'manualsearch']:
item = {}
item['temp'] = False
item['rar'] = False
- item['year'] = xbmc.getInfoLabel("VideoPlayer.Year")
# Year
- item['season'] = str(xbmc.getInfoLabel("VideoPlayer.Season"))
# Season
- item['episode'] = str(xbmc.getInfoLabel("VideoPlayer.Episode"))
# Episode
- item['tvshow'] = params['searchstring'] if params['action'] ==
'manualsearch' \
- else normalizeString(xbmc.getInfoLabel("VideoPlayer.TVshowtitle")) #
Show
+ item['year'] = xbmc.getInfoLabel("VideoPlayer.Year") # Year
+ item['season'] = str(xbmc.getInfoLabel("VideoPlayer.Season")) # Season
+ item['episode'] = str(xbmc.getInfoLabel("VideoPlayer.Episode")) # Episode
+ item['tvshow'] =
normalizeString(xbmc.getInfoLabel("VideoPlayer.TVshowtitle")) # Show
item['title'] = params['searchstring'] if params['action'] ==
'manualsearch' \
- else normalizeString(xbmc.getInfoLabel("VideoPlayer.OriginalTitle")) #
try to get original title
+ else normalizeString(xbmc.getInfoLabel("VideoPlayer.OriginalTitle"))
# try to get original title
item['file_original_path'] = urllib.unquote(
- unicode(xbmc.Player().getPlayingFile(),'utf-8')) # Full path of a
playing file
+ unicode(xbmc.Player().getPlayingFile(), 'utf-8')) # Full path of a
playing file
item['3let_language'] = []
- for lang in
unicode(urllib.unquote(params['languages']),'utf-8').split(","):
+ for lang in unicode(urllib.unquote(params['languages']),
'utf-8').split(","):
item['3let_language'].append(xbmc.convertLanguage(lang,
xbmc.ISO_639_2))
if item['title'] == "":
log(__scriptname__, "VideoPlayer.OriginalTitle not found")
item['title'] = params['searchstring'] if params['action'] ==
'manualsearch' \
- else normalizeString(xbmc.getInfoLabel("VideoPlayer.Title"))
# no original title, get just Title
+ else normalizeString(xbmc.getInfoLabel("VideoPlayer.Title")) # no
original title, get just Title
# clean title + tvshow params
clean_title(item)
parse_rls_title(item)
- if item['episode'].lower().find("s") > -1:
# Check if season is "Special"
+ if item['episode'].lower().find("s") > -1: # Check if season is "Special"
item['season'] = "0"
item['episode'] = item['episode'][-1:]
@@ -157,4 +155,4 @@ elif params['action'] == 'download':
elif params['action'] == 'clear_cache':
clear_cache()
-xbmcplugin.endOfDirectory(int(sys.argv[1])) ## send end of directory to XBMC
\ No newline at end of file
+xbmcplugin.endOfDirectory(int(sys.argv[1])) ## send end of directory to XBMC
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=3247b97193db0bbef2be20f02b3b49aadb6af02e
commit 3247b97193db0bbef2be20f02b3b49aadb6af02e
Author: Martijn Kaijser <[email protected]>
Date: Wed May 21 18:56:42 2014 +0200
[service.subtitles.subtitle] 4.2.2
diff --git a/service.subtitles.subtitle/addon.xml
b/service.subtitles.subtitle/addon.xml
index 2dbb298..e18e2dc 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.2.1"
+ version="4.2.2"
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 60b21f8..b7bc9a5 100644
--- a/service.subtitles.subtitle/changelog.txt
+++ b/service.subtitles.subtitle/changelog.txt
@@ -1,3 +1,6 @@
+4.2.2 - by CaTz 18/05/2014
+- Bug fix with manual search
+
4.2.1 - by CaTz 16/05/2014
- Improvement of RLS title parsing
diff --git a/service.subtitles.subtitle/resources/lib/SUBUtilities.py
b/service.subtitles.subtitle/resources/lib/SUBUtilities.py
index 9981d27..443f180 100644
--- a/service.subtitles.subtitle/resources/lib/SUBUtilities.py
+++ b/service.subtitles.subtitle/resources/lib/SUBUtilities.py
@@ -127,7 +127,6 @@ class SubtitleHelper:
if not results:
query = {"q": search_string.encode("utf-8").lower(), "cs":
"series"}
- log(__scriptname__, query)
search_result = self.urlHandler.request(self.BASE_URL +
"/browse.php?" + urllib.urlencode(query))
if search_result is None:
return results # return empty set
diff --git a/service.subtitles.subtitle/service.py
b/service.subtitles.subtitle/service.py
index 1c0e38f..9d3f086 100644
--- a/service.subtitles.subtitle/service.py
+++ b/service.subtitles.subtitle/service.py
@@ -105,8 +105,7 @@ if params['action'] in ['search', 'manualsearch']:
item['year'] = xbmc.getInfoLabel("VideoPlayer.Year") # Year
item['season'] = str(xbmc.getInfoLabel("VideoPlayer.Season")) # Season
item['episode'] = str(xbmc.getInfoLabel("VideoPlayer.Episode")) # Episode
- item['tvshow'] = params['searchstring'] if params['action'] ==
'manualsearch' \
- else normalizeString(xbmc.getInfoLabel("VideoPlayer.TVshowtitle")) #
Show
+ item['tvshow'] =
normalizeString(xbmc.getInfoLabel("VideoPlayer.TVshowtitle")) # Show
item['title'] = params['searchstring'] if params['action'] ==
'manualsearch' \
else normalizeString(xbmc.getInfoLabel("VideoPlayer.OriginalTitle"))
# try to get original title
item['file_original_path'] = urllib.unquote(
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=7106025a3bd2affb1bf493412727b3ac49e6d9c6
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 1 +
script.keymap/actions.py | 388 ++++++++++++++++++++
script.keymap/addon.xml | 19 +
script.keymap/changelog.txt | 18 +
script.keymap/collections_backport.py | 258 +++++++++++++
script.keymap/editor.py | 105 ++++++
script.keymap/icon.png | Bin 0 -> 17771 bytes
script.keymap/main.py | 98 +++++
.../resources/language/English/strings.xml | 15 +
script.keymap/utils.py | 58 +++
service.subtitles.subscenter/addon.xml | 2 +-
service.subtitles.subscenter/changelog.txt | 3 +
service.subtitles.subscenter/service.py | 32 +-
service.subtitles.subtitle/addon.xml | 2 +-
service.subtitles.subtitle/changelog.txt | 3 +
.../resources/lib/SUBUtilities.py | 1 -
service.subtitles.subtitle/service.py | 3 +-
17 files changed, 984 insertions(+), 22 deletions(-)
copy {service.subtitles.greeksubtitles.eu => script.keymap}/LICENSE.txt (99%)
create mode 100644 script.keymap/actions.py
create mode 100644 script.keymap/addon.xml
create mode 100644 script.keymap/changelog.txt
create mode 100644 script.keymap/collections_backport.py
create mode 100644 script.keymap/editor.py
create mode 100644 script.keymap/icon.png
create mode 100644 script.keymap/main.py
create mode 100644 script.keymap/resources/language/English/strings.xml
create mode 100644 script.keymap/utils.py
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
