Merge pull request #177 from Intel11/ultimo

Actualizados

plugin.video.alfa/channels/cinetux.py

@@ -267,15 +267,11 @@ def findvideos(item):
     if itemlist:
         itemlist.append(item.clone(channel="trailertools", title="Buscar Tráiler", action="buscartrailer", context="",
                                    text_color="magenta"))
-        # Opción "Añadir esta película a la videoteca"
         if item.extra != "library":
             if config.get_videolibrary_support():
                 itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
                                      action="add_pelicula_to_library", url=item.url, fulltitle = item.fulltitle
                                      ))
-
-    else:
-        itemlist.append(item.clone(title="No hay enlaces disponibles", action="", text_color=color3))
     return itemlist
 
 
@@ -300,6 +296,8 @@ def bloque_enlaces(data, filtro_idioma, dict_idiomas, type, item):
             url = scrapertools.find_single_match(bloque1, patron)
             if "goo.gl" in url:
                 url = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers.get("location", "")
+            if "drive.php" in url:
+                scrapedserver = "gvideo"
             if "player" in url:
                 scrapedserver = scrapertools.find_single_match(url, 'player/(\w+)')
                 if "ok" in scrapedserver: scrapedserver = "okru"
@@ -352,10 +350,10 @@ def bloque_enlaces(data, filtro_idioma, dict_idiomas, type, item):
 def play(item):
     logger.info()
     itemlist = []
-    if "api.cinetux" in item.url or item.server == "okru":
+    if "api.cinetux" in item.url or item.server == "okru" or "drive.php" in item.url:
         data = httptools.downloadpage(item.url, headers={'Referer': item.extra}).data.replace("\\", "")
         id = scrapertools.find_single_match(data, 'img src="[^#]+#(.*?)"')
-        item.url = "https://youtube.googleapis.com/embed/?status=ok&hl=es&allow_embed=1&ps=docs&partnerid=30&hd=1&autoplay=0&cc_load_policy=1&showinfo=0&docid=" + id
+        item.url = "http://docs.google.com/get_video_info?docid=" + id
         if item.server == "okru":
             item.url = "https://ok.ru/videoembed/" + id
     elif "links" in item.url or "www.cinetux.me" in item.url:

plugin.video.alfa/channels/pelisplus.py

@@ -145,7 +145,9 @@ def menuseries(item):
 def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
-    item.url = item.url + texto
+    item.url = host + 'busqueda/?s=' + texto
+    if not item.extra:
+        item.extra = 'peliculas/'
     try:
         if texto != '':
             return lista(item)
@@ -217,7 +219,7 @@ def lista(item):
         else:
             item.extra = item.extra.rstrip('s/')
             if item.extra in url:
-                itemlist.append(
+                new_item=(
                     Item(channel=item.channel,
                          contentType=tipo,
                          action=accion,
@@ -237,7 +239,7 @@ def lista(item):
 
     tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
-    # Encuentra los elementos que no tienen plot y carga las paginas correspondientes para obtenerlo#
+    #Encuentra los elementos que no tienen plot y carga las paginas correspondientes para obtenerlo#
     for item in itemlist:
         if item.infoLabels['plot'] == '':
             data = httptools.downloadpage(item.url).data

plugin.video.alfa/servers/gvideo.json

@@ -7,6 +7,10 @@
         "pattern": "(?s)https://youtube.googleapis.com.*?docid=([0-9a-zA-Z-_]+)",
         "url": "http://docs.google.com/get_video_info?docid=\\1"
       },
+      {
+        "pattern": "(?s)http://docs.google.com/get_video_info.*?docid=([0-9a-zA-Z-_]+)",
+        "url": "http://docs.google.com/get_video_info?docid=\\1"
+      },
       {
         "pattern": "(?s)https://(?:docs|drive).google.com/file/d/([^/]+)/preview",
         "url": "http://docs.google.com/get_video_info?docid=\\1"