5.0.12 - compare season and episode and display only matching results

amet · Apr 19, 2015 · cb16773 · cb16773
1 parent 96039e3
commit cb16773
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git 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.org"
-       version="5.0.11"
+       version="5.0.12"
        provider-name="amet">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>

diff --git a/service.subtitles.opensubtitles/changelog.txt b/service.subtitles.opensubtitles/changelog.txt
@@ -1,3 +1,6 @@
+5.0.12
+- compare season and episode and display only matching results
+
 5.0.11
 - fix: search issues
 - cosmetics

diff --git a/service.subtitles.opensubtitles/service.py b/service.subtitles.opensubtitles/service.py
@@ -48,22 +48,27 @@ def Search( item ):
       ## hack to work around issue where Brazilian is not found as language in XBMC
       if item_data["LanguageName"] == "Brazilian":
         item_data["LanguageName"] = "Portuguese (Brazil)"
-      listitem = xbmcgui.ListItem(label          = item_data["LanguageName"],
-                                  label2         = item_data["SubFileName"],
-                                  iconImage      = str(int(round(float(item_data["SubRating"])/2))),
-                                  thumbnailImage = item_data["ISO639"]
-                                  )
-
-      listitem.setProperty( "sync", ("false", "true")[str(item_data["MatchedBy"]) == "moviehash"] )
-      listitem.setProperty( "hearing_imp", ("false", "true")[int(item_data["SubHearingImpaired"]) != 0] )
-      url = "plugin://%s/?action=download&link=%s&ID=%s&filename=%s&format=%s" % (__scriptid__,
-                                                                        item_data["ZipDownloadLink"],
-                                                                        item_data["IDSubtitleFile"],
-                                                                        item_data["SubFileName"],
-                                                                        item_data["SubFormat"]
-                                                                        )
-
-      xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=listitem,isFolder=False)
+
+      if ((item['season'] == item_data['SeriesSeason'] and
+          item['episode'] == item_data['SeriesEpisode']) or
+          (item['season'] == "" and item['episode'] == "") ## for file search, season and episode == ""
+         ):
+        listitem = xbmcgui.ListItem(label          = item_data["LanguageName"],
+                                    label2         = item_data["SubFileName"],
+                                    iconImage      = str(int(round(float(item_data["SubRating"])/2))),
+                                    thumbnailImage = item_data["ISO639"]
+                                    )
+
+        listitem.setProperty( "sync", ("false", "true")[str(item_data["MatchedBy"]) == "moviehash"] )
+        listitem.setProperty( "hearing_imp", ("false", "true")[int(item_data["SubHearingImpaired"]) != 0] )
+        url = "plugin://%s/?action=download&link=%s&ID=%s&filename=%s&format=%s" % (__scriptid__,
+                                                                          item_data["ZipDownloadLink"],
+                                                                          item_data["IDSubtitleFile"],
+                                                                          item_data["SubFileName"],
+                                                                          item_data["SubFormat"]
+                                                                          )
+
+        xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=listitem,isFolder=False)
 
 
 def Download(id,url,format,stack=False):