The branch, gotham has been updated via c703d1f2159f30dab10fa9c27d15f0d0ee3f79e0 (commit) via 2c0cf9e164a77617582d0aa0b9169b267442fff8 (commit) from 148bbce8a81407b679764ab02d72553724cb54ea (commit)
- Log ----------------------------------------------------------------- http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=c703d1f2159f30dab10fa9c27d15f0d0ee3f79e0 commit c703d1f2159f30dab10fa9c27d15f0d0ee3f79e0 Author: amet <amet.nos...@gmail.com> Date: Mon Jan 6 19:27:26 2014 +0400 [service.subtitles.opensubtitles] -v5.0.4 5.0.4 - manual search button support diff --git a/service.subtitles.opensubtitles/addon.xml b/service.subtitles.opensubtitles/addon.xml index 11dbe2a..c7a3ddf 100755 --- a/service.subtitles.opensubtitles/addon.xml +++ b/service.subtitles.opensubtitles/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="service.subtitles.opensubtitles" - name="OpenSubtitles" - version="5.0.3" + name="OpenSubtitles.org" + version="5.0.4" provider-name="amet"> <requires> <import addon="xbmc.python" version="2.1.0"/> @@ -10,7 +10,7 @@ library="service.py" /> <extension point="xbmc.addon.metadata"> <summary lang="en">OpenSubtitles</summary> - <description lang="en">Search and download subtitles from OpenSubtitles</description> + <description lang="en">Search and download subtitles from opensubtitles.org</description> <disclaimer lang="en"></disclaimer> <platform>all</platform> <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license> diff --git a/service.subtitles.opensubtitles/changelog.txt b/service.subtitles.opensubtitles/changelog.txt index 19dbf60..0e46061 100644 --- a/service.subtitles.opensubtitles/changelog.txt +++ b/service.subtitles.opensubtitles/changelog.txt @@ -1,3 +1,6 @@ +5.0.4 +- manual search button support + 5.0.3 - fix Portuguese (Brazil) and Greek diff --git a/service.subtitles.opensubtitles/resources/lib/OSUtilities.py b/service.subtitles.opensubtitles/resources/lib/OSUtilities.py index ba315ea..3911fb1 100644 --- a/service.subtitles.opensubtitles/resources/lib/OSUtilities.py +++ b/service.subtitles.opensubtitles/resources/lib/OSUtilities.py @@ -24,7 +24,9 @@ class OSDBServer: def searchsubtitles( self, item): if ( self.osdb_token ) : searchlist = [] - if len(item['tvshow']) > 0: + if item['mansearch']: + OS_search_string = item['mansearchstr'] + elif len(item['tvshow']) > 0: OS_search_string = ("%s S%.2dE%.2d" % (item['tvshow'], int(item['season']), int(item['episode']),) diff --git a/service.subtitles.opensubtitles/service.py b/service.subtitles.opensubtitles/service.py index bdc393e..e237539 100644 --- a/service.subtitles.opensubtitles/service.py +++ b/service.subtitles.opensubtitles/service.py @@ -143,11 +143,12 @@ def get_params(string=""): params = get_params() -if params['action'] == 'search': - log( __name__, "action 'search' called") +if params['action'] == 'search' or params['action'] == 'manualsearch': + log( __name__, "action '%s' called" % params['action']) item = {} item['temp'] = False item['rar'] = False + item['mansearch'] = False item['year'] = xbmc.getInfoLabel("VideoPlayer.Year") # Year item['season'] = str(xbmc.getInfoLabel("VideoPlayer.Season")) # Season item['episode'] = str(xbmc.getInfoLabel("VideoPlayer.Episode")) # Episode @@ -156,6 +157,10 @@ if params['action'] == 'search': item['file_original_path'] = urllib.unquote(xbmc.Player().getPlayingFile().decode('utf-8'))# Full path of a playing file item['3let_language'] = [] #['scc','eng'] + if 'searchstring' in params: + item['mansearch'] = True + item['mansearchstr'] = params['searchstring'] + for lang in urllib.unquote(params['languages']).decode('utf-8').split(","): if lang == "Portuguese (Brazil)": lan = "pob" http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=2c0cf9e164a77617582d0aa0b9169b267442fff8 commit 2c0cf9e164a77617582d0aa0b9169b267442fff8 Author: amet <amet.nos...@gmail.com> Date: Mon Jan 6 19:26:07 2014 +0400 [service.subtitles.podnapisi] -v 5.0.4 5.0.4 - add notification that we dont support manual search diff --git a/service.subtitles.podnapisi/addon.xml b/service.subtitles.podnapisi/addon.xml index 6eb8aff..7fd504e 100755 --- a/service.subtitles.podnapisi/addon.xml +++ b/service.subtitles.podnapisi/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="service.subtitles.podnapisi" name="Podnapisi.net" - version="5.0.3" + version="5.0.4" provider-name="amet"> <requires> <import addon="xbmc.python" version="2.1.0"/> diff --git a/service.subtitles.podnapisi/changelog.txt b/service.subtitles.podnapisi/changelog.txt index 48886b8..04cbfc8 100644 --- a/service.subtitles.podnapisi/changelog.txt +++ b/service.subtitles.podnapisi/changelog.txt @@ -1,3 +1,6 @@ +5.0.4 +- add notification that we dont support manual search + 5.0.3 - clean temp dir and use python zipfile for extraction diff --git a/service.subtitles.podnapisi/resources/language/English/strings.po b/service.subtitles.podnapisi/resources/language/English/strings.po index 1589059..6b86035 100644 --- a/service.subtitles.podnapisi/resources/language/English/strings.po +++ b/service.subtitles.podnapisi/resources/language/English/strings.po @@ -25,3 +25,7 @@ msgstr "" msgctxt "#32003" msgid "Login Details" msgstr "" + +msgctxt "#32004" +msgid "Manual search not supported" +msgstr "" \ No newline at end of file diff --git a/service.subtitles.podnapisi/service.py b/service.subtitles.podnapisi/service.py index e91c7c7..da5d485 100644 --- a/service.subtitles.podnapisi/service.py +++ b/service.subtitles.podnapisi/service.py @@ -175,6 +175,14 @@ elif params['action'] == 'download': listitem = xbmcgui.ListItem(label=sub) xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=sub,listitem=listitem,isFolder=False) + +elif params['action'] == 'manualsearch': + xbmc.executebuiltin(u'Notification(%s,%s,2000,%s)' % + (__scriptname__, + __language__(32004), + os.path.join(__cwd__,"icon.png") + ) + ) xbmcplugin.endOfDirectory(int(sys.argv[1])) ----------------------------------------------------------------------- Summary of changes: service.subtitles.opensubtitles/addon.xml | 6 +++--- service.subtitles.opensubtitles/changelog.txt | 3 +++ .../resources/lib/OSUtilities.py | 4 +++- service.subtitles.opensubtitles/service.py | 9 +++++++-- service.subtitles.podnapisi/addon.xml | 2 +- service.subtitles.podnapisi/changelog.txt | 3 +++ .../resources/language/English/strings.po | 4 ++++ service.subtitles.podnapisi/service.py | 8 ++++++++ 8 files changed, 32 insertions(+), 7 deletions(-) hooks/post-receive -- Scripts ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Xbmc-addons mailing list Xbmc-addons@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xbmc-addons