pielabots ltc, config

ContentSources.py

@@ -18,7 +18,7 @@ class ContentSources(object):
     """Wrapper for content sources plugin"""
 
     #----------------------------------------------------------------------
-    def __init__(self, plugin_path, cfg_file="streams.cfg"):
+    def __init__(self, plugin_path, cfg_file="streams.cfg", cfg_file2=None):
         self.plugins = {}
         self.error_content = [("..atpakaļ", "back", "back.png", "Kļūda, atgriezties atpakaļ")]
         sys.path.insert(0, plugin_path)

changelog.md

@@ -1,3 +1,6 @@
+**05.12.2018**
+- pielabots ltc (arhīvu bildes, kārtība u.c.)
+
 **29.09.2018**
 - salabots TVPlay (raidījumi pa ketogorijām)
 

sources/config.py

@@ -12,18 +12,23 @@ from SourceBase import SourceBase
 os.path.dirname(os.path.abspath(__file__))
 class Source(SourceBase):
 
-    def __init__(self,country="lv",cfg_path=None, cfg_file=""):
+    def __init__(self, cfg_file="streams.cfg", cfg_file2=None):
         self.name = "config"
-        self.country=country
         self.lists = collections.OrderedDict()
         self.titles = {}
-        if not cfg_file: cfg_file = "streams.cfg"
-        cur_directory = os.path.dirname(os.path.abspath(__file__))
-        if not cfg_path: cfg_path = cur_directory
-        self.cfg_path = cfg_path
+        cur_directory = os.path.dirname(__file__)
+        self.cfg_path = cur_directory
         self.set_streams_file(cfg_file)
         print "streams_file=", self.streams_file
-        self.read_streams()
+        try:
+            self.read_streams()
+        except Exception as e:
+            if cfg_file2:
+                # Try fallback
+                self.set_streams_file(cfg_file2)
+                self.read_streams()
+            else:
+                raise Exception(e.message)
 
     def set_streams_file(self, cfg_file):
         if not ("/" in cfg_file or "\\" in cfg_file):  # ja tikai faila nosaukums, tad meklē to source folderi

sources/ltc.py

@@ -608,6 +608,7 @@ X-Requested-With: XMLHttpRequest
                 else:
                     title = ch["name"]
                     desc = title
+                    img = ""
             elif vtype == "record-streams":
                 epg = self.get_epg_id(vid)
                 if epg:
@@ -615,10 +616,12 @@ X-Requested-With: XMLHttpRequest
                     t1 = datetime.datetime.fromtimestamp(int(epg["unix_start"])).strftime('%H:%M')
                     t2 = datetime.datetime.fromtimestamp(int(epg["unix_stop"])).strftime('%H:%M')
                     date = epg["date"]
-                    title = "%s (%s %s-%s)"%(title,date,t1,t2)
-                    desc = epg["description"]
+                    #title = "%s [%s %s-%s]"%(title,date,t1,t2)
+                    desc = title + "\n" + epg["description"].encode("utf8")
+                    img = epg["img"].encode("utf8") if "img" in epg else ""
                 else:
                     title = desc = data
+                    img = ""
 
             streams = []
             for s in r["data"]:
@@ -626,6 +629,7 @@ X-Requested-With: XMLHttpRequest
                 stream["url"]=(s["attributes"]["stream-url"]+token.encode("utf8")).encode("utf8")
                 stream["name"]=title
                 stream["desc"]=desc
+                stream["img"] = img
                 stream["type"]="hls"
                 m=re.search(".+_(\w\w)_(\w\w)\.\w+",s["id"])
                 if m:
@@ -763,6 +767,7 @@ X-Requested-With: XMLHttpRequest
             item["time_start2"] = datetime.datetime.fromtimestamp(int(item["unix_start"]))
             item["time_stop2"] = datetime.datetime.fromtimestamp(int(item["unix_stop"]))
             item["date"]=item["time_start2"].strftime("%Y-%m-%d")
+            item["img"] = "https://manstv.lattelecom.tv/" + item["url"]
             return item
 
     def get_epg_date(self,date,chid):
@@ -774,6 +779,7 @@ X-Requested-With: XMLHttpRequest
             item = self.epg[it]
             if item["channel_id"]==ch["xprs_id"]:
                 items.append(item)
+        items.reverse()
         return items