From 4b3798d001fa62ab35178662ab787507a89068a9 Mon Sep 17 00:00:00 2001
From: Intel1 <luisriverap@hotmail.com>
Date: Sat, 26 Aug 2017 12:08:45 -0500
Subject: [PATCH 01/10] Actualizados

animeflv: Agregado server cldup
---
 plugin.video.alfa/channels/animeflv.py | 61 ++++++++++++++++----------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/plugin.video.alfa/channels/animeflv.py b/plugin.video.alfa/channels/animeflv.py
index ec68dd95..7452e3e4 100644
--- a/plugin.video.alfa/channels/animeflv.py
+++ b/plugin.video.alfa/channels/animeflv.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import re
+import time
 import urlparse
+import urllib
 
 from channels import renumbertools
 from core import httptools
 from core import jsontools
+from core import servertools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
@@ -273,42 +276,54 @@ def findvideos(item):
 
     itemlist = []
 
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", data)
+    data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", httptools.downloadpage(item.url).data)
+
     list_videos = scrapertools.find_multiple_matches(data, 'video\[\d\]\s=\s\'<iframe.+?src="([^"]+)"')
-    list_videos.extend(scrapertools.find_multiple_matches(data, 'href="http://ouo.io/s/y0d65LCP\?s=([^"]+)"'))
-    # logger.info("data=%s " % list_videos)
-
+    download_list = scrapertools.find_multiple_matches(data, 'href="http://ouo.io/s/y0d65LCP\?s=([^"]+)"')
+    for i in download_list:
+        list_videos.append(urllib.unquote_plus(i))
     aux_url = []
+    cldup = False
     for e in list_videos:
-        if e.startswith("https://s3.animeflv.com/embed.php?"):
-            server = scrapertools.find_single_match(e, 'server=(.*?)&')
-            e = e.replace("embed", "check").replace("https", "http")
-            data = httptools.downloadpage(e).data.replace("\\", "")
+        url_api = "https://s3.animeflv.com/check.php?server=%s&v=%s"
+        # izanagi, yourupload, hyperion
+        if e.startswith("https://s3.animeflv.com/embed"):
+            server, v = scrapertools.find_single_match(e, 'server=([^&]+)&v=(.*?)$')
+            data = httptools.downloadpage(url_api % (server, v)).data.replace("\\", "")
+
             if '{"error": "Por favor intenta de nuevo en unos segundos", "sleep": 3}' in data:
-                import time
                 time.sleep(3)
-                data = httptools.downloadpage(e).data.replace("\\", "")
+                data = httptools.downloadpage(url_api % (server, v)).data.replace("\\", "")
 
-            video_urls = []
-            if server == "gdrive":
-                data = jsontools.load(data)
-                for s in data.get("sources", []):
-                    video_urls.append([s["label"], s["type"], s["file"]])
-
-                if video_urls:
-                    video_urls.sort(key=lambda v: int(v[0]))
-                    itemlist.append(item.clone(title="Enlace encontrado en %s" % server, action="play",
-                                               video_urls=video_urls))
-            else:
+            if server != "hyperion":
                 url = scrapertools.find_single_match(data, '"file":"([^"]+)"')
                 if url:
                     itemlist.append(item.clone(title="Enlace encontrado en %s" % server, url=url, action="play"))
 
+            else:
+                # pattern = '"direct":"([^"]+)"'
+                # url = scrapertools.find_single_match(data, pattern)
+                # itemlist.append(item.clone(title="Enlace encontrado en %s" % server, url=url, action="play"))
+
+                pattern = '"label":([^,]+),"type":"video/mp4","file":"([^"]+)"'
+                matches = scrapertools.find_multiple_matches(data, pattern)
+
+                video_urls = []
+                for label, url in matches:
+                    video_urls.append([label, "mp4", url])
+                if video_urls:
+                    video_urls.sort(key=lambda u: int(u[0]))
+                    itemlist.append(item.clone(title="Enlace encontrado en %s" % server, action="play",
+                                               video_urls=video_urls))
+
         else:
+            if e.startswith("https://cldup.com") and cldup == False:
+                itemlist.append(item.clone(title="Enlace encontrado en Cldup",
+                                           action="play",
+                                           url = e))
+                cldup = True
             aux_url.append(e)
 
-    from core import servertools
     itemlist.extend(servertools.find_video_items(data=",".join(aux_url)))
     for videoitem in itemlist:
         videoitem.fulltitle = item.fulltitle

