The branch, gotham has been updated
via 915c18240696a109462664548d00383782b3816f (commit)
from a345e01ff12ffd0456bde15b0f8af8032477de68 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=915c18240696a109462664548d00383782b3816f
commit 915c18240696a109462664548d00383782b3816f
Author: Martijn Kaijser <[email protected]>
Date: Fri Feb 14 08:13:18 2014 +0100
[service.subtitles.subscene] 0.9.2
diff --git a/service.subtitles.subscene/addon.xml
b/service.subtitles.subscene/addon.xml
index 6bda3ca..becbe5b 100644
--- a/service.subtitles.subscene/addon.xml
+++ b/service.subtitles.subscene/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.subscene"
name="Subscene.com"
- version="0.9.1"
+ version="0.9.2"
provider-name="CrowleyAJ">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/service.subtitles.subscene/changelog.txt
b/service.subtitles.subscene/changelog.txt
index 7baa457..7610f56 100644
--- a/service.subtitles.subscene/changelog.txt
+++ b/service.subtitles.subscene/changelog.txt
@@ -1,3 +1,6 @@
+0.9.2
+- better handling of files without scraper data
+
0.9.1
- fixed an issue with tv shows with no exact title match
diff --git a/service.subtitles.subscene/service.py
b/service.subtitles.subscene/service.py
index 316f425..afd53c3 100644
--- a/service.subtitles.subscene/service.py
+++ b/service.subtitles.subscene/service.py
@@ -226,16 +226,38 @@ def search_manual(searchstr, languages, filename):
getallsubs(content, languages, filename)
+def search_filename(filename, languages):
+ title, year = xbmc.getCleanMovieTitle(filename)
+ log(__name__, "clean title: \"%s\" (%s)" % (title, year))
+ try:
+ yearval = int(year)
+ except ValueError:
+ yearval = 0
+ if title and yearval > 1900:
+ search_movie(title, year, item['3let_language'], filename)
+ else:
+ match = re.search(r'\WS(?P<season>\d\d)E(?P<episode>\d\d)', title,
flags=re.IGNORECASE)
+ if match is not None:
+ tvshow = string.strip(title[:match.start('season')-1])
+ season = string.lstrip(match.group('season'), '0')
+ episode = string.lstrip(match.group('episode'), '0')
+ search_tvshow(tvshow, season, episode, item['3let_language'],
filename)
+ else:
+ search_manual(filename, item['3let_language'], filename)
+
+
def search(item):
filename =
os.path.splitext(os.path.basename(item['file_original_path']))[0]
- log(__name__, "Search_subscene='%s', filename='%s'" % (item, filename))
+ log(__name__, "Search_subscene='%s', filename='%s', addon_version=%s" %
(item, filename, __version__))
if item['mansearch']:
search_manual(item['mansearchstr'], item['3let_language'], filename)
- elif len(item['tvshow']) == 0:
+ elif item['tvshow']:
+ search_tvshow(item['tvshow'], item['season'], item['episode'],
item['3let_language'], filename)
+ elif item['title'] and item['year']:
search_movie(item['title'], item['year'], item['3let_language'],
filename)
else:
- search_tvshow(item['tvshow'], item['season'], item['episode'],
item['3let_language'], filename)
+ search_filename(filename, item['3let_language'])
def download(link, search_string=""):
-----------------------------------------------------------------------
Summary of changes:
service.subtitles.subscene/addon.xml | 2 +-
service.subtitles.subscene/changelog.txt | 3 +++
service.subtitles.subscene/service.py | 28 +++++++++++++++++++++++++---
3 files changed, 29 insertions(+), 4 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience. Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
