aggiunti server anavids, streamtape, vidmoly

fix animeworld

servers/anavids.json

@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "anavids.com/((?:embed-)?[0-9a-zA-Z]+)",
+        "url": "https://anavids.com/\\1.html"
+      }
+    ]
+  },
+  "free": true,
+  "id": "anavids",
+  "name": "AnaVids",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": "https://supervideo.tv/images/logo-player.png"
+}

servers/anavids.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+from core import httptools, support
+from core import scrapertools
+from platformcode import config, logger
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+
+    data = httptools.downloadpage(page_url, cookies=False).data
+    if 'File you are looking for is not found.' in data:
+        return False, config.get_localized_string(70449) % "AvaVids"
+
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    logger.info("url=" + page_url)
+    data = httptools.downloadpage(page_url).data
+    video_urls = support.get_jwplayer_mediaurl(data, 'AvaVids')
+    return video_urls

servers/animeworld_server.py

@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
-import urllib
+import sys
+if sys.version_info[0] >= 3:
+    import urllib.parse as urllib
+else:
+    import urllib
 
 from core import httptools, jsontools
-from platformcode import logger
+from platformcode import logger, config
 
 
 def test_video_exists(page_url):
@@ -11,7 +15,7 @@ def test_video_exists(page_url):
     data_json = httptools.downloadpage(page_url.replace('/v/', '/api/source/'), headers=[['x-requested-with', 'XMLHttpRequest']], post=post).data
     json = jsontools.load(data_json)
     if not json['data']:
-        return False, "Video not found"
+        return False, config.get_localized_string(70449) % "AnimeWorld"
 
     return True, ""
 
@@ -27,7 +31,7 @@ def get_video_url(page_url, user="", password="", video_password=""):
             media_url = file['file']
             label = file['label']
             extension = file['type']
-            video_urls.append([label + " " + extension + ' [animeworld]', media_url])
+            video_urls.append([label + " " + extension + ' [AnimeWorld]', media_url])
 
 
     return video_urls

servers/onlystream.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from core import httptools
+from core import httptools, support
 from core import scrapertools
 from platformcode import config, logger
 
@@ -17,15 +17,7 @@ def test_video_exists(page_url):
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("url=" + page_url)
-    video_urls = []
     data = httptools.downloadpage(page_url).data
     # logger.info(data)
-    block = scrapertools.find_single_match(data, r'sources: \[([^\]]+)\]')
-    sources = scrapertools.find_multiple_matches(block, r'file:\s*"([^"]+)"(?:,label:\s*"([^"]+)")?')
-    if not sources:
-        sources = scrapertools.find_multiple_matches(data, r'src:\s*"([^"]+)",\s*type:\s*"[^"]+",[^,]+,\s*label:\s*"([^"]+)"')
-    for url, quality in sources:
-        quality = 'auto' if not quality else quality
-        video_urls.append(['.' + url.split('.')[-1] + ' [' + quality + '] [Onlystream]', url])
-    video_urls.sort(key=lambda x: x[0].split()[1])
+    video_urls = support.get_jwplayer_mediaurl(data, 'Onlystream')
     return video_urls

servers/streamtape.json

@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "https?://streamtape\\.com/e/(\\w+)",
+        "url": "https://streamtape.com/e/\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "streamtape",
+  "name": "Streamtape",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": ""
+}

servers/streamtape.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+from core import httptools
+from core import scrapertools
+from platformcode import logger, config
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    global data
+    data = httptools.downloadpage(page_url).data
+    if "Video not found" in data:
+        return False, config.get_localized_string(70449) % "Streamtape"
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    logger.info("url=" + page_url)
+    video_urls = []
+    global data
+
+    url = scrapertools.find_single_match(data, 'id="videolink"[^>]+>\n?\s*//(.*?)<')
+    if url:
+        media_url = 'https://' + url + '&stream=1'
+        video_urls.append([".mp4 [Streamtape]", media_url])
+
+    return video_urls

servers/turbovid.py

@@ -3,7 +3,7 @@
 import time
 import urllib
 
-from core import httptools
+from core import httptools, support
 from core import scrapertools
 from platformcode import logger, config
 
@@ -29,9 +29,5 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     time.sleep(6)
     data = httptools.downloadpage(page_url_post, post=post).data
     logger.info("(data page_url='%s')" % data)
-    sources = scrapertools.find_single_match(data, r'sources: \[([^\]]+)\]')
-
-    for media_url in scrapertools.find_multiple_matches(sources, '"([^"]+)"'):
-        ext = scrapertools.get_filename_from_url(media_url)[-4:]
-        video_urls.append(["%s [%s]" % (ext, server), media_url])
+    video_urls = support.get_jwplayer_mediaurl(data, 'Turbovid')
     return video_urls

servers/vidmoly.json

@@ -0,0 +1,46 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "https?://vidmoly.net/(?:embed-)?(\\w+)\\.html",
+        "url": "https://vidmoly.net/embed-\\1.html"
+      },
+      {
+        "pattern": "https?://fasturl.ga/(?:embed-)?(\\w+)\\.html",
+        "url": "https://vidmoly.net/embed-\\1.html"
+      }
+    ]
+  },
+  "free": true,
+  "id": "vidmoly",
+  "name": "Vidmoly",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": ""
+}

servers/vidmoly.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+from core import httptools, support
+from platformcode import logger, config
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    global data
+    data = httptools.downloadpage(page_url).data
+    if "Not Found" in data:
+        return False, config.get_localized_string(70449) % "Vidmoly"
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    logger.info("url=" + page_url)
+    global data
+    video_urls = support.get_jwplayer_mediaurl(data, 'Vidmoly')
+
+    return video_urls