palabots enigma2

sources/enigma2.py

@@ -65,7 +65,7 @@ Accept-Language: en-US,en;q=0.5
             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))
+            content.append(("Current stream: "+title, self.name+"::"+"streamcurrent", img, desc))
             r = self.call("bouquets?stype=tv")
             for item in r["bouquets"]:
                 title = item[1]
@@ -80,7 +80,7 @@ Accept-Language: en-US,en;q=0.5
             r2 = self.call(data3)
             for item in r["services"]:
                 title = item["servicename"]
-                data2 = "stream.m3u?ref=%s&name=%s" % (item["servicereference"], title)
+                data2 = "stream?ref=%s&name=%s" % (item["servicereference"], title)
                 img = self.img
                 desc = title
                 for item2 in r2["events"]:
@@ -110,7 +110,7 @@ Accept-Language: en-US,en;q=0.5
 
     def is_video(self,data):
         source,data,path,plist,clist,params,qs = self.parse_data(data)
-        if clist in ("stream.m3u", "streamcurrent.m3u"):
+        if clist in ("stream", "streamcurrent"):
             return True
         else:
             return False
@@ -128,14 +128,16 @@ 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)
-        if "stream.m3u" in data:
-            data3 = data.replace("stream.m3u?ref=","epgservicenow?sRef=")
-            r2 = self.call(data3)
-            event = r2["events"][0]
-        else:
+        if "streamcurrent" in data:
             data3 = "getcurrent"
             r2 = self.call(data3)
             event = r2["now"]
+            data = data.replace("streamcurrent", "streamcurrent.m3u")
+        else:
+            data3 = data.replace("stream?ref=","epgservicenow?sRef=")
+            r2 = self.call(data3)
+            event = r2["events"][0]
+            data = data.replace("stream", "stream.m3u")
         title, img, desc = self.get_title_desc(event)
 
         r = self._http_request(self.url+data)