From 3a49b8a4429fa19ef70792d4187abe90122247f8 Mon Sep 17 00:00:00 2001
From: danielr460 <adrinconr@correo.udistrital.edu.co>
Date: Sun, 29 Oct 2017 08:54:27 -0500
Subject: [PATCH 01/12] =?UTF-8?q?Funci=C3=B3n=20Play=20eliminaba=20info=20?=
 =?UTF-8?q?de=20la=20serie.=20Corregido?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/plugin.video.alfa/channels/seriesblanco.py b/plugin.video.alfa/channels/seriesblanco.py
index f105654f..204e9104 100644
--- a/plugin.video.alfa/channels/seriesblanco.py
+++ b/plugin.video.alfa/channels/seriesblanco.py
@@ -338,7 +338,7 @@ def play(item):
     else:
         url = item.url
 
-    itemlist = servertools.find_video_items(data=url)
+    itemlist = servertools.find_video_items(item=item,data=url)
 
     titulo = scrapertoolsV2.find_single_match(item.fulltitle, "^(.*?)\s\[.+?$")
     if titulo:

From 11fceffd14a4a5aba7cce5381d472db9e7df7443 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Sun, 29 Oct 2017 10:00:39 -0500
Subject: [PATCH 02/12] bajui2: fix

---
 plugin.video.alfa/channels/bajui2.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugin.video.alfa/channels/bajui2.py b/plugin.video.alfa/channels/bajui2.py
index 7f042be1..efa7a3eb 100755
--- a/plugin.video.alfa/channels/bajui2.py
+++ b/plugin.video.alfa/channels/bajui2.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
 import re
 import urlparse
@@ -13,7 +13,7 @@ def mainlist(item):
     logger.info()
     itemlist = []
     itemlist.append(Item(channel=item.channel, title="Películas", action="menupeliculas",
-                         url="http://www.bajui2.com/descargas/categoria/2/peliculas",
+                         url="http://www.bajui.org/descargas/categoria/2/peliculas",
                          fanart=item.fanart))
     itemlist.append(Item(channel=item.channel, title="Series", action="menuseries",
                          fanart=item.fanart))
@@ -51,13 +51,13 @@ def menuseries(item):
     logger.info()
     itemlist = []
     itemlist.append(Item(channel=item.channel, title="Series - Novedades", action="peliculas",
-                         url="http://www.bajui2.com/descargas/categoria/3/series",
+                         url="http://www.bajui.org/descargas/categoria/3/series",
                          fanart=item.fanart, viewmode="movie_with_plot"))
     itemlist.append(Item(channel=item.channel, title="Series - A-Z", action="peliculas",
-                         url="http://www.bajui2.com/descargas/categoria/3/series/orden:nombre",
+                         url="http://www.bajui.org/descargas/categoria/3/series/orden:nombre",
                          fanart=item.fanart, viewmode="movie_with_plot"))
     itemlist.append(Item(channel=item.channel, title="Series - HD", action="peliculas",
-                         url="http://www.bajui2.com/descargas/subcategoria/11/hd/orden:nombre",
+                         url="http://www.bajui.org/descargas/subcategoria/11/hd/orden:nombre",
                          fanart=item.fanart, viewmode="movie_with_plot"))
     itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url="",
                          fanart=item.fanart))
@@ -68,10 +68,10 @@ def menudocumentales(item):
     logger.info()
     itemlist = []
     itemlist.append(Item(channel=item.channel, title="Documentales - Novedades", action="peliculas",
-                         url="http://www.bajui2.com/descargas/categoria/7/docus-y-tv",
+                         url="http://www.bajui.org/descargas/categoria/7/docus-y-tv",
                          fanart=item.fanart, viewmode="movie_with_plot"))
     itemlist.append(Item(channel=item.channel, title="Documentales - A-Z", action="peliculas",
-                         url="http://www.bajui2.com/descargas/categoria/7/docus-y-tv/orden:nombre",
+                         url="http://www.bajui.org/descargas/categoria/7/docus-y-tv/orden:nombre",
                          fanart=item.fanart, viewmode="movie_with_plot"))
     itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url="",
                          fanart=item.fanart))
@@ -86,7 +86,7 @@ def search(item, texto, categoria=""):
     texto = texto.replace(" ", "+")
     logger.info("categoria: " + categoria + " url: " + url)
     try:
-        item.url = "http://www.bajui2.com/descargas/busqueda/%s"
+        item.url = "http://www.bajui.org/descargas/busqueda/%s"
         item.url = item.url % texto
         itemlist.extend(peliculas(item))
         return itemlist
@@ -118,7 +118,7 @@ def peliculas(item, paginacion=True):
         scrapedtitle = title
         scrapedplot = clean_plot(plot)
         scrapedurl = urlparse.urljoin(item.url, url)
-        scrapedthumbnail = urlparse.urljoin("http://www.bajui2.com/", thumbnail.replace("_m.jpg", "_g.jpg"))
+        scrapedthumbnail = urlparse.urljoin("http://www.bajui.org/", thumbnail.replace("_m.jpg", "_g.jpg"))
         logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]")
 
         # Añade al listado de XBMC
@@ -133,7 +133,7 @@ def peliculas(item, paginacion=True):
     scrapertools.printMatches(matches)
 
     if len(matches) > 0:
-        scrapedurl = urlparse.urljoin("http://www.bajui2.com/", matches[0])
+        scrapedurl = urlparse.urljoin("http://www.bajui.org/", matches[0])
         pagitem = Item(channel=item.channel, action="peliculas", title=">> Página siguiente", url=scrapedurl,
                        fanart=item.fanart, viewmode="movie_with_plot")
         if not paginacion:
@@ -197,7 +197,7 @@ def enlaces(item):
 
     try:
         item.thumbnail = scrapertools.get_match(data, '<div class="ficha-imagen"[^<]+<img src="([^"]+)"')
