fix vcstream e migliorie a support.server

servers/vcstream.py

@@ -1,61 +1,58 @@
-# -*- coding: utf-8 -*-
-# Icarus pv7
-# Fix dentaku65
-
-import urlparse
-
-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)
-    data = httptools.downloadpage(page_url).data
-    if "Not Found" in data or "File was deleted" in data:
-        return False, config.get_localized_string(70292) % "vcstream"
-
-    return True, ""
-
-
-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
-
-    url = scrapertools.find_single_match(data, "url: '([^']+)',")
-
-    if url:
-        headers = dict()
-        headers['X-Requested-With'] = "XMLHttpRequest"
-
-        token = scrapertools.find_single_match(data, 'set-cookie: vidcloud_session=(.*?);')
-        token = token.replace("%3D", "")
-        if token:
-            headers['vidcloud_session'] = token
-
-        referer = scrapertools.find_single_match(data, "pageUrl = '([^']+)'")
-        if referer:
-            headers['Referer'] = referer
-
-        page_url = urlparse.urljoin(page_url, url)
-        data = httptools.downloadpage(page_url, headers=headers, verify=False).data
-        data = data.replace('\\\\', '\\').replace('\\','')
-
-        media_urls = scrapertools.find_multiple_matches(data, '\{"file"\s*:\s*"([^"]+)"\}')
-
-        for media_url in media_urls:
-            ext = "mp4"
-            if "m3u8" in media_url:
-                ext = "m3u8"
-            import urllib2
-            import ssl
-            context = ssl._create_unverified_context()
-            video_urls.append(["%s [vcstream]" % ext, media_url, urllib2.HTTPSHandler(context=context)])
-
-    for video_url in video_urls:
-        logger.info("%s - %s" % (video_url[0], video_url[1]))
-    return video_urls
-
+# -*- coding: utf-8 -*-
+# Icarus pv7
+# Fix dentaku65
+
+import urlparse
+
+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)
+    data = httptools.downloadpage(page_url).data
+    if "We're Sorry" in data:
+        return False, config.get_localized_string(70292) % "vcstream"
+
+    return True, ""
+
+
+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
+
+    url = scrapertools.find_single_match(data, "url: '([^']+)',")
+
+    if url:
+        headers = dict()
+        headers['X-Requested-With'] = "XMLHttpRequest"
+
+        token = scrapertools.find_single_match(data, 'set-cookie: vidcloud_session=(.*?);')
+        token = token.replace("%3D", "")
+        if token:
+            headers['vidcloud_session'] = token
+
+        referer = scrapertools.find_single_match(data, "pageUrl = '([^']+)'")
+        if referer:
+            headers['Referer'] = referer
+
+        page_url = urlparse.urljoin(page_url, url)
+        data = httptools.downloadpage(page_url, headers=headers).data
+        data = data.replace('\\\\', '\\').replace('\\','')
+
+        media_urls = scrapertools.find_multiple_matches(data, '\{"file"\s*:\s*"([^"]+)"\}')
+
+        for media_url in media_urls:
+            ext = "mp4"
+            if "m3u8" in media_url:
+                ext = "m3u8"
+            video_urls.append(["%s [vcstream]" % ext, media_url])
+
+    for video_url in video_urls:
+        logger.info("%s - %s" % (video_url[0], video_url[1]))
+    return video_urls
+

servers/vidcloud.json

@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://(?:vidcloud.co|vcstream.to)/embed/([a-z0-9]+)",
-        "url": "https://vidcloud.co/player?fid=\\1&page=embed"
-      }
-    ]
-  },
-  "free": true,
-  "id": "vidcloud",
-  "name": "vidcloud",
-  "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://i.postimg.cc/xjpwG0rK/0a-RVDzlb-400x400.jpg"
-}

servers/vidcloud.py

@@ -1,28 +0,0 @@
-# Conector vidcloud By Alfa development Group
-# --------------------------------------------------------
-
-import re
-
-from core import httptools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url)
-    if data.code == 404:
-        return False, "[Cloud] El archivo no existe o  ha sido borrado"
-    return True, ""
-
-
-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
-    data = data.replace('\\\\', '\\').replace('\\','')
-    patron = '"file":"([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url in matches:
-        if not ".vtt" in url:
-            video_urls.append(['vidcloud', url])
-    return video_urls