salabots euronews

run.py

@@ -684,6 +684,7 @@ def play_stream(stream, tmp_path=""):
 def player(url, title = "", subfile = "",headers={}, player="ffplay"):
     from subprocess import call
     title = cunicode(title).encode(sys.getfilesystemencoding())
+    url =  cunicode(url).encode(sys.getfilesystemencoding())
     # encode(sys.getfilesystemencoding())
     subfile = unicode(subfile).encode(sys.getfilesystemencoding())
     cmd1 = [r"c:\Program Files\VideoLAN\VLC\vlc.exe",url,

sources/euronews.py

@@ -127,7 +127,7 @@ Connection: keep-alive
                     ptitle = article["pTitle"] if "pTitle" in article else ""
                     id = article["id"]
                     desc = "%s\n%s\n%s %s"%(title,atime,vert,ptitle)
-                    img = "http://static.euronews.com/articles/%s/399x225_%s.png"%(id,id)
+                    img = "http://static.euronews.com/articles/%s/399x225_%s.jpg"%(id,id)
                     if not atype in ("breakingnews","wire"):
                         data2 = "content/getArticle?lang=%s&id=%s"%(lang,id)
                     else:
@@ -161,29 +161,25 @@ Connection: keep-alive
         streams = []
 
         if path == "live":
-            url = "http://www.euronews.com/api/watchlive.json" if lang == "en" else "http://%s.euronews.com/api/watchlive.json" % lang
-            r = self._http_request(url)
-            try:
-                js = json.loads(r)
-                url = js["url"]
-            except:
-                raise Exception("No live stream found")
-            r = self._http_request(url)
-            try:
-                js = json.loads(r)
-                if not js["status"]=="ok":
-                    raise Exception("No live stream found")
-            except:
-                raise Exception("No live stream found")
-
-            stream = util.item()
-            stream["url"]=js["primary"]
-            stream["lang"]= lang
-            stream["quality"]="variant"
-            stream["name"]="Euronews live [%s]"%lang
-            stream["desc"]=stream["name"]
-            stream["type"]="hls" #stream_type(url)
-            streams.append(stream)
+            if "lang" in qs:
+                del qs["lang"]
+            languages = self.get_languages()
+            for lang in languages:
+                # http://api.euronews.com/ipad/androidPhoneEuronews-1.4/live.getUrl/en
+                data2 =  "live.getUrl/%s" % lang
+                js = self.call2(data2)
+                if not "primary" in js:
+                    continue
+                stream = util.item()
+                stream["url"]=js["primary"]
+                stream["lang"]= lang
+                stream["quality"]="variant"
+                stream["name"]="Euronews live [%s]"%lang
+                stream["desc"]=stream["name"]
+                stream["type"]="hls" #stream_type(url)
+                streams.append(stream)
+            if not streams:
+                raise Exception("No streams found!")
 
         elif clist=="content" and plist[1] == "getArticle":
             if "lang" in qs:
@@ -191,8 +187,8 @@ Connection: keep-alive
             languages = self.get_languages()
             for lang in languages:
                 id = qs["id"]
-                req = '{"methodName":"content.getArticle","apiKey":"androidPhoneEuronews-1.0","params":{"id":"%s"},"language":"%s"}'%(id,lang)
-                r = self.call(req)
+                url = "content.getArticle/%s?format=html&id=%s" % (lang, id)
+                r = self.call2(url)
                 if not r:
                     raise Exception("No live stream found")
                 if not "articlelist" in r:
@@ -289,6 +285,23 @@ content-disposition: form-data; name=request
         else:
             return None
 
+    def call2(self, data, headers=None):
+        if not headers: headers = self.headers
+        #if not lang: lang = self.country
+        url = "http://api.euronews.com/ipad/androidPhoneEuronews-1.4/" + data
+        headers = headers2dict("""
+User-Agent: okhttp/3.8.1
+   """)
+        content = self._http_request(url, headers=headers)
+        if content:
+            try:
+                result = json.loads(content)
+                return result
+            except Exception, ex:
+                return None
+        else:
+            return None
+
 
 if __name__ == "__main__":
     language= "en"