0.6a

ContentSources.py

@@ -7,6 +7,7 @@
 #
 
 import sys,os,re
+import glob
 sys.path.insert(0,os.path.dirname(os.path.abspath(__file__)))
 from  sources.SourceBase import stream_type
 import util
@@ -20,15 +21,26 @@ class ContentSources(object):
         self.plugins = {}
         self.error_content = [("..atpakaļ", "back", None, "Kļūda, atgriezties atpakaļ")]
         sys.path.insert(0, plugin_path)
-        for f in os.listdir(plugin_path):
+        #for f in os.listdir(plugin_path):
+        #for f in next(os.walk(plugin_path))[2]:
+        print "ContentSources: Importing sources from "+plugin_path
+        files = glob.glob(os.path.join(plugin_path,"*.py"))
+        for f in files:
             fname, ext = os.path.splitext(f)
+            fname = os.path.split(fname)[1]
             if fname == "__init__": continue
             if ext == '.py':
                 mod = __import__(fname)
                 reload(mod)
                 if "Source" in dir(mod):
                     self.plugins[fname] = mod.Source()
+                    print fname+ " imported"
+                else:
+                    pass
+                    #print fname+ "skipped"
         sys.path.pop(0)
+        if not "config" in self.plugins:
+            raise Exception("Problem importing content sources")
         cfg = self.plugins["config"]
         for pl in self.plugins.keys():
             found = False

PlayStream.py

@@ -13,7 +13,7 @@ import datetime,re
 import urllib2
 
 from enigma import ePicLoad, eServiceReference, eTimer, getDesktop
-from Components.ActionMap import ActionMap,HelpableActionMap
+from Components.ActionMap import ActionMap, HelpableActionMap
 from Screens.InfoBarGenerics import InfoBarShowHide
 from Components.AVSwitch import AVSwitch
 from Components.Label import Label

changelog.md

@@ -1,3 +1,8 @@
+**0.6a** (12.02.2016):
+- kombinētā versija ar Kodi, salabots, lai iet kopā (funkcionali nekas jauns)
+
+**0.5y** (11.02.2016):
+- salabots filmix.me
 
 **0.5u** (19.01.2016):
 - kļūdas labojums atverot hqq u.c. strīmus

imake.bat

