Merge remote-tracking branch 'origin/master'

servers/supervideo.py

@@ -12,6 +12,9 @@ def test_video_exists(page_url):
     logger.debug("(page_url='%s')" % page_url)
     global data
     data = httptools.downloadpage(page_url, cookies=False).data
+    if 'Video embed restricted for this domain'in data:
+        headers = {'Referer':''}
+        data = httptools.downloadpage(page_url, headers=headers, cookies=False).data
     if 'File is no longer available as it expired or has been deleted' in data:
         return False, config.get_localized_string(70449) % "SuperVideo"
 

servers/wstream.json

@@ -7,11 +7,11 @@
     "find_videos": {
         "patterns": [
             {
-                "pattern": "(?:wstream\\.video|wstream\\.icu)(?!<)(?:=|/)(?:video[a-zA-Z0-9.?_]*|embed[a-zA-Z0-9]*|)?(?!api|swembedid)(?:-|/|=)?(?:[a-z0-9A-Z]+/)?([a-z0-9A-Z]+)",
+                "pattern": "(?:wstream\\.video|wstream\\.icu)(?!<)(?:=|/)(?:video[a-zA-Z0-9.?_]*|embed[a-zA-Z0-9]*|)?(?!api|swembedid|swvideoid)(?:-|/|=)?(?:[a-z0-9A-Z]+/)?([a-z0-9A-Z]+)",
                 "url": "http://wstream.video/video.php?file_code=\\1"
             },
             {
-                "pattern": "(?:wstream\\.video|wstream\\.icu)/((?:api/vcmod/fastredirect/streaming\\.php\\?id=|swembedid/)[$0-9]+)",
+                "pattern": "(?:wstream\\.video|wstream\\.icu)/((?:api/vcmod/fastredirect/streaming\\.php\\?id=|swembedid|swvideoid/)[$0-9]+)",
                 "url": "http://wstream.video/\\1"
             },
             {

servers/wstream.py

@@ -21,7 +21,9 @@ def test_video_exists(page_url):
     headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20100101 Firefox/54.0']]
 
     logger.debug("(page_url='%s')" % page_url)
-    resp = httptools.downloadpage(page_url, headers=headers, verify=False)
+    disable_directIP = False
+    if 'swvideoid' in page_url: disable_directIP = True
+    resp = httptools.downloadpage(page_url, headers=headers, verify=False, disable_directIP=disable_directIP)
 
     global data, real_url
     data = resp.data