From ee9e0bc8396e66f96f5110ca71894fae3bb17e44 Mon Sep 17 00:00:00 2001
From: Intel1 <luisriverap@hotmail.com>
Date: Sat, 26 Aug 2017 12:21:21 -0500
Subject: [PATCH 02/10] Update redirects.py

---
 plugin.video.alfa/servers/redirects.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/plugin.video.alfa/servers/redirects.py b/plugin.video.alfa/servers/redirects.py
index 247819aa..b825ec5f 100755
--- a/plugin.video.alfa/servers/redirects.py
+++ b/plugin.video.alfa/servers/redirects.py
@@ -19,27 +19,5 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
         request = urllib2.Request(jk_url, headers=request_headers)
         response = urllib2.urlopen(request)
         video_urls.append([".mp4 [redirects]", response.geturl()])
-    else:
-        headers = []
-        headers.append(["User-Agent",
-                        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.94 Safari/537.36"])
-        headers.append(["Accept-Encoding", "gzip,deflate,sdch"])
-        page_url = page_url.replace("https://animeflv.net/embed_izanagi.php?key=",
-                                    "https://s2.animeflv.net/izanagi.php?id=")
-        page_url = page_url.replace("http://animeflv.net/embed_yotta.php?key=",
-                                    "https://s1.animeflv.com/gdrive.php?id=")
-        data = scrapertools.cache_page(page_url, headers=headers)
-        data = data.replace("\\\\", "")
-        data = data.replace("\\/", "/")
-        patronvideos = '"file":"(.+?)"'
-        matches = re.compile(patronvideos, re.DOTALL).findall(data)
-        for match in matches:
-            video_urls.append([".mp4 [redirects]", match])
-
-        patronvideos = '(http://www.animeid.+?)"'
-        matches = re.compile(patronvideos, re.DOTALL).findall(data)
-        for match in matches:
-            response = urllib2.urlopen(match)
-            video_urls.append([".mp4 [redirects]", response.geturl()])
 
     return video_urls

From 8c4204f86f0cdd046ecc47fb25b7adf1ee66ee11 Mon Sep 17 00:00:00 2001
From: Intel1 <luisriverap@hotmail.com>
Date: Sat, 26 Aug 2017 12:31:09 -0500
Subject: [PATCH 03/10] Update cinetux.py

---
 plugin.video.alfa/channels/cinetux.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin.video.alfa/channels/cinetux.py b/plugin.video.alfa/channels/cinetux.py
index 7f732c30..5ce4fb28 100644
--- a/plugin.video.alfa/channels/cinetux.py
+++ b/plugin.video.alfa/channels/cinetux.py
@@ -381,11 +381,10 @@ def play(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())
+    itemlist = servertools.get_servers_itemlist(itemlist)
     return itemlist

From 264108139473dd7bab0552c25d3b360b17a09adc Mon Sep 17 00:00:00 2001
From: Intel1 <luisriverap@hotmail.com>
Date: Sat, 26 Aug 2017 12:39:25 -0500
Subject: [PATCH 04/10] Update vidoza.py

---
 plugin.video.alfa/servers/vidoza.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.video.alfa/servers/vidoza.py b/plugin.video.alfa/servers/vidoza.py
index f3f61036..eacec9e5 100755
--- a/plugin.video.alfa/servers/vidoza.py
+++ b/plugin.video.alfa/servers/vidoza.py
@@ -8,7 +8,7 @@ from platformcode import logger
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
     data = httptools.downloadpage(page_url).data
-    if "Page not found" in data:
+    if "Page not found" in data or "File was deleted" in data:
         return False, "[vidoza] El archivo no existe o ha sido borrado"
     elif "processing" in data:
         return False, "[vidoza] El vídeo se está procesando"

From 4f8fc0e62c516a293a73f0063d9665d2c40e0753 Mon Sep 17 00:00:00 2001
From: Intel1 <luisriverap@hotmail.com>
Date: Sat, 26 Aug 2017 13:00:30 -0500
Subject: [PATCH 05/10] Update peliculasrey.py

---
 plugin.video.alfa/channels/peliculasrey.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugin.video.alfa/channels/peliculasrey.py b/plugin.video.alfa/channels/peliculasrey.py
index 5e7312a3..047fb824 100755
--- a/plugin.video.alfa/channels/peliculasrey.py
+++ b/plugin.video.alfa/channels/peliculasrey.py
@@ -3,10 +3,11 @@
 import re
 import urlparse
 
+from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
-from platformcode import logger
+from platformcode import logger, config
 
 
 def mainlist(item):
@@ -28,7 +29,7 @@ def PorFecha(item):
     logger.info()
 
     # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = scrapertools.find_single_match(data, '<section class="lanzamiento">(.*?)</section>')
     logger.info("data=" + data)
 
@@ -54,7 +55,7 @@ def Idiomas(item):
     logger.info()
 
     # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = scrapertools.find_single_match(data, '<section class="idioma">(.*?)</section>')
     logger.info("data=" + data)
 
@@ -80,7 +81,7 @@ def calidades(item):
     logger.info()
 
     # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = scrapertools.find_single_match(data, '<section class="calidades">(.*?)</section>')
     logger.info("data=" + data)
 
@@ -106,7 +107,7 @@ def generos(item):
     logger.info()
 
     # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = scrapertools.find_single_match(data, '<section class="generos">(.*?)</section>')
     logger.info("data=" + data)
 
@@ -121,6 +122,8 @@ def generos(item):
         plot = ""
         url = urlparse.urljoin(item.url, scrapedurl)
         logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
+        if "Adulto" in title and config.get_setting("adult_mode") == 0:
+            continue
         itemlist.append(
             Item(channel=item.channel, action="peliculas", title=title, url=url, thumbnail=thumbnail, plot=plot,
                  fulltitle=title, viewmode="movie"))
@@ -148,7 +151,7 @@ def peliculas(item):
     logger.info()
 
     # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     logger.info("data=" + data)
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
 
@@ -178,7 +181,7 @@ def findvideos(item):
     logger.info()
 
     # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     # logger.info("data="+data)
 
     # Extrae las entradas (carpetas)  

From 12ffa93ae8aff393a5e47675d751bebd73bacdba Mon Sep 17 00:00:00 2001
From: Unknown <Delta_minion@protonmail.com>
Date: Sat, 26 Aug 2017 15:31:03 -0300
Subject: [PATCH 06/10] Mejora de Pelis24

---
 plugin.video.alfa/channels/pelis24.json |  3 +-
 plugin.video.alfa/channels/pelis24.py   | 68 +++++++++++++++++++++++--
 2 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/plugin.video.alfa/channels/pelis24.json b/plugin.video.alfa/channels/pelis24.json
index 70bb73e0..fd53d735 100755
--- a/plugin.video.alfa/channels/pelis24.json
+++ b/plugin.video.alfa/channels/pelis24.json
@@ -20,7 +20,8 @@
   "categories": [
     "latino",
     "movie",
-    "vos"
+    "vos",
+    "direct"
   ],
   "settings": [
     {
diff --git a/plugin.video.alfa/channels/pelis24.py b/plugin.video.alfa/channels/pelis24.py
index 15b3216a..20fb623a 100755
--- a/plugin.video.alfa/channels/pelis24.py
+++ b/plugin.video.alfa/channels/pelis24.py
@@ -5,8 +5,11 @@ import sys
 
 from core import httptools
 from core import scrapertools
+from core import servertools
 from core.item import Item
 from platformcode import logger
+from core import tmdb
+
 
 thumbnail_host = 'https://github.com/master-1970/resources/raw/master/images/squares/pelis24.PNG'
 
@@ -126,12 +129,12 @@ def peliculas(item):
     patron = '<div class="movie-img img-box">.*?'
     patron += '<img src="([^"]+).*?'
     patron += 'href="([^"]+).*?'
-    patron += '<div class="movie-series">([^<]+)</div>'
-    patron += '<span><a href=[^>]+>([^<]+)</a>'
+    patron += '<div class="movie-series">(.*?)\((\d{4})\).*?'
+    patron += '<a href=[^>]+>([^<]+)</a>'
 
     matches = re.compile(patron, re.DOTALL).findall(data)
 
-    for thumbnail, url, title, quality in matches:
+    for thumbnail, url, title, year, quality in matches:
         if "/series/" in url:
             # Descartamos las series
             continue
@@ -140,10 +143,11 @@ def peliculas(item):
             thumbnail = "http://www.pelis24.tv" + thumbnail
         contentTitle = title.split("/")[0]
         title = "%s (%s)" % (contentTitle, quality)
-
+        year = year
         itemlist.append(
             Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail,
-                 contentQuality=quality, contentTitle=contentTitle))
+                 contentQuality=quality, contentTitle=contentTitle, infoLabels = {'year':year}))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
     # Extrae el paginador
     next_page = scrapertools.find_single_match(data, '<span class="pnext"><a href="([^"]+)')
@@ -152,3 +156,57 @@ def peliculas(item):
                              thumbnail=thumbnail_host, url=next_page))
 
     return itemlist
