[bug] filmix get_streams

ContentSources.py

@@ -176,7 +176,7 @@ if __name__ == "__main__":
     while True:
         print
         for i,item in enumerate(content):
-            s = "%i: %s - %s %s %s "%(i,item[0],item[1],item[2],item[3])
+            s = "%i: %s - %s %s"%(i,item[0],item[1],item[2])
             print s #.encode(sys.stdout.encoding,"replace")
 
         while True:

PlayStream.py

@@ -6,7 +6,7 @@
 # Used fragments of code from enigma2-plugin-tv3play by Taapat (https://github.com/Taapat/enigma2-plugin-tv3play)
 #
 
-__version__ = "0.6j"
+__version__ = "0.6k"
 __id__ = "playstream"
 __title__ = "PlayStream"
 __author__ = "ivars777@gmail.com"

sources/filmix.py

@@ -110,6 +110,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                 if translations[pl].startswith("http"):
                     continue
                 pl_link = translations[pl]
+                lang = pl.encode("utf8")
                 break
             else:
                 raise Exception("No episodes list found!")
@@ -222,21 +223,26 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         desc = desc0 =  util.unescape(m.group(1).strip()) if m else ""
         m = re.search('itemprop="contentUrl" content="(.+?)"', r, re.IGNORECASE | re.DOTALL)
         if not m:
-        #    #raise Exception("Can not find video link")
-            return []
+            raise Exception("Can not find video link")
+            #return []
         video_link = m.group(1)
         series = True if video_link == '{video-link}' else False
         vid = plist[1]
         js = self.get_movie_info(vid)
-        if js["message"]["translations"]["flash"]:
-            video_link = js["message"]["translations"]["flash"].values()[0].encode("utf8")
-            video_link = self.decode_uppod_text(video_link)
-            lang = js["message"]["translations"]["flash"].keys()[0].encode("utf8") # TODO process several players/streams
+        translations = js["message"]["translations"]["flash"]
+        for pl in translations:
+            if translations[pl].startswith("http"):
+                continue
+            pl_link = translations[pl]
+            lang = pl.encode("utf8")
+            break
         else:
-            return []
+            raise Exception("No episodes list found!")
+        if not pl_link.startswith("http"):
+            pl_link = self.decode_uppod_text(pl_link)
 
         if not series : # Filma
-            url0 = video_link
+            url0 = pl_link
             streams2 = self.get_streams2(url0)
             for st in streams2:
                 stream = util.item()
@@ -249,7 +255,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             return streams
 
         else: # Seriāls
-            pl_link = video_link
+            #pl_link = video_link
             js = self._http_request(pl_link)
             js = self.decode_uppod_text(js)
             js = json.loads(js)

util.py

@@ -104,7 +104,7 @@ def nfo2desc(nfo):
     desc += ddd("actor","Actors")
     desc += ddd("language","Languages")
     desc += ddd("quality","Quality")
-    return desc.encode("utf8")
+    return desc.encode("utf8") if isinstance(desc,unicode) else desc
 
 def nfo2title(nfo):
     if not "title" in nfo:
@@ -114,7 +114,7 @@ def nfo2title(nfo):
         title +=" ~ "+nfo["originaltitle"]
     if "year" in nfo and nfo["year"]:
         title += " (%s)"%nfo["year"]
-    return title.encode("utf8")
+    return title.encode("utf8") if isinstance(title,unicode) else title
 
 def play_video(streams):
     if len(streams)>1: