Fix Wstream (in caso non serva recaptcha)

servers/wstream.py

@@ -24,32 +24,32 @@ def test_video_exists(page_url):
     resp = httptools.downloadpage(page_url)
     global data
     data = resp.data
-    captcha = platformtools.show_recaptcha(scrapertools.find_single_match(data, 'data-sitekey="([^"]+)'), page_url)
+    logger.info(data)
-    if captcha:
-        page_url = resp.url
-        if '/streaming.php' in page_url in page_url:
-            code = \
-            httptools.downloadpage(page_url, headers=headers, follow_redirects=False).headers['location'].split('/')[
-                -1].replace('.html', '')
-            logger.info('WCODE=' + code)
-            page_url = 'https://wstream.video/video.php?file_code=' + code
-            data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True).data
 
-        possibleParam = scrapertools.find_multiple_matches(data,
+    sitekey = scrapertools.find_single_match(data, 'data-sitekey="([^"]+)')
-                                                           r"""<input.*?(?:name=["']([^'"]+).*?value=["']([^'"]*)['"]>|>)""")
+    captcha = platformtools.show_recaptcha(sitekey, page_url) if sitekey else ''
-        if possibleParam:
+
-            post = {param[0]: param[1] for param in possibleParam if param[0]}
+    page_url = resp.url
-            post['g-recaptcha-response'] = captcha
+    if '/streaming.php' in page_url in page_url:
-            if post:
+        code = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).headers['location'].split('/')[-1].replace('.html', '')
-                data = httptools.downloadpage(page_url, headers=headers, post=post, follow_redirects=True).data
+        logger.info('WCODE=' + code)
-            else:
+        page_url = 'https://wstream.video/video.php?file_code=' + code
-                int_bckup_method()
+        data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True).data
-        else:
+
+    possibleParam = scrapertools.find_multiple_matches(data, r"""<input.*?(?:name=["']([^'"]+).*?value=["']([^'"]*)['"]>|>)""")
+    if possibleParam:
+        post = {param[0]: param[1] for param in possibleParam if param[0]}
+        if captcha: post['g-recaptcha-response'] = captcha
+        if post:
+            data = httptools.downloadpage(page_url, headers=headers, post=post, follow_redirects=True).data
+        elif captcha:
             int_bckup_method()
+    elif captcha:
+        int_bckup_method()
 
-            if "Not Found" in data or "File was deleted" in data:
+        if "Not Found" in data or "File was deleted" in data:
-                return False, config.get_localized_string(70449) % 'Wstream'
+            return False, config.get_localized_string(70449) % 'Wstream'
-            return True, ""
+        return True, ""
     else:
         return False, config.get_localized_string(707434)