+
+
+def findvideos(item):
+    itemlist=[]
+    duplicated =[]
+
+    data = httptools.downloadpage(item.url).data
+    patron = '<div class="player-box" id="tabs-(\d+)"><iframe data-src="(.*?)" allowfullscreen'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for id, scrapedurl in matches:
+        lang = scrapertools.find_single_match(data, '<li><a href="#tabs-%s"><img src=".*?"  alt="(.*?)".*?\/>'%id)
+        server = servertools.get_server_from_url(scrapedurl)
+        title = '%s (%s) (%s)' % (item.title, server, lang)
+        thumbnail = ''
+        if 'enlac' in scrapedurl:
+
+            if 'google' in scrapedurl:
+                server = 'gvideo'
+            elif 'openload' in scrapedurl:
+                server = 'openload'
+
+            title = '%s (%s) (%s)'%(item.title, server, lang)
+            scrapedurl = scrapedurl.replace('embed','stream')
+            gdata = httptools.downloadpage(scrapedurl).data
+            url_list = servertools.findvideosbyserver(gdata, server)
+            for url in url_list:
+                if url[1] not in duplicated:
+                    thumbnail = servertools.guess_server_thumbnail(server)
+                    itemlist.append(item.clone(title=title, plot=url[1], url=url[1], action='play', server=server,
+                                               thumbnail = thumbnail))
+                    duplicated.append(url[1])
+
+        elif '.html' in scrapedurl:
+            url_list = servertools.findvideosbyserver(data, server)
+            for url in url_list:
+                if url[1] not in duplicated:
+                    thumbnail = servertools.guess_server_thumbnail(server)
+                    itemlist.append(item.clone(title = title, plot=url[1], url=url[1], action='play', server=server,
+                                               thumbnail = thumbnail))
+                    duplicated.append(url[1])
+        else:
+            url = scrapedurl
+            if url not in duplicated:
+                thumbnail = servertools.guess_server_thumbnail(server)
+                itemlist.append(item.clone(title= title, plot=url, url=url, action='play', server=server, thumbnail =
+                thumbnail))
+                duplicated.append(url)
+
+    return itemlist
+
+
+
+