@@ -2,7 +2,7 @@
 :=== Parameters ===
 
 if ()==(%1%) (
-    set ver=0.5x
+    set ver=0.6a
 	rem echo Please provide version
 	rem pause
 	rem GOTO:EOF

sources/SourceBase.py

@@ -11,7 +11,13 @@ import datetime, re, sys,os
 import requests
 from collections import OrderedDict
 import ConfigParser
-import util
+try:
+    import util
+except:
+    parent = os.path.dirname(os.path.abspath(__file__))
+    parent = os.sep.join(parent.split(os.sep)[:-1])
+    sys.path.insert(0,parent)
+    import util
 
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 

sources/filmix.py

@@ -17,10 +17,13 @@ from SourceBase import SourceBase
 import base64
 from collections import OrderedDict
 import sys
-
+try:
+    import util
+except:
+    sys.path.insert(0,'..')
+    import util
 
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
-import util
 
 class Source(SourceBase):
 
@@ -49,14 +52,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
 
     def get_content(self, data):
         print "[filmix] get_content:", data
-        if "::" in data:
-            data = data.split("::")[1]
-        path = data.split("?")[0]
-        clist = path.split("/")[0]
-        params = data[data.find("?"):] if "?" in data else ""
-        qs = dict(map(lambda x:x.split("="),re.findall("[%\w]+=\w+",params)))
-        lang = qs["lang"] if "lang" in qs else self.country
-
+        source, data, path, plist, clist, params, qs = self.parse_data(data)
         content=[]
         content.append(("..return", "back","","Return back"))
 
@@ -107,29 +103,9 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             duration = "(%s)"%m.group(1) if m else ""
             m = re.search('<p itemprop="description"[^>]+>([^<]+)<', r, re.DOTALL)
             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 []
-            video_link = m.group(1)
-
-            if video_link<>'{video-link}': # TODO nevar būt!
-                video_link = self.decode_uppod_text(video_link)
-                streams = self.get_streams2(video_link)
-                data2 = streams[0][1]
-                content = (title,data2,img,desc)
-                return content
-
-            r = util.request("https://m.filmix.me/"+data)
-            i = r.find("var flashvars")
-            if i == -1:
-                raise Exception("Can not find series list")
-            m = re.search('pl:"([^"]+)"', r[i:], re.DOTALL)
-            if not m:
-                #return []
-                raise Exception("Can not find series list")
-            pl_link = m.group(1)
+            vid = plist[-1]
+            js = self.get_movie_info(vid)
+            pl_link = js["message"]["translations"]["flash"].values()[0] # TODO process several players
             pl_link = self.decode_uppod_text(pl_link)
             js = self._http_request(pl_link)
             js = self.decode_uppod_text(js)
@@ -241,28 +217,16 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         video_link = m.group(1)
         series = True if video_link == '{video-link}' else False
         vid = plist[1]
-        headers = headers2dict("""
-    User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:50.0) Gecko/20100101 Firefox/50.0
-    Accept: application/json, text/javascript, */*; q=0.01
-    Accept-Language: en-US,en;q=0.5
-    Content-Type: application/x-www-form-urlencoded; charset=UTF-8
-    X-Requested-With: XMLHttpRequest
-    Referer: https://filmix.me/play/%s
-    """%vid )
-        post_data = {"post_id":vid}
-        r = util.post("https://filmix.me/api/movies/player_data", data=post_data, headers = headers)
-        if not r:
-            #raise Exception("Can not find video link")
-            return []
-        js = json.loads(r)
+        js = self.get_movie_info(vid)
         if js["message"]["translations"]["flash"]:
             video_link = js["message"]["translations"]["flash"].values()[0].encode("utf8")
-            lang = js["message"]["translations"]["flash"].keys()[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
         else:
             return []
 
         if not series : # Filma
-            url0 = self.decode_uppod_text(video_link)
+            url0 = video_link
             streams2 = self.get_streams2(url0)
             for st in streams2:
                 stream = util.item()
@@ -275,16 +239,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             return streams
 
         else: # Seriāls
-            r = util.request("https://m.filmix.me/"+path)
-            i = r.find("var flashvars")
-            if i == -1:
-                raise Exception("Can not find series list")
-            m = re.search('pl:"([^"]+)"', r[i:], re.DOTALL)
-            if not m:
-                #return []
-                raise Exception("Can not find series list")
-            pl_link = m.group(1)
-            pl_link = self.decode_uppod_text(pl_link)
+            pl_link = video_link
             js = self._http_request(pl_link)
             js = self.decode_uppod_text(js)
             js = json.loads(js)
@@ -311,6 +266,22 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         result = self._http_request(url,params,headers=headers)
         return result
 
+    def get_movie_info(self,vid):
+        headers = headers2dict("""
+    User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:50.0) Gecko/20100101 Firefox/50.0
+    Accept: application/json, text/javascript, */*; q=0.01
+    Accept-Language: en-US,en;q=0.5
+    Content-Type: application/x-www-form-urlencoded; charset=UTF-8
+    X-Requested-With: XMLHttpRequest
+    Referer: https://filmix.me/play/%s
+    """%vid )
+        post_data = {"post_id":vid}
+        r = util.post("https://filmix.me/api/movies/player_data", data=post_data, headers = headers)
+        if not r:
+            raise Exception("Can not get movie info")
+            #return []
+        js = json.loads(r)
+        return js
 
     def decode_uppod_text(self, text):
         Client_codec_a = ["l", "u", "T", "D", "Q", "H", "0", "3", "G", "1", "f", "M", "p", "U", "a", "I", "6", "k", "d", "s", "b", "W", "5", "e", "y", "="]
@@ -340,8 +311,11 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
 
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
+
+    c = Source()
+    #s = "ZnVuY3Rpb24gc2VuZE1lc3NhZ2U2MDc3ODkoZSl7dmFyIGg9bWdfd3M2MDc3ODkub25tZXNzYWdlOyBtZ193czYwNzc4OS5yZWFkeVN0YXRlPT1tZ193czYwNzc4OS5DTE9TRUQmJihtZ193czYwNzc4OT1uZXcgV2ViU29ja2V0KG1nX3dzNjA3Nzg5X2xvY2F0aW9uKSksbWdfd3M2MDc3ODkub25tZXNzYWdlPWgsd2FpdEZvclNvY2tldENvbm5lY3Rpb242MDc3ODkobWdfd3M2MDc3ODksZnVuY3Rpb24oKXttZ193czYwNzc4OS5zZW5kKGUpfSl9ZnVuY3Rpb24gd2FpdEZvclNvY2tldENvbm5lY3Rpb242MDc3ODkoZSx0KXtzZXRUaW1lb3V0KGZ1bmN0aW9uKCl7cmV0dXJuIDE9PT1lLnJlYWR5U3RhdGU/dm9pZChudWxsIT10JiZ0KCkpOnZvaWQgd2FpdEZvclNvY2tldENvbm5lY3Rpb242MDc3ODkoZSx0KX0sNSl9OyB2YXIgbWdfd3M2MDc3ODlfbG9jYXRpb24gPSAid3NzOi8vd3NwLm1hcmtldGdpZC5jb20vd3MiOyBtZ193czYwNzc4OSA9IG5ldyBXZWJTb2NrZXQobWdfd3M2MDc3ODlfbG9jYXRpb24pLCBtZ193czYwNzc4OS5vbm1lc3NhZ2UgPSBmdW5jdGlvbiAodCkge3Bvc3RNZXNzYWdlKHQuZGF0YSk7fSwgb25tZXNzYWdlID0gZnVuY3Rpb24oZSl7c2VuZE1lc3NhZ2U2MDc3ODkoZS5kYXRhKX0="
+
+    #txt = c.decode_uppod_text(s)
     if len(sys.argv)>1:
         data= sys.argv[1]
     else:

sources/movieplace.py

@@ -15,7 +15,12 @@ import ConfigParser
 from collections import OrderedDict
 from SourceBase import SourceBase
 import resolver
-import util
+try:
+    import util
+except:
+    sys.path.insert(0,'..')
+    import util
+
 
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 import HTMLParser

util.py

@@ -19,11 +19,9 @@
 # *  http://www.gnu.org/copyleft/gpl.html
 # *
 # */
-import os
-import re
-import sys
-import urllib
-import urllib2
+import os, sys, re
+import urllib, urllib2
+import datetime
 import traceback
 import cookielib
 import requests
@@ -47,6 +45,16 @@ LOG = 2
 _cookie_jar = None
 CACHE_COOKIES = 'cookies'
 
+def system():
+    if "kodi" in sys.executable.lower():
+        return "kodi"
+    elif sys.platform == "win32":
+        return "windows"
+    elif sys.platform == "linux2":
+        return "enigma2"
+    else:
+        return "unknown"
+
 def play_video(streams):
     if len(streams)>1:
         for i,s in enumerate(streams):
@@ -153,6 +161,7 @@ def streamproxy_decode(urlp):
 
 class Captions(object):
     def __init__(self,uri):
+        self.uri = uri
         self.subs = []
         self.styles = {}
         if uri.startswith("http"):
@@ -214,6 +223,19 @@ class Captions(object):
                 continue
         pass
 
+    def get_srt(self):
+        out = ""
+        i = 0
+        for sub in self.subs:
+            i +=1
+            begin = sub["begin"]
+            begin = "%s,%03i"%(str(datetime.timedelta(seconds=begin/1000)),begin%1000)
+            end = sub["end"]
+            end = "%s,%03i"%(str(datetime.timedelta(seconds=end/1000)),end%1000)
+            txt2 = sub["text"]
+            out += "%s\n%s --> %s\n%s\n\n\n"%(i,begin,end,txt2)
+        return out
+
 def str2sec(r):
     # Convert str time to miliseconds
     r= r.replace(",",".")
@@ -225,6 +247,7 @@ def str2sec(r):
     else:
         return -1
 
+
 #c = Captions("http://195.13.216.2/mobile-vod/mp4:lb_barbecue_fr_lq.mp4/lb_barbecue_lv.vtt")
 #c = Captions("http://www.bbc.co.uk/iplayer/subtitles/ng/modav/bUnknown-0edd6227-0f38-411c-8d46-fa033c4c61c1_b05ql1s3_1479853893356.xml")
 #url = "http://195.13.216.2/mobile-vod/mp4:ac_now_you_see_me_2_en_lq.mp4/ac_now_you_see_me_2_lv.vtt"
@@ -255,7 +278,8 @@ def item():
         'surl': '',
         'subs': [],
         'headers': {},
-        "desc":"","img":"",
+        "desc":"",
+        "img":"",
         "lang":"",
         "type":"",
         "resolver":"",