ltc epg info

sources/ltc.py

@@ -12,7 +12,6 @@ from urllib import quote, unquote
 import datetime
 import HTMLParser
 import json
-import datetime
 from SourceBase import SourceBase, stream_type
 import util
 from util import unescape
@@ -187,12 +186,12 @@ Accept-Language: en-US,en;q=0.8
                 item = self.get_epg_id(item["id"])
                 ch = self.get_channel_by_id2(item["channel_id"])
                 ch_name = ch["name"] if ch else item["channel_id"]
-                title = u"[%s %s-%s] %s - %s"%(item["date"],item["time_start2"].strftime("%H:%M"),item["time_stop2"].strftime("%H:%M"),ch_name,item["title"])
+                title = u"%s (%s-%s)"%(item["title"], item["time_start2"].strftime("%H:%M"),item["time_stop2"].strftime("%H:%M"))
                 #data2 = "archive/get-stream/%s?channelid=%s"%(item["id"],ch["id"])
                 data2 = "content/record-streams/%s?include=quality"%item["id"]
                 img = "https://manstv.lattelecom.tv/"+ item["url"]
-                desc = u"%s - %s\n%s - %s\n%s\n%s"%(ch_name,item["title"],item["time_start"],item["time_stop"],
-                                                          item["category1"],item["description"])
+                desc = u"%s - %s\n%s %s-%s\n%s\n%s"%(ch_name,item["title"], item["date"], item["time_start2"].strftime("%H:%M"),item["time_stop2"].strftime("%H:%M"),
+                                                                 item["category1"],item["description"])
                 content.append((title,self.name+"::"+data2,img,desc))
             if "until_id" in data:
                 data2 = re.sub("until_id=\d+","until_id="+item["id"],data)
@@ -216,17 +215,20 @@ Accept-Language: en-US,en;q=0.8
         elif "archive/channel/" in data:
             chid = path.split("/")[2]
             for item in self.get_epg_date(qs["date"],chid):
-                #if item["is_archive"]=='0':continue
+                if item["is_archive"]=='0':continue
+                if item["time_stop2"] > datetime.datetime.now(): continue
                 ch = self.get_channel_by_id2(item["channel_id"])
                 ch_name = ch["name"] if ch else item["channel_id"]
-                title = u"[%s %s-%s] %s - %s"%(item["date"],item["time_start2"].strftime("%H:%M"),item["time_stop2"].strftime("%H:%M"),ch_name,item["title"])
+                #title = u"[%s %s-%s] %s - %s"%(item["date"],item["time_start2"].strftime("%H:%M"),item["time_stop2"].strftime("%H:%M"),ch_name,item["title"])
+                title = u"%s (%s-%s)"%(item["title"], item["time_start2"].strftime("%H:%M"),item["time_stop2"].strftime("%H:%M"))
                 #data2 = "archive/get-stream/%s?channelid=%s"%(item["id"],ch["id"])
                 data2 = "content/record-streams/%s?include=quality"%item["id"]
                 img = "https://manstv.lattelecom.tv/"+ item["url"]
-                desc = u"%s - %s\n%s - %s\n%s\n%s"%(ch_name,item["title"],item["time_start"],item["time_stop"],
+                desc = u"%s - %s\n%s %s-%s\n%s\n%s"%(ch_name,item["title"], item["date"], item["time_start2"].strftime("%H:%M"),item["time_stop2"].strftime("%H:%M"),
                                                           item["category1"],item["description"])
                 content.append((title,self.name+"::"+data2,img,desc))
-            date2=datetime.datetime.strptime(qs["date"], '%Y-%m-%d').date()-datetime.timedelta(days=1)
+            #date2=datetime.datetime.strptime(qs["date"], '%Y-%m-%d').date()-datetime.timedelta(days=1)
+            date2 = datetime.date(*tuple(map(int, qs["date"].split("-")))) - datetime.timedelta(days=1)
             date2 = date2.strftime("%Y-%m-%d")
             if "date=" in data:
                 data2 = re.sub("date=[\d-]+","date="+date2,data)
@@ -592,12 +594,20 @@ Accept-Language: en-US,en;q=0.8
 
 
     def get_epg_id(self,epgid):
-        if not self.epg:
-            return None
-            #self.get_epg()
-        if epgid in self.epg_id:
+
+        if self.epg and epgid in self.epg_id:
             return self.epg[self.epg_id[epgid]]
-        return None
+        else:
+            r=self.call("content/epgs/%s" % epgid)
+            if not r:
+                return None
+            item =  r["data"][0]["attributes"]
+            item["unix_start"] = item["unix-start"]
+            item["unix_stop"] = item["unix-stop"]
+            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")
+            return item
 
     def get_epg_date(self,date,chid):
         if not date in self.epgdates: