Merge remote-tracking branch 'origin/master'

servers/anavids.json

@@ -4,8 +4,8 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "anavids.com/((?:embed-)?[0-9a-zA-Z]+)",
-        "url": "https://anavids.com/\\1.html"
+        "pattern": "((?:anavids|vidspeeds|liivideo|liiivideo|allviids|vidbm|vidroba|vidbom|anafasts)).com(?:\\:\\d+)?/((?:embed-)?[0-9a-zA-Z]+)",
+        "url": "https://\\1.com/\\2.html"
       }
     ]
   },

servers/anavids.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from core import httptools, support
-from core import scrapertools
+from lib import jsunpack
 from platformcode import config, logger
 
 
@@ -17,5 +17,8 @@ def test_video_exists(page_url):
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     global data
+    packed = support.match(data, patron=r'(eval\(function\(p.*?)</').match
+    if packed:
+        data = jsunpack.unpack(packed).replace("\\", "")
     video_urls = support.get_jwplayer_mediaurl(data, 'AvaVids')
     return video_urls

servers/paramount_server.py

@@ -30,6 +30,6 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
         quality = quality.split('x')[0]
         if quality not in qualities:
             qualities.append(quality)
-            video_urls.append(["m3u8 {}p [Paramount]".format(quality), url])
+            video_urls.append(["hls {}p [Paramount]".format(quality), url])
     video_urls.sort(key=lambda url: int(support.match(url[0], patron=r'(\d+)p').match))
     return video_urls