darba versija

sources/enigma2.py

@@ -61,8 +61,12 @@ Accept-Language: en-US,en;q=0.5
         content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
+            data3 = "getcurrent"
+            r2 = self.call(data3)
+            event = r2["now"]
+            title, img, desc = self.get_title_desc(event)
+            content.append(("Current stream: "+title, self.name+"::"+"streamcurrent.m3u", img, desc))
             r = self.call("bouquets?stype=tv")
-            content.append(("Current stream", self.name+"::"+"streamcurrent.m3u", self.img, "Current receiver stream"))
             for item in r["bouquets"]:
                 title = item[1]
                 data2 = "getservices?sRef=%s" % item[0]
@@ -124,11 +128,6 @@ Accept-Language: en-US,en;q=0.5
         if not self.is_video(data):
             return []
         source,data,path,plist,clist,params,qs = self.parse_data(data)
-        r = self._http_request(self.url+data)
-        m =  re.search("(http(s)*:.+)", r)
-        if not m:
-            raise Exception("No streams found!")
-        data2 = m.group(1)
         if "stream.m3u" in data:
             data3 = data.replace("stream.m3u?ref=","epgservicenow?sRef=")
             r2 = self.call(data3)
@@ -138,6 +137,13 @@ Accept-Language: en-US,en;q=0.5
             r2 = self.call(data3)
             event = r2["now"]
         title, img, desc = self.get_title_desc(event)
+
+        #r = self.call(data)
+        #m =  re.search("(http(s)*:.+)", r)
+        #if not m:
+        #    raise Exception("No streams found!")
+        #data2 = m.group(1)
+        data2 = "http://videolink"
         stream = util.item()
         stream["name"] = title
         stream["url"] = data2