Merge pull request #598 from Intel11/master

Actualizados

plugin.video.alfa/servers/fembed.json

@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "((?:fembed|divload).com/v/[A-z0-9_-]+)",
+        "pattern": "((?:fembed|divload).com/(?:f|v)/[A-z0-9_-]+)",
         "url": "https://www.\\1"
       }
     ]

plugin.video.alfa/servers/fembed.py

@@ -16,6 +16,7 @@ def test_video_exists(page_url):
 def get_video_url(page_url, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
     video_urls = []
+    page_url = page_url.replace("/f/","/v/")
     page_url = page_url.replace("/v/","/api/source/")
     data = httptools.downloadpage(page_url, post={}).data
     data = jsontools.load(data)

plugin.video.alfa/servers/gvideo.json

@@ -16,7 +16,7 @@
         "url": "http://docs.google.com/get_video_info?docid=\\1"
       },
       {
-        "pattern": "(?s)https://(?:docs|drive).google.com/file/d/([^/]+)/(?:preview|edit)",
+        "pattern": "(?s)(?:https|http)://(?:docs|drive).google.com/file/d/([^/]+)/(?:preview|edit|view)",
         "url": "http://docs.google.com/get_video_info?docid=\\1"
       },
       {

plugin.video.alfa/servers/videobb.json

@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "videobb.ru/v/([A-z0-9]+)",
+        "url": "https://videobb.ru/api/source/\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "videobb",
+  "name": "videobb",
+  "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://www.cinetux.to/videobb/logo.jpg"
+}

plugin.video.alfa/servers/videobb.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector videobb By Alfa development Group
+# --------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from core import jsontools
+from platformcode import logger
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url).data
+    if "no longer exists" in data:
+        return False, "[videobb] El video ha sido borrado"
+    return True, ""
+
+
+def get_video_url(page_url, user="", password="", video_password=""):
+    logger.info("(page_url='%s')" % page_url)
+    video_urls = []
+    id = scrapertools.find_single_match("v/(\w+)", page_url)
+    post = "r=&d=videobb.ru"
+    data = httptools.downloadpage(page_url, post=post).data
+    data = jsontools.load(data)["data"]
+    for url in data:
+        video_urls.append([url["label"] + "p [videobb]", url["file"]])
+    logger.info("Intel11 %s" %data)
+
+    return video_urls

plugin.video.alfa/servers/vidlox.json

@@ -4,8 +4,8 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "(?i)(https://vidlox.(?:tv|me)/embed-.*?.html)",
-        "url": "\\1"
+        "pattern": "(?i)(vidlox.(?:tv|me)/embed-\\w+)",
+        "url": "https://\\1.html"
       }
     ]
   },