Merge branch 'master' into fixes

plugin.video.alfa/servers/debriders/alldebrid.py

@@ -1,26 +1,23 @@
 # -*- coding: utf-8 -*-
 
-from core import jsontools
+from core import httptools
 from core import scrapertools
 from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s' , user='%s' , password='%s', video_password=%s)" % (
-        page_url, user, "**************************"[0:len(password)], video_password))
+    logger.info()
     page_url = correct_url(page_url)
-
-    url = 'http://www.alldebrid.com/service.php?pseudo=%s&password=%s&link=%s&nb=0&json=true&pw=' % (
-        user, password, page_url)
-
-    data = jsontools.load(scrapertools.downloadpage(url))
-
+    dd1 = httptools.downloadpage("https://api.alldebrid.com/user/login?agent=mySoft&username=%s&password=%s" %(user, password)).data
+    token = scrapertools.find_single_match(dd1, 'token":"([^"]+)')
+    dd2 = httptools.downloadpage("https://api.alldebrid.com/link/unlock?agent=mySoft&token=%s&link=%s" %(token, page_url)).data
+    link = scrapertools.find_single_match(dd2, 'link":"([^"]+)')
+    link = link.replace("\\","")
     video_urls = []
-    if data and data["link"] and not data["error"]:
-        extension = ".%s [alldebrid]" % data["filename"].rsplit(".", 1)[1]
-        video_urls.append([extension, data["link"]])
-
+    if link:
+        extension = "mp4 [alldebrid]"
+        video_urls.append([extension, link])
     else:
         try:
             server_error = "Alldebrid: " + data["error"].decode("utf-8", "ignore")
@@ -30,16 +27,13 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
                          "Servidor no soportado o en mantenimiento")
         except:
             server_error = "Alldebrid: Error en el usuario/password o en la web"
-
         video_urls.append([server_error, ''])
-
     return video_urls
 
 
 def correct_url(url):
     if "userporn.com" in url:
         url = url.replace("/e/", "/video/")
-
     if "putlocker" in url:
         url = url.replace("/embed/", "/file/")
     return url

plugin.video.alfa/servers/fembed.py

@@ -20,5 +20,7 @@ def get_video_url(page_url, user="", password="", video_password=""):
     data = httptools.downloadpage(page_url, post={}).data
     data = jsontools.load(data)
     for videos in data["data"]:
-        video_urls.append([videos["label"] + " [fembed]", "https://www.fembed.com" + videos["file"]])
+        v = videos["file"]
+        if not v.startswith("http"): v = "https://www.fembed.com" + videos["file"]
+        video_urls.append([videos["label"] + " [fembed]", v])
     return video_urls

plugin.video.alfa/servers/thevimeo.json

@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "(https://thevimeo.pw/[a-zA-Z0-9]+)",
+        "url": "\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "thevimeo",
+  "name": "thevimeo",
+  "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://smmsquare.com/wp-content/uploads/2017/12/Vimeo_smmsquare.png"
+}

plugin.video.alfa/servers/thevimeo.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# -*- Server Thevimeo -*-
+
+import re
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+
+def get_source(url):
+    #logger.info()
+    data = httptools.downloadpage(url).data
+    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+def test_video_exists(page_url):
+    #logger.info("(page_url='%s')" % page_url)
+    data = get_source(page_url)
+
+    if "File was deleted" in data or "File Not Found" in data:
+        return False, "[Thevimeo] El video 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 = get_source(page_url)
+    #logger.debug(data)
+    patron = "{file:(.*?),label:(.*?),"
+
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    #url = scrapertools.find_single_match(data, "sources.*?{file:(.*?),")
+    for url, qual in matches:
+        url = url.replace("\/", "/")
+        qual = qual.replace("M\u00f3vil","360")
+        video_urls.append([qual+"p [Thevimeo]", url])
+    video_urls.sort(key=lambda it: int(it[0].split("p ", 1)[0]))
+
+    return video_urls