-        item.thumbnail = urlparse.urljoin("http://www.bajui2.com/", item.thumbnail)
+        item.thumbnail = urlparse.urljoin("http://www.bajui.org/", item.thumbnail)
     except:
         pass
 
@@ -234,8 +234,8 @@ def enlaces(item):
         lista_servidores = lista_servidores[:-2]
 
         scrapedthumbnail = item.thumbnail
-        # http://www.bajui2.com/ajax/mostrar-enlaces.php?id=330582&code=124767d31bfbf14c3861
-        scrapedurl = "http://www.bajui2.com/ajax/mostrar-enlaces.php?id=" + id + "&code=" + id2
+        # http://www.bajui.org/ajax/mostrar-enlaces.php?id=330582&code=124767d31bfbf14c3861
+        scrapedurl = "http://www.bajui.org/ajax/mostrar-enlaces.php?id=" + id + "&code=" + id2
         scrapedplot = item.plot
         scrapedtitle = "Enlaces de " + usuario + " (" + fecha + ") (" + lista_servidores + ")"
 

From 6b1727a0b8bf956f3e61a38eeed24ebb54cd162f Mon Sep 17 00:00:00 2001
From: danielr460 <adrinconr@correo.udistrital.edu.co>
Date: Sun, 29 Oct 2017 19:50:42 -0500
Subject: [PATCH 03/12] Arreglado serieslan

---
 plugin.video.alfa/channels/serieslan.py | 40 +++++++++++++++++--------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/plugin.video.alfa/channels/serieslan.py b/plugin.video.alfa/channels/serieslan.py
index efdada3e..05d15b36 100644
--- a/plugin.video.alfa/channels/serieslan.py
+++ b/plugin.video.alfa/channels/serieslan.py
@@ -14,10 +14,7 @@ from channels import autoplay
 
 IDIOMAS = {'latino': 'Latino'}
 list_language = IDIOMAS.values()
-list_servers = ['openload',
-                'okru',
-                'netutv',
-                'rapidvideo'
+list_servers = ['openload'
                 ]
 list_quality = ['default']
 
@@ -49,7 +46,11 @@ def lista(item):
     patron = '<a href="([^"]+)" '
     patron += 'class="link">.+?<img src="([^"]+)".*?'
     patron += 'title="([^"]+)">'
-
+    if item.url==host:
+        a=1
+    else:
+        num=(item.url).split('-')
+        a=int(num[1])
     matches = scrapertools.find_multiple_matches(data, patron)
 
     # Paginacion
@@ -57,17 +58,28 @@ def lista(item):
     min = item.page * num_items_x_pagina
     min=min-item.page
     max = min + num_items_x_pagina - 1
-
+    b=0
     for link, img, name in matches[min:max]:
-        title = name
+        b=b+1
+        if " y " in name:
+            title=name.replace(" y "," & ")
+        else:
+            title = name
         url = host + link
         scrapedthumbnail = host + img
         context1=[renumbertools.context(item), autoplay.context]
         itemlist.append(item.clone(title=title, url=url, action="episodios", thumbnail=scrapedthumbnail, show=title,
                                    context=context1))
-
-    itemlist.append(
-        Item(channel=item.channel, title="Página Siguiente >>", url=item.url, action="lista", page=item.page + 1))
+    logger.info("gasdfsa "+str(b))
+    if b<29:
+        a=a+1
+        url="https://serieslan.com/pag-"+str(a)
+        if b>10:
+            itemlist.append(
+                Item(channel=item.channel, title="Página Siguiente >>", url=url, action="lista", page=0))
+    else:    
+        itemlist.append(
+             Item(channel=item.channel, title="Página Siguiente >>", url=item.url, action="lista", page=item.page + 1))
 
     tmdb.set_infoLabels(itemlist)
     return itemlist
@@ -93,6 +105,10 @@ def episodios(item):
 
         title = ""
         pat = "/"
+        if "Mike, Lu & Og"==item.title:
+            pat="&/"
+        if "KND" in item.title:
+            pat="-"
         # varios episodios en un enlace
         if len(name.split(pat)) > 1:
             i = 0
@@ -134,7 +150,7 @@ def findvideos(item):
     itemlist = []
 
     url_server = "https://openload.co/embed/%s/"
-    url_api_get_key = "https://serieslan.com/ide.php?i=%s&k=%s"
+    url_api_get_key = "https://serieslan.com/idx.php?i=%s&k=%s"
 
     def txc(key, _str):
         s = range(256)
@@ -157,7 +173,7 @@ def findvideos(item):
         return res
 
     data = httptools.downloadpage(item.url).data
-    pattern = '<div id="video" idv="([^"]*)" ide="([^"]*)" ids="[^"]*" class="video">'
+    pattern = "<script type=.+?>.+?\['(.+?)','(.+?)','.+?'\]"
     idv, ide = scrapertools.find_single_match(data, pattern)
     thumbnail = scrapertools.find_single_match(data,
                                                '<div id="tab-1" class="tab-content current">.+?<img src="([^"]*)">')

From 16473764c90747506792430c00685c1c38dc3a7d Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 30 Oct 2017 04:15:00 -0500
Subject: [PATCH 04/12] flashx: fix

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

diff --git a/plugin.video.alfa/servers/flashx.py b/plugin.video.alfa/servers/flashx.py
index fd654da7..9730b95d 100644
--- a/plugin.video.alfa/servers/flashx.py
+++ b/plugin.video.alfa/servers/flashx.py
@@ -37,7 +37,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     cgi_counter = cgi_counter.replace("%0A","").replace("%22","")
     playnow = scrapertools.find_single_match(data, 'https://www.flashx.tv/dl[^"]+')
     # Para obtener el f y el fxfx
-    js_fxfx = scrapertools.find_single_match(data, """(?is)src=.(https://www.flashx.tv/js/code.js.*?[^(?:'|")]+)""")
+    js_fxfx = "https://www." + scrapertools.find_single_match(data, """(?is)(flashx.tv/js/code.js.*?[^(?:'|")]+)""")
     data_fxfx = httptools.downloadpage(js_fxfx).data
     mfxfx = scrapertools.find_single_match(data_fxfx, 'get.*?({.*?})').replace("'","").replace(" ","")
     matches = scrapertools.find_multiple_matches(mfxfx, '(\w+):(\w+)')

From 0621b1fa91734adfaa1d66ece0a236de461b9f49 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 30 Oct 2017 04:16:22 -0500
Subject: [PATCH 05/12] gamovideo: fix

---
 plugin.video.alfa/servers/gamovideo.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugin.video.alfa/servers/gamovideo.py b/plugin.video.alfa/servers/gamovideo.py
index 0c21c218..e2d29121 100755
--- a/plugin.video.alfa/servers/gamovideo.py
+++ b/plugin.video.alfa/servers/gamovideo.py
@@ -7,13 +7,13 @@ from core import scrapertools
 from lib import jsunpack
 from platformcode import logger
 
-headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:40.0) Gecko/20100101 ' \
-                                             'Firefox/40.0'}
+headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:57.0) Gecko/20100101 ' \
+                                             'Firefox/57.0'}
 
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url, add_referer = True).data
+    data = httptools.downloadpage(page_url, headers=headers).data
 
     if "File was deleted" in data or "Not Found" in data or "File was locked by administrator" in data:
         return False, "[Gamovideo] El archivo no existe o ha sido borrado"
