ltc info update u.c.

sources/ltc.py

@@ -99,11 +99,13 @@ Accept-Language: en-US,en;q=0.8
         elif path == 'viss/search/': #TODO vod/search/{q}
             r = self.call2(data)
             if "cat=movies" in data:
-                result = re.findall(' class="forward-link" href="/([^"]+)"><img src="([^"]+)".+?class="categorie-one-title">([^<]+)<', r)
+                result = re.findall('class="forward-link" href="/([^"]+)">(<div class="new-movie">Premiere</div>)*<img src="([^"]+)".+?class="categorie-one-title">([^<]+)<', r, re.MULTILINE)
                 for item in result:
-                    title = item[2]
+                    title = item[3]
+                    if not item[1]:
+                        title = title + "[P]"
                     data2 = item[0][0:-1]
-                    img = "https://www.lattelecom.tv" + item[1]
+                    img = "https://www.lattelecom.tv" + item[2]
                     desc = title
                     content.append((title,self.name+"::"+data2,img,desc))
                 return content
@@ -112,20 +114,26 @@ Accept-Language: en-US,en;q=0.8
 
         ### Tiešraides kanānālu saraksts ###
         elif data=="tiesraide":
-            r = self.call2(data)
-            m = re.search("var xprs_ides_array = (.+);", r, re.MULTILINE)
-            if m:
-                js=json.loads(m.group(1))
-            else:
-                raise Exception("Error reading channel list")
+            #r = self.call2(data)
+            #m = re.search("var xprs_ides_array = (.+);", r, re.MULTILINE)
+            #if m:
+            #    js=json.loads(m.group(1))
+            #else:
+            #    raise Exception("Error reading channel list")
+            r = self.call2("program-snippet.json")
+            try:
+                js = json.loads(r)
+            except:
+                js = {}
             for item in self.get_channels():
                 if item["live"]=='0':continue
                 title = item["name"]
                 data2 = "content/live-streams/%s?include=quality"%item["id"]
-                if item['xprs_id'] in js:
-                    epg = js[item['xprs_id']]
+                if item["xprs_id"] in js:
+                    epg = js[item["xprs_id"]]
                     desc = "%s - %s (%s-%s)"%(title,epg[0]["t"],epg[0]["hs"],epg[0]["he"])
-                    img = "https://www.lattelecom.tv" + epg[0]["p"]
+                    #img = "https://www.lattelecom.tv" + epg[0]["p"]
+                    img = "https://manstv.lattelecom.tv/"+ item['broadcast_default_picture']
                 else:
                     img = "https://manstv.lattelecom.tv/"+ item['broadcast_default_picture']
                     desc = title
@@ -431,6 +439,7 @@ Accept-Language: en-US,en;q=0.8
                     t1 = datetime.datetime.fromtimestamp(int(r2["items"][0]["unix_start"])).strftime('%H:%M')
                     t2 = datetime.datetime.fromtimestamp(int(r2["items"][0]["unix_stop"])).strftime('%H:%M')
                     title = "%s (%s-%s)"%(title,t1,t2)
+                    img = "https://manstv.lattelecom.tv/cache/" + r2["items"][0]["url"]
                     desc = r2["items"][0]["description"]
                 else:
                     title = ch["name"]