Merge branch 'master' of github.com:alfa-addon/addon

plugin.video.alfa/channels/cinetux.py

@@ -314,15 +314,11 @@ 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 "www.cinetux.me" in url:
-                server = scrapertools.find_single_match(url, "player/(.*?)\.")
-            else:
-                server = servertools.get_server_from_url(url)
-            matches.append([url, server, "", language.strip(), t_tipo])
+            matches.append([url, "", "", language.strip(), t_tipo])
     bloque2 = scrapertools.find_single_match(data, '(?s)box_links.*?dt_social_single')
     bloque2 = bloque2.replace("\t", "").replace("\r", "")
     patron = '(?s)optn" href="([^"]+)'
-    patron += '.*?title="([^"]+)'
+    patron += '.*?title="([^\.]+)'
     patron += '.*?src.*?src="[^>]+"?/>([^<]+)'
     patron += '.*?src="[^>]+"?/>([^<]+)'
     patron += '.*?/span>([^<]+)'
@@ -336,7 +332,7 @@ def bloque_enlaces(data, filtro_idioma, dict_idiomas, type, item):
         scrapedtipo = match[4]
         if t_tipo.upper() not in scrapedtipo.upper():
             continue
-        title = "   Mirror en " + scrapedserver.split(".")[0] + " (" + scrapedlanguage + ")"
+        title = "   Mirror en %s (" + scrapedlanguage + ")"
         if len(scrapedcalidad.strip()) > 0:
             title += " (Calidad " + scrapedcalidad.strip() + ")"
 
@@ -357,6 +353,7 @@ def bloque_enlaces(data, filtro_idioma, dict_idiomas, type, item):
             title = "Mostrar enlaces filtrados en %s" % ", ".join(filtrados)
             lista_enlaces.append(item.clone(title=title, action="findvideos", url=item.url, text_color=color3,
                                             filtro=True))
+    lista_enlaces = servertools.get_servers_itemlist(lista_enlaces, lambda i: i.title % i.server.capitalize())
     return lista_enlaces
 
 
@@ -368,7 +365,6 @@ def play(item):
         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
-        itemlist = servertools.find_video_items(data=item.url)
     elif "links" in item.url or "www.cinetux.me" in item.url:
         data = httptools.downloadpage(item.url).data
         scrapedurl = scrapertools.find_single_match(data, '<a href="(http[^"]+)')
@@ -380,7 +376,16 @@ def play(item):
             scrapedurl = httptools.downloadpage(scrapedurl, follow_redirects=False, only_headers=True).headers.get(
                 "location", "")
         item.url = scrapedurl
-        itemlist = servertools.find_video_items(data=item.url)
     else:
         return [item]
+    itemlist.append(
+             Item(channel = item.channel,
+             action = "play",
+             title = "%s",
+             fulltitle = item.fulltitle,
+             thumbnail = item.thumbnail,
+             server = "",
+             url = item.url
+             ))
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
     return itemlist

plugin.video.alfa/channels/newpct1.py

@@ -11,12 +11,17 @@ from platformcode import config, logger
 
 def mainlist(item):
     logger.info()
-
+    
     itemlist = []
+    
+    thumb_pelis=get_thumb("channels_movie.png")
+    thumb_series=get_thumb("channels_tvshow.png")
+    
     itemlist.append(Item(channel=item.channel, action="submenu", title="Películas", url="http://www.newpct1.com/",
-                         extra="peliculas"))
-    itemlist.append(
-        Item(channel=item.channel, action="submenu", title="Series", url="http://www.newpct1.com/", extra="series"))
+                         extra="peliculas", thumbnail=thumb_pelis ))
+    
+    itemlist.append(Item(channel=item.channel, action="submenu", title="Series", url="http://www.newpct1.com/", extra="series", 
+                         thumbnail=thumb_series))
     # itemlist.append(Item(channel=item.channel, action="search", title="Buscar"))
 
     return itemlist

plugin.video.alfa/channels/torrentlocura.json

@@ -6,23 +6,12 @@
     "language": "es",
     "banner": "torrentlocura.png",
     "thumbnail": "http://imgur.com/EWmLS3d.png",
+    "fanart": "http://imgur.com/V7QZLAL.jpg",
     "version": 1,
     "changes": [
         {
-            "date": "31/12/2016",
-            "description": "Release"
-        },
-        {
-            "date": "13/01/2017",
-            "description": "Añadida info a cápitulos en bloque"
-        },
-        {
-            "date": "04/04/2017",
-            "description": "Reparación cambios web"
-        },
-        {
-            "date": "28/06/2017",
-            "description": "Corrección código y algunas mejoras"
+            "date": "25/08/2017",
+            "description": "revamp"
         }
     ],
     "categories": [