Merge branch 'master' into master

plugin.video.alfa/servers/kbagi.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from channels import kbagi
 from core import httptools
 from core import jsontools
 from core import scrapertools
@@ -8,15 +9,16 @@ from platformcode import logger
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
+    domain = "diskokosmiko.mx"
     if "kbagi.com" in page_url:
-        from channels import kbagi
-        logueado, error_message = kbagi.login("kbagi.com")
-        if not logueado:
-            return False, error_message
+        domain = "kbagi.com"
+    logueado, error_message = kbagi.login(domain)
+    if not logueado:
+        return False, error_message
 
     data = httptools.downloadpage(page_url).data
     if ("File was deleted" or "Not Found" or "File was locked by administrator") in data:
-        return False, "[kbagi] El archivo no existe o ha sido borrado"
+        return False, "[%s] El archivo no existe o ha sido borrado" %domain
 
     return True, ""
 

plugin.video.alfa/servers/openload.py

@@ -31,11 +31,10 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
 
     data = httptools.downloadpage(page_url, cookies=False, headers=header).data
 
-
     subtitle = scrapertools.find_single_match(data, '<track kind="captions" src="([^"]+)" srclang="es"')
 
     try:
-        code = scrapertools.find_single_match(data, '<span[^>]+id="[^"]+">([^<]{40,})</span>' )
+        code = scrapertools.find_single_match(data, '<p style="" id="[^"]+">(.*?)</p>' )
         _0x59ce16 = eval(scrapertools.find_single_match(data, '_0x59ce16=([^;]+)').replace('parseInt', 'int'))
         _1x4bfb36 = eval(scrapertools.find_single_match(data, '_1x4bfb36=([^;]+)').replace('parseInt', 'int'))
         parseInt  = eval(scrapertools.find_single_match(data, '_0x30725e,(\(parseInt.*?)\),').replace('parseInt', 'int'))

plugin.video.alfa/servers/streamcloud.py

@@ -10,6 +10,10 @@ def test_video_exists(page_url):
     data = scrapertools.cache_page(url=page_url)
     if "<h1>404 Not Found</h1>" in data:
         return False, "El archivo no existe<br/>en streamcloud o ha sido borrado."
+    elif "<h1>File Not Found</h1>" in data:
+        return False, "El archivo no existe<br/>en streamcloud o ha sido borrado."
+    elif "<h1>Archivo no encontrado</h1>" in data:
+        return False, "El archivo no existe<br/>en streamcloud o ha sido borrado."
     else:
         return True, ""