Update Streamlare and Streamsb (#394)

servers/streamlare.py

@@ -23,22 +23,17 @@ def test_video_exists(page_url):
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     global data, response
     logger.info("(page_url='%s')" % page_url)
-    # from core.support import dbg
+
-    # dbg()
     video_urls = []
     id = scrapertools.find_single_match(page_url, '/e/(\w+)')
     post = {"id": id}
-    token = scrapertools.find_single_match(data, '<meta name="csrf-token" content="([^"]+)')
+    data = httptools.downloadpage("https://streamlare.com/api/video/stream/get", post=post).data.replace("\\","")
-    data = httptools.downloadpage("https://streamlare.com/api/video/stream/get",
+    matches = scrapertools.find_multiple_matches(data, 'label":"([^"]+).*?file":"([^"]+)')
-                                  post=post, headers={'X-CSRF-TOKEN': token, 'X-Requested-With': 'XMLHttpRequest',
+    for res, media_url in matches:
-                                                      'X-XSRF-TOKEN': httptools.urlparse.unquote(response.cookies.get('XSRF-TOKEN'))}).json
+        media_url += "|User-Agent=%s" %(httptools.get_user_agent())
-    # src = data["result"]["Original"]["src"]
+        video_urls.append(["MP4", media_url])
-    # media_url = ''.join([chr(51 ^ c) for c in base64.b64decode(src)])
-    media_url = data["result"]["file"]
-    video_urls.append(["MP4", media_url])
     return video_urls
 
-
 def get_filename(page_url):
     from core import jsontools
     file = jsontools.load(scrapertools.decodeHtmlentities(httptools.downloadpage(page_url).data.split(':file="')[1].split('"')[0]))

servers/streamsb.json

@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "(?:streamsb|sbembed|sbembed1|sbplay1|sbplay|pelistop|tubesb|playersb|embedsb|watchsb|streamas|sbfast|sbfull|viewsb|sbvideo|cloudemb|sbplay2|japopav|javplaya|ssbstream)\\.\\w{2,5}/(?:embed-|d/|e/)?([A-z0-9]+)",
+        "pattern": "(?:streamsb|sbembed|sbembed1|sbplay1|sbplay|pelistop|tubesb|playersb|embedsb|watchsb|streamas|sbfast|sbfull|viewsb|sbvideo|cloudemb|sbplay2|japopav|javplaya|ssbstream|sbthe|sbspeed)\\.\\w{2,5}/(?:embed-|d/|e/)?([A-z0-9]+)",
         "url": "https://streamsb.net/d/\\1"
       },
       {
@@ -26,4 +26,4 @@
       "visible": true
     }
   ]
-}
+}