Merge remote-tracking branch 'origin/master'

servers/decrypters/zcrypt.py

@@ -47,8 +47,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
                     data, status = unshortenit.unshorten(url)
                     logger.info("Data - Status zcrypt xshield.net: [%s] [%s] " %(data, status)) 
                 elif 'vcrypt.net' in url:
-                    if 'myfoldersakstream.php' in url:
-                        continue #'very' in url or 
+                    if 'myfoldersakstream.php' in url or '/verys/' in url:
+                        continue
                     else:                                
                         from lib import unshortenit
                         data, status = unshortenit.unshorten(url)
@@ -89,7 +89,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
 
     for url in matches:
         if url not in encontrados:
-            if 'https://rapidcrypt.net/open/' in url:
+            if 'https://rapidcrypt.net/open/' in url or 'https://rapidcrypt.net/verys/' in url:
                 continue            
             logger.info("  url=" + url)
             encontrados.add(url)

servers/wstream.py

@@ -51,8 +51,9 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
 
         return video_urls
     else:
-        page_urls = scrapertools.find_multiple_matches(data, '''<a href=(?:"|')([^"']+)(?:"|')''')
+        page_urls = scrapertools.find_multiple_matches(data, '''<input type='hidden' id='videox' name='videox' value='([^']+)'>''')
         for page_url in page_urls:
+            page_url = 'https://wstream.video/video5rqlew27k/'+page_url
             if '404 Not Found' not in httptools.downloadpage(page_url, headers=headers).data.replace('https', 'http'):
                 return get_video_url(page_url)
 
@@ -77,4 +78,4 @@ def find_videos(data):
         else:
             logger.info("  url duplicada=" + url)
 
-    return devuelve
+    return devuelve