From b8a72a71509c4a6e624c37c67e1e7d0178f6b038 Mon Sep 17 00:00:00 2001
From: Intel1 <luisriverap@hotmail.com>
Date: Fri, 11 Aug 2017 15:23:51 -0500
Subject: [PATCH] Update allcalidad.py

---
 plugin.video.alfa/channels/allcalidad.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py
index a07ceca6..0875e1f6 100755
--- a/plugin.video.alfa/channels/allcalidad.py
+++ b/plugin.video.alfa/channels/allcalidad.py
@@ -75,12 +75,6 @@ def peliculas(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron  = '(?s)short_overlay.*?<a href="([^"]+)'
-    patron += '.*?img.*?src="([^"]+)'
-    patron += '.*?title="([^"]+)'
-    patron += '.*?kinopoisk">([^<]+)'
-    patron += '</span(.*?)small_rating'
-
     patron  = '(?s)short_overlay.*?<a href="([^"]+)'
     patron += '.*?img.*?src="([^"]+)'
     patron += '.*?title="(.*?)"'
@@ -118,13 +112,10 @@ def findvideos(item):
     bloque = scrapertools.find_single_match(data, patron)
     match = scrapertools.find_multiple_matches(bloque, '(?is)(?:iframe|script) .*?src="([^"]+)')
     for url in match:
-        server = servertools.get_server_from_url(url)
-        titulo = "Ver en: " + server
-        if "youtube" in server:
-            if "embed" in url:
-                url = "http://www.youtube.com/watch?v=" + scrapertools.find_single_match(url, 'embed/(.*)')
-                titulo = "[COLOR = yellow]Ver trailer: " + server + "[/COLOR]"
-        elif "directo" in server:
+        titulo = "Ver en: %s"
+        if "youtube" in url:
+            titulo = "[COLOR = yellow]Ver trailer: %s[/COLOR]"
+        if "ad.js" in url or "script" in url:
             continue
         elif "vimeo" in url:
             url += "|" + "http://www.allcalidad.com"
@@ -134,9 +125,10 @@ def findvideos(item):
                  title = titulo,
                  fulltitle = item.fulltitle,
                  thumbnail = item.thumbnail,
-				 server = server,
+                 server = "",
                  url = url
                  ))
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
     if itemlist:
         itemlist.append(Item(channel = item.channel))
         itemlist.append(item.clone(channel="trailertools", title="Buscar Tráiler", action="buscartrailer", context="",