@@ -26,7 +26,6 @@ def test_video_exists(page_url):
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
     data = httptools.downloadpage(page_url, headers=headers).data
-    logger.debug(data)
     packer = scrapertools.find_single_match(data,
                                             "<script type='text/javascript'>(eval.function.p,a,c,k,e,d..*?)</script>")
     if packer != "":

From 22827e0f7e5fe4603a83aaa7f2655d699bbd1247 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 30 Oct 2017 10:28:29 -0500
Subject: [PATCH 06/12] Update animemovil.json

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

diff --git a/plugin.video.alfa/channels/animemovil.json b/plugin.video.alfa/channels/animemovil.json
index 41ac4634..8f9f296c 100644
--- a/plugin.video.alfa/channels/animemovil.json
+++ b/plugin.video.alfa/channels/animemovil.json
@@ -3,7 +3,7 @@
   "name": "Animemovil",
   "active": true,
   "adult": false,
-  "language": ["cat", "lat"],
+  "language": ["cast", "lat"],
   "thumbnail": "https://s1.postimg.org/92ji7stii7/animemovil1.png",
   "banner": "",
   "categories": [

From 19101b5310f6473505b1829d544f0793992e8586 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 30 Oct 2017 10:32:27 -0500
Subject: [PATCH 07/12] Delete bajui2.py

---
 plugin.video.alfa/channels/bajui2.py | 270 ---------------------------
 1 file changed, 270 deletions(-)
 delete mode 100755 plugin.video.alfa/channels/bajui2.py

diff --git a/plugin.video.alfa/channels/bajui2.py b/plugin.video.alfa/channels/bajui2.py
deleted file mode 100755
index efa7a3eb..00000000
--- a/plugin.video.alfa/channels/bajui2.py
+++ /dev/null
@@ -1,270 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import logger
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Películas", action="menupeliculas",
-                         url="http://www.bajui.org/descargas/categoria/2/peliculas",
-                         fanart=item.fanart))
-    itemlist.append(Item(channel=item.channel, title="Series", action="menuseries",
-                         fanart=item.fanart))
-    itemlist.append(Item(channel=item.channel, title="Documentales", action="menudocumentales",
-                         fanart=item.fanart))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search",
-                         fanart=item.fanart))
-    return itemlist
-
-
-def menupeliculas(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Películas - Novedades", action="peliculas", url=item.url,
-                         fanart=item.fanart, viewmode="movie_with_plot"))
-    itemlist.append(
-        Item(channel=item.channel, title="Películas - A-Z", action="peliculas", url=item.url + "/orden:nombre",
-             fanart=item.fanart, viewmode="movie_with_plot"))
-
-    # <ul class="submenu2 subcategorias"><li ><a href="/descargas/subcategoria/4/br-scr-dvdscr">BR-Scr / DVDScr</a></li><li ><a href="/descargas/subcategoria/6/dvdr-full">DVDR - Full</a></li><li ><a href="/descargas/subcategoria/1/dvdrip-vhsrip">DVDRip / VHSRip</a></li><li ><a href="/descargas/subcategoria/3/hd">HD</a></li><li ><a href="/descargas/subcategoria/2/hdrip-bdrip">HDRip / BDRip</a></li><li ><a href="/descargas/subcategoria/35/latino">Latino</a></li><li ><a href="/descargas/subcategoria/5/ts-scr-cam">TS-Scr / CAM</a></li><li ><a href="/descargas/subcategoria/7/vos">VOS</a></li></ul>
-    data = scrapertools.cache_page(item.url)
-    data = scrapertools.get_match(data, '<ul class="submenu2 subcategorias">(.*?)</ul>')
-    patron = '<a href="([^"]+)">([^<]+)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, title in matches:
-        scrapedurl = urlparse.urljoin(item.url, url)
-        itemlist.append(Item(channel=item.channel, title="Películas en " + title, action="peliculas", url=scrapedurl,
-                             fanart=item.fanart, viewmode="movie_with_plot"))
-
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url="", fanart=item.fanart))
-    return itemlist
-
-
-def menuseries(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Series - Novedades", action="peliculas",
-                         url="http://www.bajui.org/descargas/categoria/3/series",
-                         fanart=item.fanart, viewmode="movie_with_plot"))
-    itemlist.append(Item(channel=item.channel, title="Series - A-Z", action="peliculas",
-                         url="http://www.bajui.org/descargas/categoria/3/series/orden:nombre",
-                         fanart=item.fanart, viewmode="movie_with_plot"))
-    itemlist.append(Item(channel=item.channel, title="Series - HD", action="peliculas",
-                         url="http://www.bajui.org/descargas/subcategoria/11/hd/orden:nombre",
-                         fanart=item.fanart, viewmode="movie_with_plot"))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url="",
-                         fanart=item.fanart))
-    return itemlist
-
-
-def menudocumentales(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Documentales - Novedades", action="peliculas",
-                         url="http://www.bajui.org/descargas/categoria/7/docus-y-tv",
-                         fanart=item.fanart, viewmode="movie_with_plot"))
-    itemlist.append(Item(channel=item.channel, title="Documentales - A-Z", action="peliculas",
-                         url="http://www.bajui.org/descargas/categoria/7/docus-y-tv/orden:nombre",
-                         fanart=item.fanart, viewmode="movie_with_plot"))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url="",
-                         fanart=item.fanart))
-    return itemlist
-
-
-# Al llamarse "search" la función, el launcher pide un texto a buscar y lo añade como parámetro
-def search(item, texto, categoria=""):
-    logger.info(item.url + " search " + texto)
-    itemlist = []
-    url = item.url
-    texto = texto.replace(" ", "+")
-    logger.info("categoria: " + categoria + " url: " + url)
-    try:
-        item.url = "http://www.bajui.org/descargas/busqueda/%s"
-        item.url = item.url % texto
-        itemlist.extend(peliculas(item))
-        return itemlist
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def peliculas(item, paginacion=True):
-    logger.info()
-    url = item.url
-
-    # Descarga la página
-    data = scrapertools.cache_page(url)
-    patron = '<li id="ficha-\d+" class="ficha2[^<]+'
-    patron += '<div class="detalles-ficha"[^<]+'
-    patron += '<span class="nombre-det">Ficha\: ([^<]+)</span>[^<]+'
-    patron += '<span class="categoria-det">[^<]+</span>[^<]+'
-    patron += '<span class="descrip-det">(.*?)</span>[^<]+'
-    patron += '</div>.*?<a href="([^"]+)"[^<]+'
-    patron += '<img src="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    for title, plot, url, thumbnail in matches:
-        scrapedtitle = title
-        scrapedplot = clean_plot(plot)
-        scrapedurl = urlparse.urljoin(item.url, url)
-        scrapedthumbnail = urlparse.urljoin("http://www.bajui.org/", thumbnail.replace("_m.jpg", "_g.jpg"))
-        logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]")
-
-        # Añade al listado de XBMC
-        itemlist.append(
-            Item(channel=item.channel, action="enlaces", title=scrapedtitle, fulltitle=title, url=scrapedurl,
-                 thumbnail=scrapedthumbnail, plot=scrapedplot, extra=scrapedtitle, context="4|5",
-                 fanart=item.fanart, viewmode="movie_with_plot"))
-
-    # Extrae el paginador
-    patron = '<a href="([^"]+)" class="pagina pag_sig">Siguiente \&raquo\;</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    if len(matches) > 0:
-        scrapedurl = urlparse.urljoin("http://www.bajui.org/", matches[0])
-        pagitem = Item(channel=item.channel, action="peliculas", title=">> Página siguiente", url=scrapedurl,
-                       fanart=item.fanart, viewmode="movie_with_plot")
-        if not paginacion:
-            itemlist.extend(peliculas(pagitem))
-        else:
-            itemlist.append(pagitem)
-
-    return itemlist
-
-
-def clean_plot(scrapedplot):
-    scrapedplot = scrapedplot.replace("\n", "").replace("\r", "")
-    scrapedplot = re.compile("TÍTULO ORIGINAL[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("AÑO[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Año[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("DURACIÓN[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Duración[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("PAIS[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("PAÍS[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Pais[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("País[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("DIRECTOR[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("DIRECCIÓN[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Dirección[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("REPARTO[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Reparto[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Interpretación[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("GUIÓN[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Guión[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("MÚSICA[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Música[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("FOTOGRAFÍA[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Fotografía[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("PRODUCTORA[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Producción[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Montaje[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Vestuario[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("GÉNERO[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("GENERO[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Genero[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Género[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("PREMIOS[^<]+<br />", re.DOTALL).sub("", scrapedplot)
-
-    scrapedplot = re.compile("SINOPSIS", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = re.compile("Sinopsis", re.DOTALL).sub("", scrapedplot)
-    scrapedplot = scrapertools.htmlclean(scrapedplot)
-    return scrapedplot
-
-
-def enlaces(item):
-    logger.info()
-    itemlist = []
-
-    data = scrapertools.cache_page(item.url)
-
-    try:
-        item.plot = scrapertools.get_match(data, '<span class="ficha-descrip">(.*?)</span>')
-        item.plot = clean_plot(item.plot)
-    except:
-        pass
-
-    try:
-        item.thumbnail = scrapertools.get_match(data, '<div class="ficha-imagen"[^<]+<img src="([^"]+)"')
-        item.thumbnail = urlparse.urljoin("http://www.bajui.org/", item.thumbnail)
-    except:
-        pass
-
-    '''
-    <div id="enlaces-34769"><img id="enlaces-cargando-34769" src="/images/cargando.gif" style="display:none;"/></div>
-    </li><li id="box-enlace-330690" class="box-enlace">
-    <div class="box-enlace-cabecera">
-    <div class="datos-usuario"><img class="avatar" src="images/avatars/116305_p.jpg" />Enlaces de: 
-    <a class="nombre-usuario" href="/usuario/jerobien">jerobien</a> </div>
-    <div class="datos-act">Actualizado: Hace 8 minutos</div>
-    <div class="datos-boton-mostrar"><a id="boton-mostrar-330690" class="boton" href="javascript:mostrar_enlaces(330690,'b01de63028139fdd348d');">Mostrar enlaces</a></div>
-    <div class="datos-servidores"><div class="datos-servidores-cell"><img src="/images/servidores/ul.to.png" title="uploaded.com" border="0" alt="uploaded.com" /><img src="/images/servidores/bitshare.png" title="bitshare.com" border="0" alt="bitshare.com" /><img src="/images/servidores/freakshare.net.jpg" title="freakshare.com" border="0" alt="freakshare.com" /><img src="/images/servidores/letitbit.png" title="letitbit.net" border="0" alt="letitbit.net" /><img src="/images/servidores/turbobit.png" title="turbobit.net" border="0" alt="turbobit.net" /><img src="/images/servidores/rapidgator.png" title="rapidgator.net" border="0" alt="rapidgator.net" /><img src="/images/servidores/cloudzer.png" title="clz.to" border="0" alt="clz.to" /></div></div>
-    </div>
-    '''
-
-    patron = '<div class="box-enlace-cabecera"[^<]+'
-    patron += '<div class="datos-usuario"><img class="avatar" src="([^"]+)" />Enlaces[^<]+'
-    patron += '<a class="nombre-usuario" href="[^"]+">([^<]+)</a[^<]+</div>[^<]+'
-    patron += '<div class="datos-act">Actualizado. ([^<]+)</div>.*?'
-    patron += '<div class="datos-boton-mostrar"><a id="boton-mostrar-\d+" class="boton" href="javascript.mostrar_enlaces\((\d+)\,\'([^\']+)\'[^>]+>Mostrar enlaces</a></div>[^<]+'
-    patron += '<div class="datos-servidores"><div class="datos-servidores-cell">(.*?)</div></div>'
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    logger.debug("matches=" + repr(matches))
-
-    for thumbnail, usuario, fecha, id, id2, servidores in matches:
-        # <img src="/images/servidores/bitshare.png" title="bitshare.com" border="0" alt="bitshare.com" /><img src="/images/servidores/freakshare.net.jpg" title="freakshare.com" border="0" alt="freakshare.com" /><img src="/images/servidores/rapidgator.png" title="rapidgator.net" border="0" alt="rapidgator.net" /><img src="/images/servidores/turbobit.png" title="turbobit.net" border="0" alt="turbobit.net" /><img src="/images/servidores/muchshare.png" title="muchshare.net" border="0" alt="muchshare.net" /><img src="/images/servidores/letitbit.png" title="letitbit.net" border="0" alt="letitbit.net" /><img src="/images/servidores/shareflare.png" title="shareflare.net" border="0" alt="shareflare.net" /><img src="/images/servidores/otros.gif" title="Otros servidores" border="0" alt="Otros" />
-        patronservidores = '<img src="[^"]+" title="([^"]+)"'
-        matches2 = re.compile(patronservidores, re.DOTALL).findall(servidores)
-        lista_servidores = ""
-        for servidor in matches2:
-            lista_servidores = lista_servidores + servidor + ", "
-        lista_servidores = lista_servidores[:-2]
-
-        scrapedthumbnail = item.thumbnail
-        # http://www.bajui.org/ajax/mostrar-enlaces.php?id=330582&code=124767d31bfbf14c3861
-        scrapedurl = "http://www.bajui.org/ajax/mostrar-enlaces.php?id=" + id + "&code=" + id2
-        scrapedplot = item.plot
-        scrapedtitle = "Enlaces de " + usuario + " (" + fecha + ") (" + lista_servidores + ")"
-
-        itemlist.append(
-            Item(channel=item.channel, action="findvideos", title=scrapedtitle, fulltitle=item.title, url=scrapedurl,
-                 thumbnail=scrapedthumbnail, plot=scrapedplot, context="4|5",
-                 fanart=item.fanart))
-
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-
-    data = scrapertools.cache_page(item.url)
-    itemlist = servertools.find_video_items(data=data)
-    for videoitem in itemlist:
-        videoitem.channel = item.channel
-        videoitem.plot = item.plot
-        videoitem.thumbnail = item.thumbnail
-        videoitem.fulltitle = item.fulltitle
-
-        try:
-            parsed_url = urlparse.urlparse(videoitem.url)
-            fichero = parsed_url.path
-            partes = fichero.split("/")
-            titulo = partes[len(partes) - 1]
-            videoitem.title = titulo + " - [" + videoitem.server + "]"
-        except:
-            videoitem.title = item.title
-
-    return itemlist

From 8328610ffa10dce1f36b4484166b2210bb688a0e Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 30 Oct 2017 10:32:41 -0500
Subject: [PATCH 08/12] Delete bajui2.json

---
 plugin.video.alfa/channels/bajui2.json | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100755 plugin.video.alfa/channels/bajui2.json

diff --git a/plugin.video.alfa/channels/bajui2.json b/plugin.video.alfa/channels/bajui2.json
deleted file mode 100755
index 2af4b680..00000000
--- a/plugin.video.alfa/channels/bajui2.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "id": "bajui2",
-  "name": "Bajui2",
-  "active": true,
-  "adult": false,
-  "language": ["cast"],
-  "thumbnail": "bajui.png",
-  "banner": "bajui.png",
-  "fanart": "bajui.png",
-  "categories": [
-    "movie",
-    "tvshow",
-    "documentary",
-    "vos"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": false,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}

From ae318721ab0de5e12edbcafdaccdc7e509f3ed6d Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 30 Oct 2017 10:34:08 -0500
Subject: [PATCH 09/12] Add files via upload

---
 plugin.video.alfa/channels/bajui.json |  26 +++
 plugin.video.alfa/channels/bajui.py   | 270 ++++++++++++++++++++++++++
 2 files changed, 296 insertions(+)
 create mode 100644 plugin.video.alfa/channels/bajui.json
 create mode 100644 plugin.video.alfa/channels/bajui.py

diff --git a/plugin.video.alfa/channels/bajui.json b/plugin.video.alfa/channels/bajui.json
new file mode 100644
index 00000000..3d4890d0
--- /dev/null
+++ b/plugin.video.alfa/channels/bajui.json
@@ -0,0 +1,26 @@
+{
+  "id": "bajui",
+  "name": "Bajui",
+  "active": true,
+  "adult": false,
+  "language": ["cast"],
+  "thumbnail": "bajui.png",
+  "banner": "bajui.png",
+  "fanart": "bajui.png",
+  "categories": [
+    "movie",
+    "tvshow",
+    "documentary",
+    "vos"
+  ],
+  "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": false,
+      "enabled": true,
+      "visible": true
+    }
+  ]
+}
diff --git a/plugin.video.alfa/channels/bajui.py b/plugin.video.alfa/channels/bajui.py
new file mode 100644
index 00000000..0baf7190
--- /dev/null
+++ b/plugin.video.alfa/channels/bajui.py
@@ -0,0 +1,270 @@
+# -*- coding: utf-8 -*-
+
+import re
+import urlparse
+
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import logger
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append(Item(channel=item.channel, title="Películas", action="menupeliculas",
+                         url="http://www.bajui.org/descargas/categoria/2/peliculas",
+                         fanart=item.fanart))
+    itemlist.append(Item(channel=item.channel, title="Series", action="menuseries",
+                         fanart=item.fanart))
+    itemlist.append(Item(channel=item.channel, title="Documentales", action="menudocumentales",
+                         fanart=item.fanart))
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search",
+                         fanart=item.fanart))
+    return itemlist
+
+
+def menupeliculas(item):
+    logger.info()
+    itemlist = []
+    itemlist.append(Item(channel=item.channel, title="Películas - Novedades", action="peliculas", url=item.url,
+                         fanart=item.fanart, viewmode="movie_with_plot"))
+    itemlist.append(
+        Item(channel=item.channel, title="Películas - A-Z", action="peliculas", url=item.url + "/orden:nombre",
+             fanart=item.fanart, viewmode="movie_with_plot"))
+
+    # <ul class="submenu2 subcategorias"><li ><a href="/descargas/subcategoria/4/br-scr-dvdscr">BR-Scr / DVDScr</a></li><li ><a href="/descargas/subcategoria/6/dvdr-full">DVDR - Full</a></li><li ><a href="/descargas/subcategoria/1/dvdrip-vhsrip">DVDRip / VHSRip</a></li><li ><a href="/descargas/subcategoria/3/hd">HD</a></li><li ><a href="/descargas/subcategoria/2/hdrip-bdrip">HDRip / BDRip</a></li><li ><a href="/descargas/subcategoria/35/latino">Latino</a></li><li ><a href="/descargas/subcategoria/5/ts-scr-cam">TS-Scr / CAM</a></li><li ><a href="/descargas/subcategoria/7/vos">VOS</a></li></ul>
+    data = scrapertools.cache_page(item.url)
+    data = scrapertools.get_match(data, '<ul class="submenu2 subcategorias">(.*?)</ul>')
+    patron = '<a href="([^"]+)">([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for url, title in matches:
+        scrapedurl = urlparse.urljoin(item.url, url)
+        itemlist.append(Item(channel=item.channel, title="Películas en " + title, action="peliculas", url=scrapedurl,
+                             fanart=item.fanart, viewmode="movie_with_plot"))
+
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url="", fanart=item.fanart))
+    return itemlist
+
+
+def menuseries(item):
+    logger.info()
+    itemlist = []
+    itemlist.append(Item(channel=item.channel, title="Series - Novedades", action="peliculas",
+                         url="http://www.bajui.org/descargas/categoria/3/series",
+                         fanart=item.fanart, viewmode="movie_with_plot"))
+    itemlist.append(Item(channel=item.channel, title="Series - A-Z", action="peliculas",
+                         url="http://www.bajui.org/descargas/categoria/3/series/orden:nombre",
+                         fanart=item.fanart, viewmode="movie_with_plot"))
+    itemlist.append(Item(channel=item.channel, title="Series - HD", action="peliculas",
+                         url="http://www.bajui.org/descargas/subcategoria/11/hd/orden:nombre",
+                         fanart=item.fanart, viewmode="movie_with_plot"))
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url="",
+                         fanart=item.fanart))
+    return itemlist
+
+
+def menudocumentales(item):
+    logger.info()
+    itemlist = []
+    itemlist.append(Item(channel=item.channel, title="Documentales - Novedades", action="peliculas",
+                         url="http://www.bajui.org/descargas/categoria/7/docus-y-tv",
+                         fanart=item.fanart, viewmode="movie_with_plot"))
+    itemlist.append(Item(channel=item.channel, title="Documentales - A-Z", action="peliculas",
+                         url="http://www.bajui.org/descargas/categoria/7/docus-y-tv/orden:nombre",
+                         fanart=item.fanart, viewmode="movie_with_plot"))
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url="",
+                         fanart=item.fanart))
+    return itemlist
+
+
+# Al llamarse "search" la función, el launcher pide un texto a buscar y lo añade como parámetro
+def search(item, texto, categoria=""):
+    logger.info(item.url + " search " + texto)
+    itemlist = []
+    url = item.url
+    texto = texto.replace(" ", "+")
+    logger.info("categoria: " + categoria + " url: " + url)
+    try:
+        item.url = "http://www.bajui.org/descargas/busqueda/%s"
+        item.url = item.url % texto
+        itemlist.extend(peliculas(item))
+        return itemlist
+    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def peliculas(item, paginacion=True):
+    logger.info()
+    url = item.url
+
+    # Descarga la página
+    data = scrapertools.cache_page(url)
+    patron = '<li id="ficha-\d+" class="ficha2[^<]+'
+    patron += '<div class="detalles-ficha"[^<]+'
+    patron += '<span class="nombre-det">Ficha\: ([^<]+)</span>[^<]+'
+    patron += '<span class="categoria-det">[^<]+</span>[^<]+'
+    patron += '<span class="descrip-det">(.*?)</span>[^<]+'
+    patron += '</div>.*?<a href="([^"]+)"[^<]+'
+    patron += '<img src="([^"]+)"'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    itemlist = []
+
+    for title, plot, url, thumbnail in matches:
+        scrapedtitle = title
+        scrapedplot = clean_plot(plot)
+        scrapedurl = urlparse.urljoin(item.url, url)
+        scrapedthumbnail = urlparse.urljoin("http://www.bajui.org/", thumbnail.replace("_m.jpg", "_g.jpg"))
+        logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]")
+
+        # Añade al listado de XBMC
+        itemlist.append(
+            Item(channel=item.channel, action="enlaces", title=scrapedtitle, fulltitle=title, url=scrapedurl,
+                 thumbnail=scrapedthumbnail, plot=scrapedplot, extra=scrapedtitle, context="4|5",
+                 fanart=item.fanart, viewmode="movie_with_plot"))
+
+    # Extrae el paginador
+    patron = '<a href="([^"]+)" class="pagina pag_sig">Siguiente \&raquo\;</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
+
+    if len(matches) > 0:
+        scrapedurl = urlparse.urljoin("http://www.bajui.org/", matches[0])
+        pagitem = Item(channel=item.channel, action="peliculas", title=">> Página siguiente", url=scrapedurl,
+                       fanart=item.fanart, viewmode="movie_with_plot")
+        if not paginacion:
+            itemlist.extend(peliculas(pagitem))
+        else:
+            itemlist.append(pagitem)
+
+    return itemlist
+
+
+def clean_plot(scrapedplot):
+    scrapedplot = scrapedplot.replace("\n", "").replace("\r", "")
+    scrapedplot = re.compile("TÍTULO ORIGINAL[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("AÑO[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Año[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("DURACIÓN[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Duración[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("PAIS[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("PAÍS[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Pais[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("País[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("DIRECTOR[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("DIRECCIÓN[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Dirección[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("REPARTO[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Reparto[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Interpretación[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("GUIÓN[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Guión[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("MÚSICA[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Música[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("FOTOGRAFÍA[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Fotografía[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("PRODUCTORA[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Producción[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Montaje[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Vestuario[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("GÉNERO[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("GENERO[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Genero[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Género[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("PREMIOS[^<]+<br />", re.DOTALL).sub("", scrapedplot)
+
+    scrapedplot = re.compile("SINOPSIS", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = re.compile("Sinopsis", re.DOTALL).sub("", scrapedplot)
+    scrapedplot = scrapertools.htmlclean(scrapedplot)
+    return scrapedplot
+
+
+def enlaces(item):
+    logger.info()
+    itemlist = []
+
+    data = scrapertools.cache_page(item.url)
+
+    try:
+        item.plot = scrapertools.get_match(data, '<span class="ficha-descrip">(.*?)</span>')
+        item.plot = clean_plot(item.plot)
+    except:
+        pass
+
+    try:
+        item.thumbnail = scrapertools.get_match(data, '<div class="ficha-imagen"[^<]+<img src="([^"]+)"')
+        item.thumbnail = urlparse.urljoin("http://www.bajui.org/", item.thumbnail)
+    except:
+        pass
+
+    '''
+    <div id="enlaces-34769"><img id="enlaces-cargando-34769" src="/images/cargando.gif" style="display:none;"/></div>
+    </li><li id="box-enlace-330690" class="box-enlace">
+    <div class="box-enlace-cabecera">
+    <div class="datos-usuario"><img class="avatar" src="images/avatars/116305_p.jpg" />Enlaces de: 
+    <a class="nombre-usuario" href="/usuario/jerobien">jerobien</a> </div>
+    <div class="datos-act">Actualizado: Hace 8 minutos</div>
+    <div class="datos-boton-mostrar"><a id="boton-mostrar-330690" class="boton" href="javascript:mostrar_enlaces(330690,'b01de63028139fdd348d');">Mostrar enlaces</a></div>
+    <div class="datos-servidores"><div class="datos-servidores-cell"><img src="/images/servidores/ul.to.png" title="uploaded.com" border="0" alt="uploaded.com" /><img src="/images/servidores/bitshare.png" title="bitshare.com" border="0" alt="bitshare.com" /><img src="/images/servidores/freakshare.net.jpg" title="freakshare.com" border="0" alt="freakshare.com" /><img src="/images/servidores/letitbit.png" title="letitbit.net" border="0" alt="letitbit.net" /><img src="/images/servidores/turbobit.png" title="turbobit.net" border="0" alt="turbobit.net" /><img src="/images/servidores/rapidgator.png" title="rapidgator.net" border="0" alt="rapidgator.net" /><img src="/images/servidores/cloudzer.png" title="clz.to" border="0" alt="clz.to" /></div></div>
+    </div>
+    '''
+
+    patron = '<div class="box-enlace-cabecera"[^<]+'
+    patron += '<div class="datos-usuario"><img class="avatar" src="([^"]+)" />Enlaces[^<]+'
+    patron += '<a class="nombre-usuario" href="[^"]+">([^<]+)</a[^<]+</div>[^<]+'
+    patron += '<div class="datos-act">Actualizado. ([^<]+)</div>.*?'
+    patron += '<div class="datos-boton-mostrar"><a id="boton-mostrar-\d+" class="boton" href="javascript.mostrar_enlaces\((\d+)\,\'([^\']+)\'[^>]+>Mostrar enlaces</a></div>[^<]+'
+    patron += '<div class="datos-servidores"><div class="datos-servidores-cell">(.*?)</div></div>'
+
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
+    logger.debug("matches=" + repr(matches))
+
+    for thumbnail, usuario, fecha, id, id2, servidores in matches:
+        # <img src="/images/servidores/bitshare.png" title="bitshare.com" border="0" alt="bitshare.com" /><img src="/images/servidores/freakshare.net.jpg" title="freakshare.com" border="0" alt="freakshare.com" /><img src="/images/servidores/rapidgator.png" title="rapidgator.net" border="0" alt="rapidgator.net" /><img src="/images/servidores/turbobit.png" title="turbobit.net" border="0" alt="turbobit.net" /><img src="/images/servidores/muchshare.png" title="muchshare.net" border="0" alt="muchshare.net" /><img src="/images/servidores/letitbit.png" title="letitbit.net" border="0" alt="letitbit.net" /><img src="/images/servidores/shareflare.png" title="shareflare.net" border="0" alt="shareflare.net" /><img src="/images/servidores/otros.gif" title="Otros servidores" border="0" alt="Otros" />
+        patronservidores = '<img src="[^"]+" title="([^"]+)"'
+        matches2 = re.compile(patronservidores, re.DOTALL).findall(servidores)
+        lista_servidores = ""
+        for servidor in matches2:
+            lista_servidores = lista_servidores + servidor + ", "
+        lista_servidores = lista_servidores[:-2]
+
+        scrapedthumbnail = item.thumbnail
+        # http://www.bajui.org/ajax/mostrar-enlaces.php?id=330582&code=124767d31bfbf14c3861
+        scrapedurl = "http://www.bajui.org/ajax/mostrar-enlaces.php?id=" + id + "&code=" + id2
+        scrapedplot = item.plot
+        scrapedtitle = "Enlaces de " + usuario + " (" + fecha + ") (" + lista_servidores + ")"
+
+        itemlist.append(
+            Item(channel=item.channel, action="findvideos", title=scrapedtitle, fulltitle=item.title, url=scrapedurl,
+                 thumbnail=scrapedthumbnail, plot=scrapedplot, context="4|5",
+                 fanart=item.fanart))
+
+    return itemlist
+
+
+def findvideos(item):
+    logger.info()
+
+    data = scrapertools.cache_page(item.url)
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.channel = item.channel
+        videoitem.plot = item.plot
+        videoitem.thumbnail = item.thumbnail
+        videoitem.fulltitle = item.fulltitle
+
+        try:
+            parsed_url = urlparse.urlparse(videoitem.url)
+            fichero = parsed_url.path
+            partes = fichero.split("/")
+            titulo = partes[len(partes) - 1]
+            videoitem.title = titulo + " - [" + videoitem.server + "]"
+        except:
+            videoitem.title = item.title
+
+    return itemlist

From 9e6729f0be2e5f37829e40b9bb313b07567c62dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Rinc=C3=B3n=20Rodr=C3=ADguez?=
 <adrinconr@correo.udistrital.edu.co>
Date: Tue, 31 Oct 2017 07:17:04 -0500
Subject: [PATCH 10/12] Update danimados.json

---
 plugin.video.alfa/channels/danimados.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/plugin.video.alfa/channels/danimados.json b/plugin.video.alfa/channels/danimados.json
index 51d80b24..0bd6230e 100644
--- a/plugin.video.alfa/channels/danimados.json
+++ b/plugin.video.alfa/channels/danimados.json
@@ -6,13 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://imgur.com/kU5Lx1S.png",
   "banner": "https://imgur.com/xG5xqBq.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "24/10/2017",
-      "description": "Primera version del canal"
-    }
-  ],
   "categories": [
     "tvshow"
   ]

From 7b2a3c218129db6da6d78a4f8a6dd226164b2c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Rinc=C3=B3n=20Rodr=C3=ADguez?=
 <adrinconr@correo.udistrital.edu.co>
Date: Tue, 31 Oct 2017 07:19:55 -0500
Subject: [PATCH 11/12] Update mundiseries.json

---
 plugin.video.alfa/channels/mundiseries.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/plugin.video.alfa/channels/mundiseries.json b/plugin.video.alfa/channels/mundiseries.json
index 283f80f6..dc01afb0 100644
--- a/plugin.video.alfa/channels/mundiseries.json
+++ b/plugin.video.alfa/channels/mundiseries.json
@@ -6,13 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "https://imgur.com/GdGMFi1.png",
   "banner": "https://imgur.com/1bDbYY1.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "23/10/2017",
-      "description": "Primera versión del canal"
-    }
-  ],
   "categories": [
     "tvshow"
   ]

From 99dfa2be58e7f8da058f8d3496b69c2a3f66a38f Mon Sep 17 00:00:00 2001
From: alfa-addon <inter95@protonmail.com>
Date: Tue, 31 Oct 2017 20:57:02 -0400
Subject: [PATCH 12/12] v2.3.3

---
 plugin.video.alfa/addon.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml
index 0468d0e7..613cdb61 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="2.3.2" provider-name="Alfa Addon">
+<addon id="plugin.video.alfa" name="Alfa" version="2.3.3" provider-name="Alfa Addon">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.libtorrent" optional="true"/>
@@ -19,14 +19,13 @@
     </assets>
       <news>[B]Estos son los cambios para esta versión:[/B]
       [COLOR green][B]Canales agregados y arreglos[/B][/COLOR]
-      » cinetux             »          animemovil
-      » anitoonstv       »          cartoonlatino
-      » seriesblanco   »          damimados
-      » mundiseries   »          serieslan
-      » cinetux            »          animemovil
-      » plusdede        »           pelisplus
-      » rapidvideo     »           flashx
-      ¤ arreglos internos
+      » serieslan             »          animemovil
+      » mundiseries       »          bajui
+      » seriesblanco       »          descargamix
+      » miradetodo        »          pelisgratis
+      » tvseriesdk           »          ultrapeliculashd
+      » gamovideo         »          flashx
+      » danimados         ¤          arreglos internos
       [COLOR green]Gracias a [COLOR yellow]Danielr460[/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>