From 100955c75d18cf4167bd7666964c2ce2884caf02 Mon Sep 17 00:00:00 2001
From: Intel1 <luisriverap@hotmail.com>
Date: Sat, 26 Aug 2017 14:53:23 -0500
Subject: [PATCH 07/10] Update newpct1.py

---
 plugin.video.alfa/channels/newpct1.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/newpct1.py b/plugin.video.alfa/channels/newpct1.py
index 07644299..88eec0b4 100644
--- a/plugin.video.alfa/channels/newpct1.py
+++ b/plugin.video.alfa/channels/newpct1.py
@@ -374,7 +374,7 @@ def get_episodios(item):
         paginacion = scrapertools.get_match(data, patron)
         # logger.info("[newpct1.py] get_episodios: paginacion= " + paginacion)
         if "Next" in paginacion:
-            url_next_page = scrapertools.get_match(paginacion, '<a href="(http[^>]+)>Next</a>')[:-1]
+            url_next_page = "http" + scrapertools.get_match(paginacion, '<a href="http([^>]+)>Next</a>')[:-1]
             url_next_page = url_next_page.replace(" ", "%20")
             # logger.info("[newpct1.py] get_episodios: url_next_page= " + url_next_page)
             itemlist.append(

From 7b0be6ba2c10bc8fbdc4c6a73bed4bd51faed36a Mon Sep 17 00:00:00 2001
From: Unknown <Delta_minion@protonmail.com>
Date: Sat, 26 Aug 2017 17:14:08 -0300
Subject: [PATCH 08/10] Ajustes finales

---
 plugin.video.alfa/channels/pelis24.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin.video.alfa/channels/pelis24.py b/plugin.video.alfa/channels/pelis24.py
index 20fb623a..125f2c9f 100755
--- a/plugin.video.alfa/channels/pelis24.py
+++ b/plugin.video.alfa/channels/pelis24.py
@@ -163,7 +163,7 @@ def findvideos(item):
     duplicated =[]
 
     data = httptools.downloadpage(item.url).data
-    patron = '<div class="player-box" id="tabs-(\d+)"><iframe data-src="(.*?)" allowfullscreen'
+    patron = '<div class="player-box" id="tabs-(\d+)"><iframe data-src="(.*?)".*?allowfullscreen'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for id, scrapedurl in matches:
@@ -185,7 +185,7 @@ def findvideos(item):
             for url in url_list:
                 if url[1] not in duplicated:
                     thumbnail = servertools.guess_server_thumbnail(server)
-                    itemlist.append(item.clone(title=title, plot=url[1], url=url[1], action='play', server=server,
+                    itemlist.append(item.clone(title=title, url=url[1], action='play', server=server,
                                                thumbnail = thumbnail))
                     duplicated.append(url[1])
 
@@ -194,14 +194,14 @@ def findvideos(item):
             for url in url_list:
                 if url[1] not in duplicated:
                     thumbnail = servertools.guess_server_thumbnail(server)
-                    itemlist.append(item.clone(title = title, plot=url[1], url=url[1], action='play', server=server,
+                    itemlist.append(item.clone(title = title, url=url[1], action='play', server=server,
                                                thumbnail = thumbnail))
                     duplicated.append(url[1])
         else:
             url = scrapedurl
             if url not in duplicated:
                 thumbnail = servertools.guess_server_thumbnail(server)
-                itemlist.append(item.clone(title= title, plot=url, url=url, action='play', server=server, thumbnail =
+                itemlist.append(item.clone(title= title, url=url, action='play', server=server, thumbnail =
                 thumbnail))
                 duplicated.append(url)
 

From 604397877c8e21025fde91309f3dcf603a22f0b0 Mon Sep 17 00:00:00 2001
From: alfa-addon <alfa-addon@protonmail.com>
Date: Sat, 26 Aug 2017 20:07:38 -0400
Subject: [PATCH 09/10] fixed

---
 plugin.video.alfa/channels/newpct1.py |  1 +
 plugin.video.alfa/channels/pelis24.py | 39 ++++++++++++++-------------
 2 files changed, 22 insertions(+), 18 deletions(-)
 mode change 100755 => 100644 plugin.video.alfa/channels/pelis24.py

diff --git a/plugin.video.alfa/channels/newpct1.py b/plugin.video.alfa/channels/newpct1.py
index 88eec0b4..bd87bb6d 100644
--- a/plugin.video.alfa/channels/newpct1.py
+++ b/plugin.video.alfa/channels/newpct1.py
@@ -2,6 +2,7 @@
 
 import re
 
+from channelselector import get_thumb
 from core import httptools
 from core import scrapertools
 from core import servertools
diff --git a/plugin.video.alfa/channels/pelis24.py b/plugin.video.alfa/channels/pelis24.py
old mode 100755
new mode 100644
index 125f2c9f..2de77d7b
--- a/plugin.video.alfa/channels/pelis24.py
+++ b/plugin.video.alfa/channels/pelis24.py
@@ -21,14 +21,14 @@ def mainlist(item):
     item.action = "peliculas"
     itemlist.append(item.clone(title="Novedades", url="http://www.pelis24.tv/ultimas-peliculas/"))
     itemlist.append(item.clone(title="Estrenos", url="http://pelis24.tv/estrenos/"))
-    itemlist.append(item.clone(title="", folder=False))
+    itemlist.append(item.clone(title="Calidad HD", url="https://pelis24.tv/xfsearch/calidad/HD"))
+    itemlist.append(item.clone(title="Calidad HQ", url="https://pelis24.tv/xfsearch/calidad/HQ"))
+    itemlist.append(item.clone(title="Calidad SD", url="https://pelis24.tv/xfsearch/calidad/SD"))
     itemlist.append(item.clone(title="Castellano", url="http://pelis24.tv/pelicula-ca/"))
-    itemlist.append(item.clone(title="Latino", url="http://pelis24.tv/pelicula-latino/"))
+    itemlist.append(item.clone(title="Latino", url="https://pelis24.tv/pelicula-la/"))
     itemlist.append(item.clone(title="Versión original", url="http://pelis24.tv/peliculasvo/"))
-    itemlist.append(item.clone(title="Versión original subtitulada", url="http://pelis24.tv/peliculasvose/"))
-
-    itemlist.append(item.clone(title="", folder=False))
-    itemlist.append(item.clone(title="Filtrar por género", action="genero", url="http://pelis24.tv/tags/"))
+    itemlist.append(item.clone(title="Versión original subtitulada", url="http://pelis24.tv/peliculas-su/"))
+    itemlist.append(item.clone(title="Filtrar por género", action="genero", url="http://pelis24.tv"))
     itemlist.append(item.clone(title="Buscar", action="search", url="http://www.pelis24.tv/"))
     return itemlist
 
@@ -108,12 +108,15 @@ def buscar(item):
 def genero(item):
     logger.info()
     itemlist = []
-    generos = ["Animación", "Aventuras", "Bélico", "Ciencia+ficción", "Crimen", "Comedia",
-               "Deporte", "Drama", "Fantástico", "Infantil", "Musical", "Romance", "Terror", "Thriller"]
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    patron = '<li><a href="\/xfsearch\/genero\/([^"]+)"(?: title=".*?").*?(.*?)<\/a><\/li>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
 
-    for g in generos:
-        itemlist.append(Item(channel=item.channel, action="peliculas", title=g.replace('+', ' '),
-                             thumbnail=thumbnail_host, url=item.url + g + "/"))
+    for scrapedurl, scrapedtitle in matches:
+        url = '%s/xfsearch/genero/%s' % (item.url, scrapedurl)
+        itemlist.append(Item(channel=item.channel, action="peliculas", title=scrapedurl,
+                             thumbnail=thumbnail_host, url=url))
 
     return itemlist
 
@@ -129,12 +132,12 @@ def peliculas(item):
     patron = '<div class="movie-img img-box">.*?'
     patron += '<img src="([^"]+).*?'
     patron += 'href="([^"]+).*?'
-    patron += '<div class="movie-series">(.*?)\((\d{4})\).*?'
+    patron += '<div class="movie-series">(.*?)<\/.*?'
     patron += '<a href=[^>]+>([^<]+)</a>'
 
     matches = re.compile(patron, re.DOTALL).findall(data)
 
-    for thumbnail, url, title, year, quality in matches:
+    for thumbnail, url, title, quality in matches:
         if "/series/" in url:
             # Descartamos las series
             continue
@@ -142,22 +145,22 @@ def peliculas(item):
         if not thumbnail.startswith("http"):
             thumbnail = "http://www.pelis24.tv" + thumbnail
         contentTitle = title.split("/")[0]
+        year = scrapertools.find_single_match(contentTitle, '\((\d{4})\)')
+        contentTitle= contentTitle.replace (' (%s)'%year, '')
         title = "%s (%s)" % (contentTitle, quality)
-        year = year
         itemlist.append(
             Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail,
                  contentQuality=quality, contentTitle=contentTitle, infoLabels = {'year':year}))
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    if item.title != 'Versión original':
+        tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
     # Extrae el paginador
-    next_page = scrapertools.find_single_match(data, '<span class="pnext"><a href="([^"]+)')
+    next_page = scrapertools.find_single_match(data, '<span class="pnext".*?<a href="([^"]+)')
     if next_page:
         itemlist.append(Item(channel=item.channel, action="peliculas", title=">> Página siguiente",
                              thumbnail=thumbnail_host, url=next_page))
-
     return itemlist
 
-
 def findvideos(item):
     itemlist=[]
     duplicated =[]

From c750d78db980efa6beaa456c38584910265f043f Mon Sep 17 00:00:00 2001
From: alfa-addon <alfa-addon@protonmail.com>
Date: Sat, 26 Aug 2017 20:08:05 -0400
Subject: [PATCH 10/10] v1.9.2

---
 plugin.video.alfa/addon.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml
index bd0d4480..4d8cfe81 100755
--- a/plugin.video.alfa/addon.xml
+++ b/plugin.video.alfa/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.alfa" name="Alfa" version="1.9.1" provider-name="Alfa Addon">
+<addon id="plugin.video.alfa" name="Alfa" version="1.9.2" provider-name="Alfa Addon">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.libtorrent" optional="true"/>
@@ -19,15 +19,13 @@
     </assets>
       <news>[B]Estos son los cambios para esta versión:[/B]
       [COLOR green][B]Arreglos[/B][/COLOR]
-      [I]- cinetux
+      [I]- pelis24
       - vidoza
-      - canalpelis
-      - pelisplanet
+      - cinetux
+      - peliculasrey
       - newpct1
-      - pelisplus
-      - torrentlocura - fix para usar videoteca y en mediaserver
+      - animeflv
       - fixes internos[/I]
-      [COLOR green]Gracias a [COLOR yellow][B]xabier100[/B][/COLOR] y [COLOR yellow][B]fermintxu[/B][/COLOR] por su colaboración en esta versión[/COLOR]
       </news>
     <description lang="es">Navega con Kodi por páginas web para ver sus videos de manera fácil.</description>
     <summary lang="en">Browse web pages using Kodi</summary>