work

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "content"]
+	path = content
+	url = http://root@git.blue.lv/home/content.git

ContentSources.py

@@ -12,6 +12,7 @@ sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 from sources.SourceBase import stream_type
 import util
 
+show_hidden = False  # Ja True, tad vienalga radā hidden sources (noder izstradē)
 
 class ContentSources(object):
     """Wrapper for content sources plugin"""
@@ -61,19 +62,24 @@ class ContentSources(object):
     def get_content(self,data):
         source = data.split("::")[0]
         if source in self.plugins:
-            content = self.plugins[source].get_content(data)
-            if content:
-                if isinstance(content,list):
-                    for i,item in enumerate(content):
+            content0 = self.plugins[source].get_content(data)
+            if content0:
+                content = []
+                if isinstance(content0,list):
+                    for i,item in enumerate(content0):
+                        source2 = item[1].split("::")[0]
+                        if not (source2 == "back" or item[1].startswith("http") or item[1].startswith("rtmp")):
+                            if source2 not in self.plugins or (not show_hidden and "hidden" in dir(self.plugins[source2]) and self.plugins[source2].hidden):
+                                continue
                         item2=[]
                         for el in item:
                             if isinstance(el,unicode):
                                 el = el.encode("utf8")
                             item2.append(el)
-                        content[i]=tuple(item2)
+                        content.append(tuple(item2))
                 else:
                     item2=[]
-                    for el in content:
+                    for el in content0:
                         if isinstance(el,unicode):
                             el = el.encode("utf8")
                         item2.append(el)
@@ -161,6 +167,7 @@ class ContentSources(object):
 
 if __name__ == "__main__":
 
+    show_hidden = False
     sources = ContentSources("sources")
     if len(sys.argv)>1:
         data= sys.argv[1]

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.6v"
+__version__ = "0.7e"
 __id__ = "playstream"
 __title__ = "PlayStream"
 __author__ = "ivars777@gmail.com"

changelog.md

@@ -1,3 +1,21 @@
+**0.7e** (13.09.2017)
+- [bugfix] Salabots lattelecom.tv (bija pamainīts web formāts)
+
+
+**0.7c** (03.09.2017)
+- [bugfix] Salabots filmix (pamainīts direct url avots uz html5 + dekodēšana kods)
+
+**0.7b** (27.08.2017)
+- [bugfix] Izlabota kļūda, ja iekš streams.cfg ir links uz neesošu pluginu
+
+**0.7a** (26.08.2017)
+- [change] Salabots TVDom atbilstoši jaunajam API
+- [bugfix] Salabots Euronews
+- [change] Nestrādājošie avoti noslēpti menu, kad tiks salaboti parādīsies atkal
+
+**0.6w** (22.07.2017)
+- [change] Sataisīts izmainītais Filmix.me
+
 **0.6v** (26.06.2017)
 - [bugfix] Kļuda ar SSL pythonā <2.7.9
 

content

@@ -0,0 +1 @@
+Subproject commit 82f74e9379b371001390a46985b9e3035df186bf

playstreamproxy.py

@@ -56,7 +56,7 @@ class StreamHandler(BaseHTTPRequestHandler):
             ct = "application/vnd.apple.mpegurl"
         elif ".ts" in self.path.lower():
             ct = "video/MP2T"
-        elif ".mp4" in ".ts" in self.path.lower():
+        elif ".mp4" in self.path.lower():
             ct = "video/mp4"
         else:
             ct = "text/html"
@@ -394,6 +394,11 @@ class StreamHandler(BaseHTTPRequestHandler):
             print_headers(r.headers)
         return r
 
+    def address_string(self):
+        host, port = self.client_address[:2]
+        #return socket.getfqdn(host)
+        return host
+
 class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
     """Handle requests in a separate thread."""
 

util.py

@@ -134,8 +134,8 @@ def play_video(streams):
         stream = streams[0]
 
     stream = stream_change(stream)
-    title = stream["name"] if not "nfo" in stream else nfo2title(stream["nfo"])
-    desc = stream["desc"] if not "nfo" in stream else nfo2desc(stream["nfo"])
+    title = stream["name"] if not "nfo" in stream or not stream["nfo"] else nfo2title(stream["nfo"])
+    desc = stream["desc"] if not "nfo" in stream or not stream["nfo"] else nfo2desc(stream["nfo"])
     img = stream["img"]
     url = stream["url"]
     suburl = ""
@@ -145,7 +145,7 @@ def play_video(streams):
         print "\n**Download subtitles %s - %s"%(title,suburl)
         subs = urllib2.urlopen(suburl).read()
         if subs:
-            fname0 = re.sub("[/\n\r\t,]","_",title)
+            fname0 = re.sub("[/\n\r\t,:\?]","_",title)
             subext = ".srt"
             subfile = os.path.join("",fname0+subext)
             if ".xml" in suburl:
@@ -179,6 +179,20 @@ def player(url, title = "", suburl= "",headers={}):
         #a = raw_input("*** Error, continue")
     return
 
+def stream_type(data):
+    data = data.lower()
+    m = re.search(r"^(\w+)://", data)
+    prefix = m.group(1) if m else ""
+    if prefix in ("http","https"):
+        if ".m3u8" in data:
+            return "hls"
+        elif ".mpd" in data:
+            return "dash"
+        else:
+            return "http"
+    else:
+        return prefix
+
 def check_version(package,url="http://feed.blue.lv/Packages"):
     "Return current package version from OPKG feed"
     url = "http://feed.blue.lv/Packages"