From ecd7d4aefb492ba2ff7e99418fe70cba3a96f60d Mon Sep 17 00:00:00 2001
From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com>
Date: Fri, 25 May 2018 15:15:53 +0200
Subject: [PATCH 01/29] pattern fix flashx

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

diff --git a/plugin.video.alfa/servers/flashx.json b/plugin.video.alfa/servers/flashx.json
index 2ad87bff..1a1972f2 100644
--- a/plugin.video.alfa/servers/flashx.json
+++ b/plugin.video.alfa/servers/flashx.json
@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "flashx.(?:tv|pw|ws|sx)/(?:embed.php\\?c=|embed-|playvid-|)([A-z0-9]+)",
+        "pattern": "flashx.(?:tv|pw|ws|sx|to)/(?:embed.php\\?c=|embed-|playvid-|)([A-z0-9]+)",
         "url": "https://www.flashx.tv/\\1.html"
       }
     ]

From 4e74641f19e6b6bff204255ab865734081a59fa4 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Sat, 26 May 2018 00:07:30 -0500
Subject: [PATCH 02/29] unshortenit: updated

---
 plugin.video.alfa/lib/unshortenit.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/lib/unshortenit.py b/plugin.video.alfa/lib/unshortenit.py
index 07141af1..a3973b87 100755
--- a/plugin.video.alfa/lib/unshortenit.py
+++ b/plugin.video.alfa/lib/unshortenit.py
@@ -28,11 +28,11 @@ def find_in_text(regex, text, flags=re.IGNORECASE | re.DOTALL):
 
 
 class UnshortenIt(object):
-    _adfly_regex = r'adf\.ly|q\.gs|j\.gs|u\.bb|ay\.gy|threadsphere\.bid|restorecosm\.bid'
+    _adfly_regex = r'adf\.ly|q\.gs|j\.gs|u\.bb|ay\.gy|threadsphere\.bid|restorecosm\.bid|clearload\.bid'
     _linkbucks_regex = r'linkbucks\.com|any\.gs|cash4links\.co|cash4files\.co|dyo\.gs|filesonthe\.net|goneviral\.com|megaline\.co|miniurls\.co|qqc\.co|seriousdeals\.net|theseblogs\.com|theseforums\.com|tinylinks\.co|tubeviral\.com|ultrafiles\.net|urlbeat\.net|whackyvidz\.com|yyv\.co'
     _adfocus_regex = r'adfoc\.us'
     _lnxlu_regex = r'lnx\.lu'
-    _shst_regex = r'sh\.st'
+    _shst_regex = r'sh\.st|gestyy\.com'
     _hrefli_regex = r'href\.li'
     _anonymz_regex = r'anonymz\.com'
     _shrink_service_regex = r'shrink-service\.it'

From e416089190eece7324effee5a53be0c399c2f3b1 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Sat, 26 May 2018 08:30:38 -0500
Subject: [PATCH 03/29] clipwatching: fix

---
 plugin.video.alfa/servers/clipwatching.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugin.video.alfa/servers/clipwatching.py b/plugin.video.alfa/servers/clipwatching.py
index a954f252..f1858955 100644
--- a/plugin.video.alfa/servers/clipwatching.py
+++ b/plugin.video.alfa/servers/clipwatching.py
@@ -17,7 +17,9 @@ def get_video_url(page_url, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
     data = httptools.downloadpage(page_url).data
     video_urls = []
-    videourl, label = scrapertools.find_single_match(data, 'file:"([^"]+).*?label:"([^"]+)')
-    video_urls.append([label + " [clipwatching]", videourl])
-
+    videos = scrapertools.find_multiple_matches(data, 'file:"([^"]+).*?label:"([^"]+)')
+    for video, label in videos:
+        video_urls.append([label + " [clipwatching]", video])
+    logger.info("Url: %s" %videos)
+    video_urls.sort(key=lambda it: int(it[0].split("p ", 1)[0]))
     return video_urls

From 5faba0d79fb9bcb0ee950d2cd20ea126232c4ffc Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Sat, 26 May 2018 08:31:12 -0500
Subject: [PATCH 04/29] clipwatching: fix

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

diff --git a/plugin.video.alfa/servers/clipwatching.json b/plugin.video.alfa/servers/clipwatching.json
index a411ac8b..8fceac73 100644
--- a/plugin.video.alfa/servers/clipwatching.json
+++ b/plugin.video.alfa/servers/clipwatching.json
@@ -9,7 +9,7 @@
       },
       {
         "pattern": "clipwatching.com/(\\w+)",
-        "url": "http://clipwatching.com/\\1.html"
+        "url": "http://clipwatching.com/embed-\\1.html"
       }
     ]
   },

From 017e3ba97629a9a291d7352ffd4bfa352d9f201d Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Sat, 26 May 2018 08:55:43 -0500
Subject: [PATCH 05/29] vidup: fix

---
 plugin.video.alfa/servers/vidup.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin.video.alfa/servers/vidup.json b/plugin.video.alfa/servers/vidup.json
index aae98f24..62ec188d 100755
--- a/plugin.video.alfa/servers/vidup.json
+++ b/plugin.video.alfa/servers/vidup.json
@@ -4,8 +4,8 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "vidup.me/(?:embed-|)([A-z0-9]+)",
-        "url": "http://vidup.me/embed-\\1.html"
+        "pattern": "vidup.(?:me|tv)/(?:embed-|)([A-z0-9]+)",
+        "url": "http://vidup.tv/embed-\\1.html"
       }
     ]
   },
@@ -39,4 +39,4 @@
     }
   ],
   "thumbnail": "http://i.imgur.com/sZvy8IC.png?1"
-}
\ No newline at end of file
+}

From e6025ae411732a82039939dfe8ecce07d79c24e5 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Sat, 26 May 2018 08:56:39 -0500
Subject: [PATCH 06/29] vidup: fix

---
 plugin.video.alfa/servers/vidup.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/plugin.video.alfa/servers/vidup.py b/plugin.video.alfa/servers/vidup.py
index 59eefc60..d6ffa53d 100755
--- a/plugin.video.alfa/servers/vidup.py
+++ b/plugin.video.alfa/servers/vidup.py
@@ -7,32 +7,25 @@ from platformcode import logger
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
-
     data = httptools.downloadpage(page_url).data
-
     if "Not Found" in data:
-        return False, "[Vidup.me] El fichero no existe o ha sido borrado"
-
+        return False, "[Vidup] El fichero no existe o ha sido borrado"
     return True, ""
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("url=" + page_url)
-
     data = httptools.downloadpage(page_url).data
-    key = scrapertools.find_single_match(data, "var mpri_Key\s*=\s*'([^']+)'")
-    data_vt = httptools.downloadpage("http://vidup.me/jwv/%s" % key).data
-    vt = scrapertools.find_single_match(data_vt, 'file\|(.*?)\|direct')
-
+    key = scrapertools.find_single_match(data, "var thief\s*=\s*'([^']+)'")
+    data_vt = httptools.downloadpage("http://vidup.tv/jwv/%s" % key).data
+    vt = scrapertools.find_single_match(data_vt, 'file\|direct\|(.*?)\|')
     # Extrae la URL
     video_urls = []
     media_urls = scrapertools.find_multiple_matches(data, '\{"file"\:"([^"]+)","label"\:"([^"]+)"\}')
     for media_url, label in media_urls:
         ext = scrapertools.get_filename_from_url(media_url)[-4:]
         media_url += "?direct=false&ua=1&vt=%s" % vt
-        video_urls.append(["%s (%s) [vidup.me]" % (ext, label), media_url])
-
+        video_urls.append(["%s (%s) [vidup]" % (ext, label), media_url])
     for video_url in video_urls:
         logger.info("%s - %s" % (video_url[0], video_url[1]))
-
     return video_urls

From 5e11c91b80ca19c47350c89cbf543b23a6ed40ea Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Sat, 26 May 2018 09:16:49 -0500
Subject: [PATCH 07/29] descargacineclasico: agregado opcion videoteca

---
 .../channels/descargacineclasico.py             | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/plugin.video.alfa/channels/descargacineclasico.py b/plugin.video.alfa/channels/descargacineclasico.py
index 88291a9d..2d52b3e8 100755
--- a/plugin.video.alfa/channels/descargacineclasico.py
+++ b/plugin.video.alfa/channels/descargacineclasico.py
@@ -2,7 +2,7 @@
 import re
 
 from channelselector import get_thumb
-from platformcode import logger
+from platformcode import logger, config
 from core import scrapertools, httptools
 from core import servertools
 from core import tmdb
@@ -86,7 +86,6 @@ def agregadas(item):
                               thumbnail=thumbnail,
                               plot=plot,
                               show=title) )
-    scrapertools.printMatches(itemlist)
     tmdb.set_infoLabels(itemlist)
     # Paginación
     try:
@@ -116,8 +115,20 @@ def findvideos(item):
         itemlist.append( item.clone(action="play",
                                     title=title,
                                     url=scrapedurl) )
-    tmdb.set_infoLabels(itemlist)
     itemlist = servertools.get_servers_itemlist(itemlist)
+    tmdb.set_infoLabels(itemlist)
+    if itemlist:
+        itemlist.append(Item(channel = item.channel))
+        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 biblioteca de KODI"
+        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, thumbnail = item.thumbnail,
+                                     contentTitle = item.contentTitle
+                                     ))
+    return itemlist
     return itemlist
 
 

From 435902fea60774c17d28ede65e13ffe7dafff8bc Mon Sep 17 00:00:00 2001
From: alaquepasa <39385022+alaquepasa@users.noreply.github.com>
Date: Sat, 26 May 2018 17:50:28 +0200
Subject: [PATCH 08/29] =?UTF-8?q?A=C3=B1adir=20opci=C3=B3n=20para=20reduir?=
 =?UTF-8?q?=20el=20item=20en=20context?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Se añade una opción que permite activar o desactivar (por defecto desactivado)
la posibilidad de generar Items con menos elementos en el método de set_context_menu.
Esto genera un speedup considerable (aprox 2x) y parece que no daña mucho las funcionalidades
actuales al realizar este filtrado.
---
 .../platformcode/platformtools.py             | 42 ++++++++++++++++++-
 .../resources/language/Spanish/strings.po     |  4 ++
 plugin.video.alfa/resources/settings.xml      |  1 +
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/platformcode/platformtools.py b/plugin.video.alfa/platformcode/platformtools.py
index 7c934e31..88866089 100644
--- a/plugin.video.alfa/platformcode/platformtools.py
+++ b/plugin.video.alfa/platformcode/platformtools.py
@@ -372,6 +372,44 @@ def set_context_commands(item, parent_item):
     else:
         context = []
 
+    if config.get_setting("faster_item_serialization"):
+        # logger.info("Reducing serialization!")
+        itemBK = item
+        item = Item()
+        item.action = itemBK.action
+        item.channel = itemBK.channel
+        infoLabels = {}
+        if itemBK.infoLabels["year"]:       infoLabels["year"]        = itemBK.infoLabels["year"]
+        if itemBK.infoLabels["imdb_id"]:    infoLabels["imdb_id"]     = itemBK.infoLabels["imdb_id"]
+        if itemBK.infoLabels["tmdb_id"]:    infoLabels["tmdb_id"]     = itemBK.infoLabels["tmdb_id"]
+        if itemBK.infoLabels["tvdb_id"]:    infoLabels["tvdb_id"]     = itemBK.infoLabels["tvdb_id"]
+        if itemBK.infoLabels["noscrap_id"]: infoLabels["noscrap_id"]  = itemBK.infoLabels["noscrap_id"]
+        if len(infoLabels) > 0:             item.infoLabels           = infoLabels
+
+        if itemBK.thumbnail:                item.thumbnail            = itemBK.thumbnail
+        if itemBK.extra:                    item.extra                = itemBK.extra
+        if itemBK.contentEpisodeNumber:     item.contentEpisodeNumber = itemBK.contentEpisodeNumber
+        if itemBK.contentEpisodeTitle:      item.contentEpisodeTitle  = itemBK.contentEpisodeTitle
+        if itemBK.contentPlot:              item.contentPlot          = itemBK.contentPlot
+        if itemBK.contentQuality:           item.contentQuality       = itemBK.contentQuality
+        if itemBK.contentSeason:            item.contentSeason        = itemBK.contentSeason
+        if itemBK.contentSerieName:         item.contentSerieName     = itemBK.contentSerieName
+        if itemBK.contentThumbnail:         item.contentThumbnail     = itemBK.contentThumbnail
+        if itemBK.contentTitle:             item.contentTitle         = itemBK.contentTitle
+        if itemBK.contentType:              item.contentType          = itemBK.contentType
+        if itemBK.duration:                 item.duration             = itemBK.duration
+        if itemBK.fulltitle:                item.fulltitle            = itemBK.fulltitle
+        if itemBK.plot:                     item.plot                 = itemBK.plot
+        if itemBK.quality:                  item.quality              = itemBK.quality
+        if itemBK.show:                     item.show                 = itemBK.show
+        if itemBK.title:                    item.title                = itemBK.title
+        if itemBK.viewcontent:              item.viewcontent          = itemBK.viewcontent
+
+    # itemJson = item.tojson()
+    # logger.info("Elemento: {0} bytes".format(len(itemJson)))
+    # logger.info(itemJson)
+    # logger.info("--------------------------------------------------------------")
+
     # Opciones segun item.context
     for command in context:
         # Predefinidos
@@ -507,14 +545,14 @@ def set_context_commands(item, parent_item):
                                                                       from_action=item.action).tourl())))
 
                 # Descargar episodio
-                if item.contentType == "episode":
+                elif item.contentType == "episode":
                     context_commands.append(("Descargar Episodio", "XBMC.RunPlugin(%s?%s)" %
                                              (sys.argv[0], item.clone(channel="downloads", action="save_download",
                                                                       from_channel=item.channel,
                                                                       from_action=item.action).tourl())))
 
                 # Descargar temporada
-                if item.contentType == "season":
+                elif item.contentType == "season":
                     context_commands.append(("Descargar Temporada", "XBMC.RunPlugin(%s?%s)" %
                                              (sys.argv[0], item.clone(channel="downloads", action="save_download",
                                                                       from_channel=item.channel,
diff --git a/plugin.video.alfa/resources/language/Spanish/strings.po b/plugin.video.alfa/resources/language/Spanish/strings.po
index bc41ec1b..38cecf4d 100644
--- a/plugin.video.alfa/resources/language/Spanish/strings.po
+++ b/plugin.video.alfa/resources/language/Spanish/strings.po
@@ -251,6 +251,10 @@ msgctxt "#30164"
 msgid "Delete this file"
 msgstr "Borrar este fichero"
 
+msgctxt "#30300"
+msgid "Faster context menus"
+msgstr "Menús contextuales rápidos (puede causar que algunas opciones no funcionen)"
+
 msgctxt "#30501"
 msgid "Paths"
 msgstr "Rutas"
diff --git a/plugin.video.alfa/resources/settings.xml b/plugin.video.alfa/resources/settings.xml
index 950bf63b..719cd5e6 100644
--- a/plugin.video.alfa/resources/settings.xml
+++ b/plugin.video.alfa/resources/settings.xml
@@ -7,6 +7,7 @@
         <setting id="channel_language" type="labelenum" values="all|cast|lat" label="30019" default="all"/>
         <setting id="trakt_sync" type="bool" label="Sincronizar con Trakt.tv (Debes tener una cuenta)" default="false"/>
         <setting id="forceview" type="bool" label="30043" default="false"/>
+        <setting id="faster_item_serialization" type="bool" label="30300" default="false"/>
         <setting id="debug" type="bool" label="30003" default="false"/>
         <setting label="Uso de servidores" type="lsep"/>
         <setting id="resolve_priority" type="enum" label="Método prioritario" values="Free primero|Premium primero|Debriders primero" default="0"/>

From ab6be85177d6d0957fa3fda3e07654e778cdb1e2 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Sat, 26 May 2018 11:59:32 -0500
Subject: [PATCH 09/29] =?UTF-8?q?allcalidad:=20cambio=20cosm=C3=A9tico?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py
index 3f1f56a7..8c607370 100755
--- a/plugin.video.alfa/channels/allcalidad.py
+++ b/plugin.video.alfa/channels/allcalidad.py
@@ -161,8 +161,8 @@ def findvideos(item):
                  title = titulo,
                  url = url
                  ))
-    tmdb.set_infoLabels(itemlist, __modo_grafico__)
     itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    tmdb.set_infoLabels(itemlist, __modo_grafico__)
     # Requerido para FilterTools
     itemlist = filtertools.get_links(itemlist, item, list_language)
 

From 9b0d3f24a0c428825e8a2dc989bf25eeda6004c9 Mon Sep 17 00:00:00 2001
From: mrgaturus <mrgaturus@gmail.com>
Date: Sat, 26 May 2018 23:59:54 -0500
Subject: [PATCH 10/29] =?UTF-8?q?Nuevos=20Canales:=20Cuevana2=20y=20Cuevan?=
 =?UTF-8?q?a2espa=C3=B1ol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/cuevana2.json      |  31 ++
 plugin.video.alfa/channels/cuevana2.py        | 290 ++++++++++++++++++
 .../channels/cuevana2espanol.json             |  29 ++
 plugin.video.alfa/channels/cuevana2espanol.py | 187 +++++++++++
 .../media/channels/thumb/cuevana2.png         | Bin 0 -> 6423 bytes
 .../media/channels/thumb/cuevana2espanol.png  | Bin 0 -> 14572 bytes
 6 files changed, 537 insertions(+)
 create mode 100644 plugin.video.alfa/channels/cuevana2.json
 create mode 100644 plugin.video.alfa/channels/cuevana2.py
 create mode 100644 plugin.video.alfa/channels/cuevana2espanol.json
 create mode 100644 plugin.video.alfa/channels/cuevana2espanol.py
 create mode 100644 plugin.video.alfa/resources/media/channels/thumb/cuevana2.png
 create mode 100644 plugin.video.alfa/resources/media/channels/thumb/cuevana2espanol.png

diff --git a/plugin.video.alfa/channels/cuevana2.json b/plugin.video.alfa/channels/cuevana2.json
new file mode 100644
index 00000000..d0c28d54
--- /dev/null
+++ b/plugin.video.alfa/channels/cuevana2.json
@@ -0,0 +1,31 @@
+{
+    "id": "cuevana2",
+    "name": "Cuevana2",
+    "active": true,
+    "adult": false,
+    "language": ["en"],
+    "thumbnail": "cuevana2.png",
+    "categories": [
+        "movie",
+        "tvshow",
+        "vos"
+    ],
+    "settings": [
+        {
+          "id": "modo_grafico",
+          "type": "bool",
+          "label": "Buscar información extra",
+          "default": true,
+          "enabled": true,
+          "visible": true
+        },
+        {
+        "id": "include_in_global_search",
+        "type": "bool",
+        "label": "Incluir en busqueda global",
+        "default": true,
+        "enabled": true,
+        "visible": true
+        }
+    ]
+}
diff --git a/plugin.video.alfa/channels/cuevana2.py b/plugin.video.alfa/channels/cuevana2.py
new file mode 100644
index 00000000..e26ed882
--- /dev/null
+++ b/plugin.video.alfa/channels/cuevana2.py
@@ -0,0 +1,290 @@
+# -*- coding: utf-8 -*-
+import re
+from channelselector import get_thumb
+
+from core.item import Item
+from core import httptools
+from core import scrapertools
+from core import servertools
+from platformcode import config, logger
+from channels import autoplay
+from lib import requests
+
+
+
+host = "http://www.cuevana2.com/"
+__channel__ = "cuevana2"
+list_quality = []
+list_servers = ['rapidvideo', 'streamango', 'directo', 'yourupload', 'openload', 'dostream']
+
+### MENUS ###
+
+def mainlist(item):
+    logger.info()
+    autoplay.init(item.channel, list_servers, list_quality)
+    itemlist = []
+    itemlist.append(Item(channel = item.channel, title = "Peliculas", action = "movies_menu", 
+        url = host + "pelicula", thumbnail = get_thumb("movies", auto = True)))
+    itemlist.append(Item(channel = item.channel, title = "Series", action = "shows_menu", 
+        url = host + "pelicula", thumbnail = get_thumb("tvshows", auto = True) ))
+    itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search", 
+        url = host + "search/", thumbnail = get_thumb("search", auto = True)))
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+def movies_menu(item):
+    itemlist = []
+
+    itemlist.append(Item(channel = item.channel, title = "Novedades", action = "movies", 
+        url = host + "pelicula", thumbnail = get_thumb("newest", auto = True)))
+    itemlist.append(Item(channel = item.channel, title = "Por género", action = "genre", 
+        url = host + "pelicula", thumbnail = get_thumb("genres", auto = True) ))
+    itemlist.append(Item(channel = item.channel, title = "Por año", action = "age", 
+        url = host + "pelicula", thumbnail = get_thumb("year", auto = True)))
+    itemlist.append(Item(channel = item.channel, title = "Favoritas", action = "movies", 
+        url = host + "peliculas-destacadas", thumbnail = get_thumb("favorites", auto = True) ))
+    itemlist.append(Item(channel = item.channel, title = ""))
+    itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search", 
+        url = host + "search/", thumbnail = get_thumb("search", auto = True)))
+
+    return itemlist
+
+def shows_menu(item):
+    itemlist = []
+    itemlist.append(Item(channel = item.channel, title = "Todas las Series", action = "shows", 
+        url = host + "listar-series", thumbnail = get_thumb("tvshows", auto = True)))
+    itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search", extra='1', 
+        url = host + "listar-series", thumbnail = get_thumb("search", auto = True)))
+    return itemlist
+
+### FIN MENUS ###
+def inArray(arr, arr2):
+    for word in arr:
+        if word not in arr2:
+            return False
+
+    return True
+
+def load_data(url):
+    data = httptools.downloadpage(url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+
+    return data
+
+def put_movies(itemlist, data, pattern):
+    matches = scrapertools.find_multiple_matches(data, pattern)
+    for link, img, title, rating, plot in matches:
+        if 'pelicula' in link:
+            itemTitle = "%s [COLOR yellow](%s/100)[/COLOR]" % (title, rating)
+            itemlist.append(Item(channel = __channel__, title=itemTitle, fulltitle=title, thumbnail=img, 
+                url=link, plot=plot, action="findvideos"))
+            logger.info(link)
+
+    return itemlist
+
+def put_episodes(itemlist, item, text):
+    pattern = '<li>.*?ref="([^"]+).*?"tit">(.*?)</span>'
+
+    matches = scrapertools.find_multiple_matches(text, pattern)
+    for link, title in matches:
+        itemlist.append(item.clone(title=title, fulltitle=item.title, url=link, action='findvideos', extra=1))
+
+def episodes(item):
+    logger.info()
+    itemlist = []
+
+    data = load_data(item.url)
+    seasonsPattern = '"#episodios(\d+)".*?>(.*?)</a>'
+    episodesPattern = 'id="episodios%s">(.*?)</ul>'
+
+    matches = scrapertools.find_multiple_matches(data, seasonsPattern)
+    for season, title in matches:
+        itemlist.append(Item(channel = __channel__, title="[COLOR blue]%s[/COLOR]" % title))
+        episodeMatches = scrapertools.find_single_match(data, episodesPattern % season)
+        put_episodes(itemlist, item, episodeMatches)
+
+    return itemlist
+
+def shows(item):
+    logger.info()
+    itemlist = []
+
+    data = load_data(item.url)
+    pattern = '"in"><a href="([^"]+)">(.*?)</a>'
+
+    matches = scrapertools.find_multiple_matches(data, pattern)
+    for link, title in matches:
+        itemlist.append(Item(channel = __channel__, title=title, url=host + link, action="episodes"))
+
+    return itemlist
+
+def movies(item):
+    logger.info()
+    itemlist = []
+
+    #descarga la pagina html
+    data = load_data(item.url)
+
+    #patron para buscar las peliculas
+    pattern = '<a href="([^"]+)"><div class="img">' #link
+    pattern += '<img width="120" height="160" src="([^"]+)" class="attachment-thumbnail wp-post-image" alt="([^"]+)".*?' #img and title
+    pattern += '<span style="width:([0-9]+)%">.*?'
+    pattern += '"txt">(.*?)</div>' # text
+
+    put_movies(itemlist, data, pattern)
+
+    next_page = scrapertools.find_single_match(data, '<a class="nextpostslink" rel="next" href="([^"]+)">')
+    if next_page:
+        itemlist.append(Item(channel = __channel__, title='Siguiente Pagina', url=next_page, action="movies"))
+
+    #coloca las peliculas encontradas en la lista
+    return itemlist
+
+def searchShows(itemlist, item, texto):
+    texto = texto.lower().split()
+    data = load_data(item.url)
+
+    pattern = '"in"><a href="([^"]+)">(.*?)</a>'
+
+    matches = scrapertools.find_multiple_matches(data, pattern)
+    for link, title in matches:
+        keywords = title.lower().split()
+        logger.info(keywords)
+        logger.info(texto)
+
+        if inArray(texto, keywords):
+            itemlist.append(Item(channel = __channel__, title=title, url=host + link, action="episodes"))
+
+
+def searchMovies(itemlist, item, texto):
+    texto = texto.replace(' ', '+').lower()
+    data = load_data(item.url + texto)
+    #patron para buscar las peliculas
+    pattern = '<a href="([^"]+)"><div class="img">' #link
+    pattern += '<img width="120" height="160" src="([^"]+)" class="attachment-thumbnail wp-post-image" alt="([^"]+)".*?' #img and title
+    pattern += '<span style="width:([0-9]+)%">.*?'
+    pattern += '"txt">(.*?)</div>' # text
+
+    #coloca las peliculas encontradas en la lista, improvisando do while
+    next_page = True
+    while next_page:
+        put_movies(itemlist, data, pattern)
+        next_page = scrapertools.find_single_match(data, '<a class="nextpostslink" rel="next" href="([^"]+)">')
+
+        if next_page:
+            data = load_data(next_page)
+
+def search(item, texto):
+    itemlist = []
+
+    if item.extra:
+        searchShows(itemlist, item, texto)
+    else:
+        searchMovies(itemlist, item, texto)
+
+    return itemlist
+
+def by(item, pattern):
+    logger.info()
+    itemlist = []
+
+    #descarga la pagina html
+    data = load_data(item.url)
+
+    #patron para buscar en la pagina
+    pattern = '<li class="cat-item cat-item-\d+"><a href="([^"]+)" >&&</a>'.replace('&&', pattern)
+
+    matches = scrapertools.find_multiple_matches(data, pattern)
+    for link, genre in matches:
+        itemlist.append(Item(channel = __channel__, title=genre, url=link, action="movies"))
+
+    return itemlist
+
+def genre(item):
+    return by(item, '(\D+)')
+
+def age(item):
+    return by(item, '(\d+)')
+
+def GKPluginLink(hash):
+    re = requests.post('https://player4.cuevana2.com/plugins/gkpluginsphp.php', dict(link=hash))
+
+    return re.json()['link'] if re.content else ''
+
+#el pattern esta raro para eliminar los duplicados, de todas formas asi es un lenguaje de programacion verificando su sintaxis
+def getContentMovie(data, item):
+    item.infoLabels["year"] = scrapertools.find_single_match(data, 'rel="tag">(\d+)</a>')
+    genre = ''
+    for found_genre in scrapertools.find_multiple_matches(data, 'genero/.*?">(.*?)</a>(?=.*?</p>)'):
+        genre += found_genre + ', '
+    item.infoLabels["genre"] = genre.strip(', ')
+
+    director = ''
+    for found_director in scrapertools.find_multiple_matches(data, 'director/.*?">(.*?)</a>(?=.*?</p>)'):
+        director += found_director + ', '
+    item.infoLabels["director"] = director.strip(', ')
+
+    item.infoLabels["cast"] = tuple(found_cast for found_cast in scrapertools.find_multiple_matches(
+        data, 'reparto/.*?">(.*?)</a>(?=.*?</p>)'))
+
+def getContentShow(data, item):
+    item.thumbnail = scrapertools.find_single_match(data, 'width="120" height="160" src="([^"]+)"')
+    item.infoLabels['genre'] = scrapertools.find_single_match(data, '-4px;">(.*?)</div>')
+
+def findvideos(item):
+    logger.info()
+    itemlist = []
+
+    data = load_data(item.url)
+    if item.extra:
+        getContentShow(data, item)
+    else:
+        getContentMovie(data, item)
+    pattern = '<iframe width="650" height="450" scrolling="no" src="([^"]+)'
+    subtitles = scrapertools.find_single_match(data, '<iframe width="650" height="450" scrolling="no" src=".*?sub=([^"]+)"')
+
+    #itemlist.append(Item(channel = __channel__, title=item.url))
+    for link in scrapertools.find_multiple_matches(data, pattern):
+        #php.*?=(\w+)&
+        #url=(.*?)&
+        if 'player4' in link:
+            if r'ir.php' in link:
+                link = scrapertools.find_single_match(link, 'php\?url=(.*?)&').replace('%3A', ':').replace('%2F', '/')
+                logger.info("CUEVANA IR %s" % link)
+            elif r'gdv.php' in link:
+                # google drive hace lento la busqueda de links, ademas no es tan buena opcion y es el primero que eliminan
+                continue
+            else:
+                link = scrapertools.find_single_match(link, 'php.*?=(\w+)&')
+                link = GKPluginLink(link)
+                if not link:
+                    continue
+            
+            title = "[COLOR blue]Servidor [%s][/COLOR]"
+        elif 'youtube' in link:
+            title = "[COLOR yellow]Ver Trailer (%s)[/COLOR]"
+        else: # En caso de que exista otra cosa no implementada, reportar si no aparece pelicula
+            continue
+
+        # GKplugin puede devolver multiples links con diferentes calidades, si se pudiera colocar una lista de opciones
+        # personalizadas para Directo, se agradece, por ahora solo devuelve el primero que encuentre
+        if type(link) is list:
+            link = link[0]['link']
+
+        itemlist.append(
+            item.clone(
+                channel = item.channel, 
+                title=title, 
+                url=link, action='play', 
+                subtitle=subtitles))
+
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    autoplay.start(itemlist, item)
+
+    if config.get_videolibrary_support() and len(itemlist):
+                itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
+                                     action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
+                                     fulltitle = item.fulltitle
+                                     ))
+    return itemlist
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/cuevana2espanol.json b/plugin.video.alfa/channels/cuevana2espanol.json
new file mode 100644
index 00000000..bbf397e3
--- /dev/null
+++ b/plugin.video.alfa/channels/cuevana2espanol.json
@@ -0,0 +1,29 @@
+{
+    "id": "cuevana2espanol",
+    "name": "Cuevana2español",
+    "active": true,
+    "adult": false,
+    "language": ["lat"],
+    "thumbnail": "cuevana2espanol.png",
+    "categories": [
+        "movie"
+    ],
+    "settings": [
+        {
+          "id": "modo_grafico",
+          "type": "bool",
+          "label": "Buscar información extra",
+          "default": true,
+          "enabled": true,
+          "visible": true
+        },
+        {
+        "id": "include_in_global_search",
+        "type": "bool",
+        "label": "Incluir en busqueda global",
+        "default": true,
+        "enabled": true,
+        "visible": true
+        }
+    ]
+}
diff --git a/plugin.video.alfa/channels/cuevana2espanol.py b/plugin.video.alfa/channels/cuevana2espanol.py
new file mode 100644
index 00000000..b55440fd
--- /dev/null
+++ b/plugin.video.alfa/channels/cuevana2espanol.py
@@ -0,0 +1,187 @@
+# -*- coding: utf-8 -*-
+import re
+from channelselector import get_thumb
+
+from core.item import Item
+from core import httptools
+from core import scrapertools
+from core import servertools
+from platformcode import config, logger
+from channels import autoplay
+from lib import requests
+
+
+
+host = "http://cuevana2espanol.com/"
+__channel__ = "cuevana2espanol"
+list_quality = []
+list_servers = ['rapidvideo', 'streamango', 'directo', 'yourupload', 'openload', 'dostream']
+
+def load_data(url):
+    data = httptools.downloadpage(url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+
+    return data
+
+def mainlist(item):
+    itemlist = []
+    
+    autoplay.init(item.channel, list_servers, list_quality)
+    itemlist.append(Item(channel = item.channel, title = "Novedades", action = "movies", 
+        url = host + "ver-pelicula-online", thumbnail = get_thumb("newest", auto = True)))
+    itemlist.append(Item(channel = item.channel, title = "Favoritas", action = "movies", 
+        url = host + "calificaciones", thumbnail = get_thumb("favorites", auto = True) ))
+    itemlist.append(Item(channel = item.channel, title = "Destacadas", action = "movies", 
+        url = host + "tendencias", thumbnail = get_thumb("hot", auto = True)))
+    itemlist.append(Item(channel = item.channel, title = "Ranking IMDB", action = "moviesIMDB", 
+        url = host + "raking-imdb", thumbnail = get_thumb("hot", auto = True) ))
+    itemlist.append(Item(channel = item.channel, title = ""))
+    itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search", 
+        url = host + "?s=", thumbnail = get_thumb("search", auto = True)))
+
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+def movies(item):
+    itemlist = []
+
+    data = load_data(item.url)
+    pattern = 'class="poster"><img src="([^"]+)" alt="([^"]+)".*?'
+    pattern += '</span> (.*?)</div>.*?'
+    pattern += 'href="([^"]+)".*?'
+    pattern += '<span>(\d+)</span>.*?'
+
+    matches = scrapertools.find_multiple_matches(data, pattern)
+    for img, title, ranking, link, age in matches:
+        itemTitle = "%s [COLOR yellow](%s)[/COLOR] [COLOR blue](%s)[/COLOR]" % (title, ranking, age)
+        itemlist.append(Item(channel = __channel__, title=itemTitle, fulltitle=title, thumbnail=img, 
+            url=link, action="findvideos"))
+
+    next_page = scrapertools.find_single_match(data, 'href="([^"]+)" ><span class="icon-chevron-right">')
+    if next_page:
+        itemlist.append(Item(channel = __channel__, title="Siguiente Pagina", 
+            url=next_page, action="movies"))
+
+    return itemlist
+
+def moviesIMDB(item):
+    itemlist = []
+
+    data = load_data(item.url)
+    pattern = '"poster"><a href="([^"]+)"><img src="([^"]+)".*?'
+    pattern += 'class="puesto">(\d+)</div>.*?'
+    pattern += '"rating">(.*?)</div>.*?'
+    pattern += '"title">.*?>(.*?)</a>'
+
+    matches = scrapertools.find_multiple_matches(data, pattern)
+    for link, img, rank, rating, title in matches:
+        itemTitle = "%s [COLOR blue](#%s)[/COLOR] [COLOR yellow](%s)[/COLOR]" % (title, rank, rating)
+        img = img.replace('-90x135', '')
+
+        itemlist.append(Item(channel = __channel__, title=itemTitle, fulltitle=title, thumbnail=img, 
+            url=link, action="findvideos"))
+
+    return itemlist
+
+def searchMovies(item):
+    itemlist = []
+
+    data = load_data(item.url)
+    pattern = 'class="image">.*?href="([^"]+)".*?'
+    pattern += 'src="([^"]+)" alt="([^"]+)".*?'
+    pattern += 'class="year">(\d+)</span>.*?'
+    pattern += '<p>(.*?)</p>'
+
+    matches = scrapertools.find_multiple_matches(data, pattern)
+    for link, img, title, year, plot in matches:
+        itemTitle = "%s [COLOR blue](%s)[/COLOR]" % (title, year)
+
+        itemlist.append(Item(channel = __channel__, title=itemTitle, fulltitle=title, thumbnail=img,
+            url=link, plot=plot, action="findvideos"))
+
+    next_page = scrapertools.find_single_match(data, 'href="([^"]+)" ><span class="icon-chevron-right">')
+    if next_page:
+        itemlist.append(Item(channel = __channel__, title="Siguiente Pagina", 
+            url=next_page, action="searchMovies"))
+
+    return itemlist
+
+def search(item, text):
+    text = text.lower().replace(' ', '+')
+    item.url += text
+
+    return searchMovies(item)
+
+def GKPluginLink(hash):
+    re = requests.post('https://player4.cuevana2.com/plugins/gkpluginsphp.php', dict(link=hash))
+
+    return re.json()['link'] if re.content else ''
+
+def getContent(item, data):
+    item.infoLabels["year"] = scrapertools.find_single_match(data, 'class="date">.*?(\d+)</span>')
+    item.plot = scrapertools.find_single_match(data, 'class="wp-content"><p>(.*?)</p>')
+    genres = ''
+    for genre in scrapertools.find_multiple_matches(data, '/genero/.*?"tag">(.*?)</a>'):
+        genres += genre + ', '
+
+    item.infoLabels['genre'] = genres.strip(', ')
+
+def findvideos(item):
+    logger.info()
+    itemlist = []
+
+    data = load_data(item.url)
+    getContent(item, data)
+    """
+    if item.extra:
+        getContentShow(data, item)
+    else:
+        getContentMovie(data, item)
+    """
+    pattern = '<iframe class="metaframe rptss" src="([^"]+)"'
+
+    #itemlist.append(Item(channel = __channel__, title=item.url))
+    for link in scrapertools.find_multiple_matches(data, pattern):
+        #php.*?=(\w+)&
+        #url=(.*?)&
+        if 'player4' in link:
+            logger.info("CUEVANA LINK %s" % link)
+            if r'ir.php' in link:
+                link = scrapertools.find_single_match(link, 'php.*?=(.*)').replace('%3A', ':').replace('%2F', '/')
+                logger.info("CUEVANA IR %s" % link)
+            elif r'gdv.php' in link:
+                # google drive hace lento la busqueda de links, ademas no es tan buena opcion y es el primero que eliminan
+                continue
+            else:
+                link = scrapertools.find_single_match(link, 'php.*?=(\w+)')
+                link = GKPluginLink(link)
+                if not link:
+                    continue
+            
+            title = "[COLOR blue]Servidor [%s][/COLOR]"
+        elif 'youtube' in link:
+            title = "[COLOR yellow]Ver Trailer (%s)[/COLOR]"
+        else: # En caso de que exista otra cosa no implementada, reportar si no aparece pelicula
+            continue
+
+        # GKplugin puede devolver multiples links con diferentes calidades, si se pudiera colocar una lista de opciones
+        # personalizadas para Directo, se agradece, por ahora solo devuelve el primero que encuentre
+        if type(link) is list:
+            link = link[0]['link']
+
+        itemlist.append(
+            item.clone(
+                channel = item.channel, 
+                title=title, 
+                url=link, action='play'))
+
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    autoplay.start(itemlist, item)
+
+    if config.get_videolibrary_support() and len(itemlist):
+                itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
+                                     action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
+                                     fulltitle = item.fulltitle
+                                     ))
+    return itemlist
diff --git a/plugin.video.alfa/resources/media/channels/thumb/cuevana2.png b/plugin.video.alfa/resources/media/channels/thumb/cuevana2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a3f320b6964499cd4d0ee5e51b73a3c4ac90940
GIT binary patch
literal 6423
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
Wsfd$t$bkP>Ky)+>H2zkziTn?5*nkuO

literal 0
HcmV?d00001

diff --git a/plugin.video.alfa/resources/media/channels/thumb/cuevana2espanol.png b/plugin.video.alfa/resources/media/channels/thumb/cuevana2espanol.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb4b14b51bf734bc18f57dc8613041ed20ba1706
GIT binary patch
literal 14572
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

literal 0
HcmV?d00001


From 3fe4f99e402f18d919b22d2de3b9b25fde52990a Mon Sep 17 00:00:00 2001
From: Alex <axlt2002@yahoo.it>
Date: Sun, 27 May 2018 19:53:55 +0200
Subject: [PATCH 11/29] Add files via upload

---
 plugin.video.alfa/channels/videolibrary.json | 24 +++++++++++++++++++-
 plugin.video.alfa/channels/videolibrary.py   |  7 +++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/channels/videolibrary.json b/plugin.video.alfa/channels/videolibrary.json
index b2c541da..e0caf59c 100755
--- a/plugin.video.alfa/channels/videolibrary.json
+++ b/plugin.video.alfa/channels/videolibrary.json
@@ -70,11 +70,33 @@
         "Toda la videoteca"
       ]
     },
+    {
+      "id": "addition",
+      "type": "label",
+      "label": "Añadir a la videoteca",
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "enable_filter",
+      "type": "bool",
+      "label": "    Excluir los streams que contienen etiquetas específicas",
+      "enabled": true,
+      "visible": true,
+      "default": false
+    },
+    {
+      "id": "filters",
+      "type": "text",
+      "label": "    Etiquetas",
+      "visible": true,
+      "enabled": "eq(-1,true)"
+    },
     {
       "id": "window_type",
       "type": "list",
       "label": "Mostrar los enlaces en",
-      "default": 0,
+      "default": 1,
       "enabled": true,
       "visible": true,
       "lvalues": [
diff --git a/plugin.video.alfa/channels/videolibrary.py b/plugin.video.alfa/channels/videolibrary.py
index c173eb0c..2374362b 100644
--- a/plugin.video.alfa/channels/videolibrary.py
+++ b/plugin.video.alfa/channels/videolibrary.py
@@ -596,7 +596,12 @@ def mark_tvshow_as_updatable(item):
 
 def delete(item):
     def delete_all(_item):
-        filetools.rmdirtree(_item.path)
+        for file in filetools.listdir(_item.path):
+            if file.endswith(".strm") or file.endswith(".nfo") or file.endswith(".json"):
+                filetools.remove(filetools.join(_item.path, file))
+        raiz, carpeta_serie, ficheros = filetools.walk(_item.path).next()
+        if ficheros == []:
+            filetools.rmdir(_item.path)
 
         if config.is_xbmc():
             import xbmc

From 5e49b8b6e1042ce2f2eaba67e8e61187727e6faa Mon Sep 17 00:00:00 2001
From: Alex <axlt2002@yahoo.it>
Date: Sun, 27 May 2018 19:54:52 +0200
Subject: [PATCH 12/29] Add files via upload

---
 plugin.video.alfa/core/scraper.py           |  1 +
 plugin.video.alfa/core/scrapertools.py      |  6 +++---
 plugin.video.alfa/core/videolibrarytools.py | 20 ++++++++++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/plugin.video.alfa/core/scraper.py b/plugin.video.alfa/core/scraper.py
index 1dcef673..897270f3 100755
--- a/plugin.video.alfa/core/scraper.py
+++ b/plugin.video.alfa/core/scraper.py
@@ -263,6 +263,7 @@ def get_nfo(item):
 
 
 def sort_episode_list(episodelist):
+    episodelist.sort(key=lambda e: e.title, reverse=True)
     scraper_actual = ['tmdb', 'tvdb'][config.get_setting("scraper_tvshows", "videolibrary")]
 
     if scraper_actual == "tmdb":
diff --git a/plugin.video.alfa/core/scrapertools.py b/plugin.video.alfa/core/scrapertools.py
index 5682ae82..faa20dde 100755
--- a/plugin.video.alfa/core/scrapertools.py
+++ b/plugin.video.alfa/core/scrapertools.py
@@ -458,14 +458,14 @@ def get_season_and_episode(title):
     """
     filename = ""
 
-    patrons = ["(\d+)x(\d+)", "(\d+)×(\d+)", "(?:s|t)(\d+)e(\d+)",
-               "(?:season|temp\w*)\s*(\d+)\s*(?:capitulo|epi\w*)\s*(\d+)"]
+    patrons = ["(\d+)\s*[x-]\s*(\d+)", "(\d+)\s*×\s*(\d+)", "(?:s|t)(\d+)e(\d+)",
+               "(?:season|temp\w*)\s*(\d+)\s*(?:capitulo|epi|episode\w*)\s*(\d+)"]
 
     for patron in patrons:
         try:
             matches = re.compile(patron, re.I).search(title)
             if matches:
-                filename = matches.group(1) + "x" + matches.group(2).zfill(2)
+                filename = matches.group(1).lstrip('0') + "x" + matches.group(2).zfill(2)
                 break
         except:
             pass
diff --git a/plugin.video.alfa/core/videolibrarytools.py b/plugin.video.alfa/core/videolibrarytools.py
index 2fcae901..eae0b8e7 100644
--- a/plugin.video.alfa/core/videolibrarytools.py
+++ b/plugin.video.alfa/core/videolibrarytools.py
@@ -123,7 +123,7 @@ def save_movie(item):
     else:
         base_name = item.contentTitle
 
-    base_name = unicode(filetools.validate_path(base_name.replace('/', '-')), "utf8").lower().encode("utf8")
+    base_name = unicode(filetools.validate_path(base_name.replace('/', '-')), "utf8").encode("utf8")
 
     for raiz, subcarpetas, ficheros in filetools.walk(MOVIES_PATH):
         for c in subcarpetas:
@@ -244,7 +244,7 @@ def save_tvshow(item, episodelist):
     else:
         base_name = item.contentSerieName
 
-    base_name = unicode(filetools.validate_path(base_name.replace('/', '-')), "utf8").lower().encode("utf8")
+    base_name = unicode(filetools.validate_path(base_name.replace('/', '-')), "utf8").encode("utf8")
 
     for raiz, subcarpetas, ficheros in filetools.walk(TVSHOWS_PATH):
         for c in subcarpetas:
@@ -348,6 +348,15 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
     raiz, carpetas_series, ficheros = filetools.walk(path).next()
     ficheros = [filetools.join(path, f) for f in ficheros]
 
+    nostrm_episodelist = []
+    for root, folders, files in filetools.walk(path):
+        for file in files:
+            season_episode = scrapertools.get_season_and_episode(file)
+            if season_episode == "" or filetools.exists(filetools.join(path, "%s.strm" % season_episode)):
+                continue
+            nostrm_episodelist.append(season_episode)
+    nostrm_episodelist = sorted(set(nostrm_episodelist))
+
     # Silent es para no mostrar progreso (para videolibrary_service)
     if not silent:
         # progress dialog
@@ -356,7 +365,12 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
 
     new_episodelist = []
     # Obtenemos el numero de temporada y episodio y descartamos los q no lo sean
+    tags = []
+    if config.get_setting("enable_filter", "videolibrary"):
+        tags = [x.strip() for x in config.get_setting("filters", "videolibrary").lower().split(",")]
     for e in episodelist:
+        if tags != [] and tags != None and any(tag in e.title.lower() for tag in tags):
+            continue
         try:
             season_episode = scrapertools.get_season_and_episode(e.title)
 
@@ -383,6 +397,8 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
         nfo_path = filetools.join(path, "%s.nfo" % season_episode)
         json_path = filetools.join(path, ("%s [%s].json" % (season_episode, e.channel)).lower())
 
+        if season_episode in nostrm_episodelist:
+            continue
         strm_exists = strm_path in ficheros
         nfo_exists = nfo_path in ficheros
         json_exists = json_path in ficheros

From 1afe4b750d6e97cb37a779ded34a9f3333dd5c42 Mon Sep 17 00:00:00 2001
From: Alex <axlt2002@yahoo.it>
Date: Sun, 27 May 2018 19:55:48 +0200
Subject: [PATCH 13/29] Add files via upload

---
 plugin.video.alfa/platformcode/config.py      |   7 +-
 plugin.video.alfa/platformcode/launcher.py    |   4 +-
 .../platformcode/xbmc_videolibrary.py         | 222 ++++++++++--------
 3 files changed, 124 insertions(+), 109 deletions(-)

diff --git a/plugin.video.alfa/platformcode/config.py b/plugin.video.alfa/platformcode/config.py
index 2ca5f15f..ac49a136 100644
--- a/plugin.video.alfa/platformcode/config.py
+++ b/plugin.video.alfa/platformcode/config.py
@@ -352,7 +352,6 @@ def verify_directories_created():
     config_paths = [["folder_movies", "CINE"],
                     ["folder_tvshows", "SERIES"]]
 
-    flag_call = True
     for path, default in config_paths:
         saved_path = get_setting(path)
 
@@ -365,11 +364,7 @@ def verify_directories_created():
             logger.debug("Creating %s: %s" % (path, content_path))
 
             # si se crea el directorio
-            if filetools.mkdir(content_path):
-                if flag_call:
-                    # le pasamos el valor para que sepamos que se ha pasado por creación de directorio
-                    xbmc_videolibrary.ask_set_content(1)
-                    flag_call = False
+            filetools.mkdir(content_path)
 
     try:
         from core import scrapertools
diff --git a/plugin.video.alfa/platformcode/launcher.py b/plugin.video.alfa/platformcode/launcher.py
index cc62f933..c775d746 100644
--- a/plugin.video.alfa/platformcode/launcher.py
+++ b/plugin.video.alfa/platformcode/launcher.py
@@ -52,8 +52,8 @@ def run(item=None):
             else:
                 item = Item(channel="channelselector", action="getmainlist", viewmode="movie")
         if not config.get_setting('show_once'):
-            platformtools.dialog_ok('Alfa', 'Alfa recomienda para mejorar tu experiencia:',
-                                    'Palomitas, relajate y disfruta.')
+            from platformcode import xbmc_videolibrary
+            xbmc_videolibrary.ask_set_content(1)
             config.set_setting('show_once', True)
 
     logger.info(item.tostring())
diff --git a/plugin.video.alfa/platformcode/xbmc_videolibrary.py b/plugin.video.alfa/platformcode/xbmc_videolibrary.py
index 8650dc70..38358fdb 100755
--- a/plugin.video.alfa/platformcode/xbmc_videolibrary.py
+++ b/plugin.video.alfa/platformcode/xbmc_videolibrary.py
@@ -440,102 +440,115 @@ def set_content(content_type, silent=False):
     videolibrarypath = config.get_setting("videolibrarypath")
 
     if content_type == 'movie':
-        if not xbmc.getCondVisibility('System.HasAddon(metadata.themoviedb.org)'):
-            if not silent:
-                # Preguntar si queremos instalar metadata.themoviedb.org
-                install = platformtools.dialog_yesno("The Movie Database",
-                                                     "No se ha encontrado el Scraper de películas de TheMovieDB.",
-                                                     "¿Desea instalarlo ahora?")
-            else:
-                install = True
+        scraper = ["The Movie Database", "Universal Movie Scraper"]
+        seleccion = platformtools.dialog_select("Seleccione el scraper para las películas", scraper)
 
-            if install:
-                try:
-                    # Instalar metadata.themoviedb.org
-                    xbmc.executebuiltin('xbmc.installaddon(metadata.themoviedb.org)', True)
-                    logger.info("Instalado el Scraper de películas de TheMovieDB")
-                except:
-                    pass
+        # Instalar The Movie Database
+        if seleccion == -1 or seleccion == 0:
+            if not xbmc.getCondVisibility('System.HasAddon(metadata.themoviedb.org)'):
+                if not silent:
+                    # Preguntar si queremos instalar metadata.themoviedb.org
+                    install = platformtools.dialog_yesno("The Movie Database",
+                                                         "No se ha encontrado el Scraper de películas de TheMovieDB.",
+                                                         "¿Desea instalarlo ahora?")
+                else:
+                    install = True
 
-            continuar = (install and xbmc.getCondVisibility('System.HasAddon(metadata.themoviedb.org)'))
-            if not continuar:
-                msg_text = "The Movie Database no instalado."
+                if install:
+                    try:
+                        # Instalar metadata.themoviedb.org
+                        xbmc.executebuiltin('xbmc.installaddon(metadata.themoviedb.org)', True)
+                        logger.info("Instalado el Scraper de películas de TheMovieDB")
+                    except:
+                        pass
+
+                continuar = (install and xbmc.getCondVisibility('System.HasAddon(metadata.themoviedb.org)'))
+                if not continuar:
+                    msg_text = "The Movie Database no instalado."
+            if continuar:
+                xbmc.executebuiltin('xbmc.addon.opensettings(metadata.themoviedb.org)', True)
+
+        # Instalar Universal Movie Scraper
+        elif seleccion == 1:
+            if continuar and not xbmc.getCondVisibility('System.HasAddon(metadata.universal)'):
+                continuar = False
+                if not silent:
+                    # Preguntar si queremos instalar metadata.universal
+                    install = platformtools.dialog_yesno("Universal Movie Scraper",
+                                                         "No se ha encontrado el Scraper de series de TheMovieDB.",
+                                                         "¿Desea instalarlo ahora?")
+                else:
+                    install = True
+
+                if install:
+                    try:
+                        xbmc.executebuiltin('xbmc.installaddon(metadata.universal)', True)
+                        if xbmc.getCondVisibility('System.HasAddon(metadata.universal)'):
+                            continuar = True
+                    except:
+                        pass
+
+                continuar = (install and continuar)
+                if not continuar:
+                    msg_text = "Universal Movie Scraper no instalado."
+            if continuar:
+                xbmc.executebuiltin('xbmc.addon.opensettings(metadata.universal)', True)
 
     else:  # SERIES
+        scraper = ["The TVDB", "The Movie Database"]
+        seleccion = platformtools.dialog_select("Seleccione el scraper para las series", scraper)
+
         # Instalar The TVDB
-        if not xbmc.getCondVisibility('System.HasAddon(metadata.tvdb.com)'):
-            if not silent:
-                # Preguntar si queremos instalar metadata.tvdb.com
-                install = platformtools.dialog_yesno("The TVDB",
-                                                     "No se ha encontrado el Scraper de series de The TVDB.",
-                                                     "¿Desea instalarlo ahora?")
-            else:
-                install = True
+        if seleccion == -1 or seleccion == 0:
+            if not xbmc.getCondVisibility('System.HasAddon(metadata.tvdb.com)'):
+                if not silent:
+                    # Preguntar si queremos instalar metadata.tvdb.com
+                    install = platformtools.dialog_yesno("The TVDB",
+                                                         "No se ha encontrado el Scraper de series de The TVDB.",
+                                                         "¿Desea instalarlo ahora?")
+                else:
+                    install = True
 
-            if install:
-                try:
-                    # Instalar metadata.tvdb.com
-                    xbmc.executebuiltin('xbmc.installaddon(metadata.tvdb.com)', True)
-                    logger.info("Instalado el Scraper de series de The TVDB")
-                except:
-                    pass
+                if install:
+                    try:
+                        # Instalar metadata.tvdb.com
+                        xbmc.executebuiltin('xbmc.installaddon(metadata.tvdb.com)', True)
+                        logger.info("Instalado el Scraper de series de The TVDB")
+                    except:
+                        pass
 
-            continuar = (install and xbmc.getCondVisibility('System.HasAddon(metadata.tvdb.com)'))
-            if not continuar:
-                msg_text = "The TVDB no instalado."
+                continuar = (install and xbmc.getCondVisibility('System.HasAddon(metadata.tvdb.com)'))
+                if not continuar:
+                    msg_text = "The TVDB no instalado."
+            if continuar:
+                xbmc.executebuiltin('xbmc.addon.opensettings(metadata.tvdb.com)', True)
 
-        # Instalar TheMovieDB
-        if continuar and not xbmc.getCondVisibility('System.HasAddon(metadata.tvshows.themoviedb.org)'):
-            continuar = False
-            if not silent:
-                # Preguntar si queremos instalar metadata.tvshows.themoviedb.org
-                install = platformtools.dialog_yesno("The Movie Database",
-                                                     "No se ha encontrado el Scraper de series de TheMovieDB.",
-                                                     "¿Desea instalarlo ahora?")
-            else:
-                install = True
+        # Instalar The Movie Database
+        elif seleccion == 1:
+            if continuar and not xbmc.getCondVisibility('System.HasAddon(metadata.tvshows.themoviedb.org)'):
+                continuar = False
+                if not silent:
+                    # Preguntar si queremos instalar metadata.tvshows.themoviedb.org
+                    install = platformtools.dialog_yesno("The Movie Database",
+                                                         "No se ha encontrado el Scraper de series de TheMovieDB.",
+                                                         "¿Desea instalarlo ahora?")
+                else:
+                    install = True
 
-            if install:
-                try:
-                    # Instalar metadata.tvshows.themoviedb.org
-                    # 1º Probar desde el repositorio ...
-                    xbmc.executebuiltin('xbmc.installaddon(metadata.tvshows.themoviedb.org)', True)
-                    if not xbmc.getCondVisibility('System.HasAddon(metadata.tvshows.themoviedb.org)'):
-                        # ...si no funciona descargar e instalar desde la web
-                        url = "http://mirrors.kodi.tv/addons/jarvis/metadata.tvshows.themoviedb.org/metadata.tvshows.themoviedb.org-1.3.1.zip"
-                        path_down = xbmc.translatePath(
-                            "special://home/addons/packages/metadata.tvshows.themoviedb.org-1.3.1.zip")
-                        path_unzip = xbmc.translatePath("special://home/addons/")
-                        header = ("User-Agent",
-                                  "Kodi/15.2 (Windows NT 10.0; WOW64) App_Bitness/32 Version/15.2-Git:20151019-02e7013")
+                if install:
+                    try:
+                        # Instalar metadata.tvshows.themoviedb.org
+                        xbmc.executebuiltin('xbmc.installaddon(metadata.tvshows.themoviedb.org)', True)
+                        if xbmc.getCondVisibility('System.HasAddon(metadata.tvshows.themoviedb.org)'):
+                            continuar = True
+                    except:
+                        pass
 
-                        from core import downloadtools
-                        from core import ziptools
-
-                        downloadtools.downloadfile(url, path_down, continuar=True, headers=[header])
-                        unzipper = ziptools.ziptools()
-                        unzipper.extract(path_down, path_unzip)
-                        xbmc.executebuiltin('UpdateLocalAddons')
-
-                    strSettings = '<settings>\n' \
-                                  '    <setting id="fanart" value="true" />\n' \
-                                  '    <setting id="keeporiginaltitle" value="false" />\n' \
-                                  '    <setting id="language" value="es" />\n' \
-                                  '</settings>'
-                    path_settings = xbmc.translatePath(
-                        "special://profile/addon_data/metadata.tvshows.themoviedb.org/settings.xml")
-                    tv_themoviedb_addon_path = filetools.dirname(path_settings)
-                    if not filetools.exists(tv_themoviedb_addon_path):
-                        filetools.mkdir(tv_themoviedb_addon_path)
-                    if filetools.write(path_settings, strSettings):
-                        continuar = True
-
-                except:
-                    pass
-
-            continuar = (install and continuar)
-            if not continuar:
-                msg_text = "The Movie Database no instalado."
+                continuar = (install and continuar)
+                if not continuar:
+                    msg_text = "The Movie Database no instalado."
+            if continuar:
+                xbmc.executebuiltin('xbmc.addon.opensettings(metadata.tvshows.themoviedb.org)', True)
 
     idPath = 0
     idParentPath = 0
@@ -589,26 +602,32 @@ def set_content(content_type, silent=False):
         # Fijamos strContent, strScraper, scanRecursive y strSettings
         if content_type == 'movie':
             strContent = 'movies'
-            strScraper = 'metadata.themoviedb.org'
             scanRecursive = 2147483647
-            strSettings = "<settings><setting id='RatingS' value='TMDb' /><setting id='certprefix' value='Rated ' />" \
-                          "<setting id='fanart' value='true' /><setting id='keeporiginaltitle' value='false' />" \
-                          "<setting id='language' value='es' /><setting id='tmdbcertcountry' value='us' />" \
-                          "<setting id='trailer' value='true' /></settings>"
+            if seleccion == -1 or seleccion == 0:
+                strScraper = 'metadata.themoviedb.org'
+                path_settings = xbmc.translatePath("special://profile/addon_data/metadata.themoviedb.org/settings.xml")
+            elif seleccion == 1: 
+                strScraper = 'metadata.universal'
+                path_settings = xbmc.translatePath("special://profile/addon_data/metadata.universal/settings.xml")
+            settings_data = filetools.read(path_settings)
+            strSettings = ' '.join(settings_data.split()).replace("> <", "><")
+            strSettings = strSettings.replace("\"","\'")
             strActualizar = "¿Desea configurar este Scraper en español como opción por defecto para películas?"
             if not videolibrarypath.endswith(sep):
                 videolibrarypath += sep
             strPath = videolibrarypath + config.get_setting("folder_movies") + sep
         else:
             strContent = 'tvshows'
-            strScraper = 'metadata.tvdb.com'
             scanRecursive = 0
-            strSettings = "<settings><setting id='RatingS' value='TheTVDB' />" \
-                          "<setting id='absolutenumber' value='false' />" \
-                          "<setting id='dvdorder' value='false' />" \
-                          "<setting id='fallback' value='true' />" \
-                          "<setting id='fanart' value='true' />" \
-                          "<setting id='language' value='es' /></settings>"
+            if seleccion == -1 or seleccion == 0:
+                strScraper = 'metadata.tvdb.com'
+                path_settings = xbmc.translatePath("special://profile/addon_data/metadata.tvdb.com/settings.xml")
+            elif seleccion == 1: 
+                strScraper = 'metadata.tvshows.themoviedb.org'
+                path_settings = xbmc.translatePath("special://profile/addon_data/metadata.tvshows.themoviedb.org/settings.xml")
+            settings_data = filetools.read(path_settings)
+            strSettings = ' '.join(settings_data.split()).replace("> <", "><")
+            strSettings = strSettings.replace("\"","\'")
             strActualizar = "¿Desea configurar este Scraper en español como opción por defecto para series?"
             if not videolibrarypath.endswith(sep):
                 videolibrarypath += sep
@@ -655,7 +674,8 @@ def set_content(content_type, silent=False):
     else:
         heading = "Videoteca %s configurada" % content_type
         msg_text = "Felicidades la videoteca de Kodi ha sido configurada correctamente."
-    platformtools.dialog_notification(heading, msg_text, icon=1, time=10000)
+    platformtools.dialog_notification(heading, msg_text, icon=1, time=3000)
+
     logger.info("%s: %s" % (heading, msg_text))
 
 
@@ -805,8 +825,8 @@ def ask_set_content(flag, silent=False):
 
     if not silent:
         heading = "Alfa Auto-configuración"
-        linea1 = "¿Desea que Alfa auto-configure la videoteca de Kodi?"
-        linea2 = "Si pulsa 'No' podra hacerlo desde 'Configuración > Preferencia > Rutas'."
+        linea1 = "¿Desea que Alfa auto-configure la videoteca de Kodi? Se le pedirá que configure los scrapers para las películas y las series."
+        linea2 = "Si pulsa 'No', podra hacerlo desde 'Configuración > Preferencia > Rutas'."
         if platformtools.dialog_yesno(heading, linea1, linea2):
             do_config()
         else:

From 834984b9d88ee33e495a393c7f74562bec450569 Mon Sep 17 00:00:00 2001
From: Alex <axlt2002@yahoo.it>
Date: Sun, 27 May 2018 19:56:23 +0200
Subject: [PATCH 14/29] Add files via upload

---
 plugin.video.alfa/resources/settings.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/plugin.video.alfa/resources/settings.xml b/plugin.video.alfa/resources/settings.xml
index 950bf63b..33f103ab 100644
--- a/plugin.video.alfa/resources/settings.xml
+++ b/plugin.video.alfa/resources/settings.xml
@@ -23,13 +23,9 @@
 
     <!-- Path downloads -->
     <category label="30501">
-        <setting id="path_selection" type="enum" values="Escribir ruta|Examinar ruta" default="0" label="Tipo de ruta"/>
-        <setting id="downloadpath" type="text" label="30017" default="" visible="eq(-1,0)"/>
-        <setting id="downloadpath" type="folder" label="30017" default="" visible="eq(-2,1)"/>
-        <setting id="downloadlistpath" type="text" label="30018" default="" visible="eq(-3,0)"/>
-        <setting id="downloadlistpath" type="folder" label="30018" default="" visible="eq(-4,1)"/>
-        <setting id="videolibrarypath" type="text" label="30067" default="" visible="eq(-5,0)"/>
-        <setting id="videolibrarypath" type="folder" label="30067" default="" visible="eq(-6,1)"/>
+        <setting id="downloadpath" type="folder" label="30017" default=""/>
+        <setting id="downloadlistpath" type="folder" label="30018" default=""/>
+        <setting id="videolibrarypath" type="folder" label="30067" default=""/>
 
         <setting type="sep"/>
         <setting label="30131" type="lsep"/>

From 322a91a93606f478121c00b04fb0762c068aa74e Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 28 May 2018 10:58:29 -0500
Subject: [PATCH 15/29] mastorrent: nuevo canal

---
 plugin.video.alfa/channels/mastorrents.json |  33 ++
 plugin.video.alfa/channels/mastorrents.py   | 323 ++++++++++++++++++++
 2 files changed, 356 insertions(+)
 create mode 100644 plugin.video.alfa/channels/mastorrents.json
 create mode 100644 plugin.video.alfa/channels/mastorrents.py

diff --git a/plugin.video.alfa/channels/mastorrents.json b/plugin.video.alfa/channels/mastorrents.json
new file mode 100644
index 00000000..6ebae2fc
--- /dev/null
+++ b/plugin.video.alfa/channels/mastorrents.json
@@ -0,0 +1,33 @@
+{
+  "id": "mastorrents",
+  "name": "MasTorrents",
+  "active": true,
+  "adult": false,
+  "language": ["cast","lat"],
+  "thumbnail": "https://s33.postimg.cc/3y8720l9b/mastorrents.png",
+  "banner": "",
+  "version": 1,
+  "categories": [
+    "movie",
+    "tvshow",
+    "torrent"
+  ],
+  "settings": [
+    {
+      "id": "include_in_newest_peliculas",
+      "type": "bool",
+      "label": "Incluir en Novedades - Peliculas",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_newest_torrent",
+      "type": "bool",
+      "label": "Incluir en Novedades - Torrent",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/mastorrents.py b/plugin.video.alfa/channels/mastorrents.py
new file mode 100644
index 00000000..df53aece
--- /dev/null
+++ b/plugin.video.alfa/channels/mastorrents.py
@@ -0,0 +1,323 @@
+# -*- coding: utf-8 -*-
+# -*- Channel MasTorrents -*-
+# -*- Created for Alfa-addon -*-
+# -*- By the Alfa Develop Group -*-
+
+import re
+from channelselector import get_thumb
+from platformcode import logger
+from platformcode import config
+from core import scrapertools
+from core.item import Item
+from core import servertools
+from core import httptools
+from core import tmdb
+
+host = 'http://www.mastorrents.com/'
+
+def mainlist(item):
+    logger.info()
+
+    itemlist = []
+    
+    itemlist.append(item.clone(title="Peliculas",
+                               action="movie_list",
+                               thumbnail=get_thumb("channels_movie.png")
+                               ))
+
+    itemlist.append(item.clone(title="Series",
+                               action="series_list",
+                               thumbnail=get_thumb("channels_tvshow.png")
+                               ))
+    return itemlist
+
+
+def movie_list(item):
+    logger.info()
+
+    itemlist = []
+
+    itemlist.append(item.clone(title="Todas",
+                               action="lista",
+                               url=host+'peliculas',
+                               extra='movie',
+                               thumbnail=get_thumb('all', auto=True)
+                               ))
+
+    itemlist.append(item.clone(title="Generos",
+                               action="genres",
+                               url=host,
+                               extra='movie',
+                               thumbnail=get_thumb('genres', auto=True)
+                               ))
+
+    itemlist.append(item.clone(title="Buscar",
+                               action="search",
+                               url=host + '?pTit=', thumbnail=get_thumb('search', auto=True),
+                               extra='movie'
+                               ))
+    return itemlist
+
+
+def series_list(item):
+    logger.info()
+
+    itemlist = []
+
+    itemlist.append(item.clone(title="Todas",
+                               action="lista",
+                               url=host + 'series',
+                               extra='serie',
+                               thumbnail=get_thumb('all', auto=True)
+                               ))
+
+    itemlist.append(item.clone(title="Generos",
+                               action="genres",
+                               url=host + 'series/',
+                               extra='serie',
+                               thumbnail=get_thumb('genres', auto=True)
+                               ))
+
+    itemlist.append(item.clone(title="Buscar",
+                               action="search",
+                               url=host + 'series/?pTit=',
+                               extra='serie',
+                               thumbnail=get_thumb('search', auto=True)
+                               ))
+    return itemlist
+
+
+def get_source(url):
+    logger.info()
+    data = httptools.downloadpage(url).data
+    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+def lista (item):
+    logger.info ()
+    itemlist = []
+    infoLabels = dict()
+    data = get_source(item.url)
+    patron = "<div class=moviesbox>.*?</div><a href=(.*?)><div class=moviesbox_img style=background-image:url\('("
+    patron += ".*?)'\)>.*?tooltipbox>(.*?)(?: <i>| <br /><i>)(.*?)<"
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle, extra_data in matches:
+        extra_data = extra_data.replace('(','').replace(')','')
+        url = scrapedurl
+        thumbnail = scrapedthumbnail
+        contentTitle = scrapedtitle.decode('latin1').encode('utf8')
+        title = contentTitle
+
+        tvshow = False
+        if 'x' in extra_data:
+            tvshow = True
+            filtro_thumb = scrapedthumbnail.replace("https://image.tmdb.org/t/p/w200_and_h300_bestv2", "")
+            filtro_list = {"poster_path": filtro_thumb}
+            filtro_list = filtro_list.items()
+            infoLabels['filtro']= filtro_list
+        else:
+            infoLabels['year']=extra_data
+        new_item=(Item(channel=item.channel,
+                       action='findvideos',
+                       title=title, 
+                       url=url,
+                       thumbnail=thumbnail,
+                       infoLabels=infoLabels,
+                       extra=item.extra
+                       ))
+        if tvshow:
+            new_item.contentSerieName = contentTitle
+            new_item.action = 'seasons'
+        else:
+            new_item.contentTitle = contentTitle
+            new_item.action = 'findvideos'
+        itemlist.append(new_item)
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb =True)
+ #Paginacion
+
+    if itemlist !=[]:
+        actual_page_url = item.url
+        next_page = scrapertools.find_single_match(data,'<span class=pagination_next><a href=(.*?)>')
+        import inspect
+        if next_page !='':
+           itemlist.append(item.clone(action = "lista",
+                                      title = 'Siguiente >>>',
+                                      url = next_page
+                                      ))
+    return itemlist
+
+
+def genres(item):
+    logger.info()
+
+    itemlist = []
+
+    data = get_source(item.url)
+    data = scrapertools.find_single_match(data,'G&eacute;neros</option>(.+)</select></div>')
+
+    patron = '<option value=(.*?)>(.*?)</option>'
+
+    matches = re.compile(patron,re.DOTALL).findall(data)
+
+    for value, title in matches:
+        url = item.url + value
+        title = title.decode('latin1').encode('utf8')
+        itemlist.append(Item(channel=item.channel, title=title, url=url, action='lista'))
+    return itemlist
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = item.url + texto
+
+    if texto != '':
+        return lista(item)
+    else:
+        return []
+
+
+def seasons(item):
+    logger.info()
+    itemlist=[]
+    infoLabels = item.infoLabels
+    data=get_source(item.url)
+    patron ='href=javascript:showSeasson\(.*?\); id=.*?>Temporada (.*?)<\/a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for season in matches:
+        title='Temporada %s' % season
+        infoLabels['season'] = season
+        itemlist.append(Item(channel=item.channel,
+                             title= title,
+                             url=item.url,
+                             action='episodesxseasons',
+                             contentSeasonNumber=season,
+                             contentSerieName=item.contentSerieName,
+                             infoLabels=infoLabels
+                             ))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    itemlist = itemlist[::-1]
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(
+                Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url,
+                     action="add_serie_to_library", extra="all_episodes", contentSerieName=item.contentSerieName))
+
+    return itemlist
+
+def all_episodes(item):
+    logger.info()
+    itemlist = []
+    templist = seasons(item)
+    for tempitem in templist:
+        itemlist += episodesxseasons(tempitem)
+
+    return itemlist
+
+def episodesxseasons(item):
+    logger.info()
+
+    itemlist=[]
+
+    data=get_source(item.url)
+    patron = "<div class=corner-episode>%sx(.\d+)<\/div><a href=(.*?)>.*?" % item.contentSeasonNumber
+    patron += "image:url\('(.*?)'.*?href.*?>(%s)<" % item.contentSerieName
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    infoLabels=item.infoLabels
+    for episode, scrapedurl, scrapedthumbnail, scrapedtitle in matches:
+        contentEpisodeNumber=episode
+        season = item.contentSeasonNumber
+        url=scrapedurl
+        thumbnail=scrapedthumbnail
+        infoLabels['episode']=episode
+        title = '%sx%s - %s' % (season, episode, item.contentSerieName)
+        itemlist.append(Item(channel=item.channel,
+                             action='findvideos',
+                             title=title,
+                             url=url,
+                             thumbnail=thumbnail,
+                             contentSerieName=item.contentSerieName,
+                             contentEpisodeNumber=contentEpisodeNumber,
+                             infoLabels=infoLabels
+                             ))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist[::-1]
+
+
+def findvideos(item):
+    logger.info()
+    itemlist=[]
+    data = get_source(item.url)
+    patron = "showDownload\(([^\)]+)\);.*?alt=.*?torrent (.*?) "
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for extra_info, quality in matches:
+        extra_info= extra_info.replace(",'",'|')
+        extra_info= extra_info.split('|')
+        title = '%s [%s]' % ('Torrent', quality.strip())
+        if item.extra == 'movie':
+            url = extra_info[2].strip("'")
+        else:
+            url = extra_info[3].strip("'")
+        server = 'torrent'
+
+        if not '.torrent' in url:
+            if 'tvsinpagar' in url:
+                url = url.replace('http://','http://www.')
+            try:
+                from_web = httptools.downloadpage(url, follow_redirects=False)
+                url = from_web.headers['location']
+            except:
+                pass
+
+        if '.torrent' in url:
+            itemlist.append(Item(channel=item.channel,
+                                 title=title,
+                                 contentTitle= item.title,
+                                 url=url,
+                                 action='play',
+                                 quality=quality,
+                                 server=server,
+                                 thumbnail = item.infoLabels['thumbnail'],
+                                 infoLabels=item.infoLabels
+                                 ))
+
+    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
+        itemlist.append(Item(channel=item.channel,
+                             title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]',
+                             url=item.url,
+                             action="add_pelicula_to_library",
+                             extra="findvideos",
+                             contentTitle=item.contentTitle
+                             ))
+
+    return itemlist
+
+
+def newest(category):
+    logger.info()
+    item = Item()
+    try:
+        if category in  ['peliculas', 'torrent']:
+            item.url = host + 'estrenos-de-cine'
+            item.extra='movie'
+            itemlist = lista(item)
+        if itemlist[-1].title == 'Siguiente >>>':
+            itemlist.pop()
+        if category == 'torrent':
+
+            item.url = host+'series'
+            item.extra = 'serie'
+            itemlist.extend(lista(item))
+
+        if itemlist[-1].title == 'Siguiente >>>':
+            itemlist.pop()
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+    return itemlist

From a620665c0f455680911274895073bd98dac3d46b Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 28 May 2018 11:02:20 -0500
Subject: [PATCH 16/29] tiotorrent: fix

---
 plugin.video.alfa/channels/tiotorrent.py | 86 +++++++++++++++++++-----
 1 file changed, 68 insertions(+), 18 deletions(-)

diff --git a/plugin.video.alfa/channels/tiotorrent.py b/plugin.video.alfa/channels/tiotorrent.py
index ad77c404..827d6caf 100644
--- a/plugin.video.alfa/channels/tiotorrent.py
+++ b/plugin.video.alfa/channels/tiotorrent.py
@@ -226,33 +226,83 @@ def episodesxseasons(item):
     return itemlist[::-1]
 
 
+# def findvideos(item):
+#     logger.info()
+#     itemlist=[]
+#     data = get_source(item.url)
+#     patron = "<a class=dload.*? target=_blank>.*?<\/a><i>(.*?)<\/i>.*?<a href=.*?showDownload\((.*?)\);"
+#     matches = re.compile(patron, re.DOTALL).findall(data)
+#
+#     for quality, extra_info in matches:
+#         extra_info= extra_info.replace("'",'')
+#         extra_info= extra_info.split(',')
+#         title = '%s [%s]' % (item.contentTitle, quality)
+#         url = extra_info[1]
+#         if item.extra == 'movie':
+#             url = extra_info[1]
+#         else:
+#             url = extra_info[2]
+#         server = 'torrent'
+#         itemlist.append(Item(channel=item.channel,
+#                              title=title,
+#                              contentTitle= item.title,
+#                              url=url,
+#                              action='play',
+#                              quality=quality,
+#                              server=server,
+#                              thumbnail = item.infoLabels['thumbnail'],
+#                              infoLabels=item.infoLabels
+#                              ))
+#
+#     if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
+#         itemlist.append(Item(channel=item.channel,
+#                              title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]',
+#                              url=item.url,
+#                              action="add_pelicula_to_library",
+#                              extra="findvideos",
+#                              contentTitle=item.contentTitle
+#                              ))
+#
+#     return itemlist
+
+
 def findvideos(item):
     logger.info()
     itemlist=[]
     data = get_source(item.url)
-    patron = "<a class=dload.*? target=_blank>.*?<\/a><i>(.*?)<\/i>.*?<a href=.*?showDownload\((.*?)\);"
+    patron = "showDownload\(([^\)]+)\);.*?alt=.*?torrent (.*?) "
     matches = re.compile(patron, re.DOTALL).findall(data)
 
-    for quality, extra_info in matches:
-        extra_info= extra_info.replace("'",'')
-        extra_info= extra_info.split(',')
-        title = '%s [%s]' % (item.contentTitle, quality)
-        url = extra_info[1]
+    for extra_info, quality in matches:
+        extra_info= extra_info.replace(",'",'|')
+        extra_info= extra_info.split('|')
+        title = '%s [%s]' % ('Torrent', quality.strip())
         if item.extra == 'movie':
-            url = extra_info[1]
+            url = extra_info[2].strip("'")
         else:
-            url = extra_info[2]
+            url = extra_info[3].strip("'")
         server = 'torrent'
-        itemlist.append(Item(channel=item.channel,
-                             title=title,
-                             contentTitle= item.title,
-                             url=url,
-                             action='play',
-                             quality=quality,
-                             server=server,
-                             thumbnail = item.infoLabels['thumbnail'],
-                             infoLabels=item.infoLabels
-                             ))
+
+        if not '.torrent' in url:
+            if 'tvsinpagar' in url:
+                url = url.replace('http://','http://www.')
+            try:
+                from_web = httptools.downloadpage(url, follow_redirects=False)
+                url = from_web.headers['location']
+            except:
+                pass
+
+        if '.torrent' in url:
+            itemlist.append(Item(channel=item.channel,
+                                 title=title,
+                                 contentTitle= item.title,
+                                 url=url,
+                                 action='play',
+                                 quality=quality,
+                                 server=server,
+                                 thumbnail = item.infoLabels['thumbnail'],
+                                 infoLabels=item.infoLabels
+                                 ))
 
     if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
         itemlist.append(Item(channel=item.channel,

From 331e3a2f04569f8242803b2b50634cc898f99bd3 Mon Sep 17 00:00:00 2001
From: mrgaturus <mrgaturus@gmail.com>
Date: Mon, 28 May 2018 21:39:18 -0500
Subject: [PATCH 17/29] Correcciones: quitar __channel__ y remplazar requests
 por httptools

---
 plugin.video.alfa/channels/cuevana2.py        | 36 +++++++++----------
 plugin.video.alfa/channels/cuevana2espanol.py | 27 +++++++-------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/plugin.video.alfa/channels/cuevana2.py b/plugin.video.alfa/channels/cuevana2.py
index e26ed882..938a1bda 100644
--- a/plugin.video.alfa/channels/cuevana2.py
+++ b/plugin.video.alfa/channels/cuevana2.py
@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
 import re
+import urllib
 from channelselector import get_thumb
 
 from core.item import Item
 from core import httptools
+from core import jsontools
 from core import scrapertools
 from core import servertools
 from platformcode import config, logger
 from channels import autoplay
-from lib import requests
-
-
 
 host = "http://www.cuevana2.com/"
-__channel__ = "cuevana2"
 list_quality = []
 list_servers = ['rapidvideo', 'streamango', 'directo', 'yourupload', 'openload', 'dostream']
 
@@ -72,12 +70,12 @@ def load_data(url):
 
     return data
 
-def put_movies(itemlist, data, pattern):
+def put_movies(itemlist, item, data, pattern):
     matches = scrapertools.find_multiple_matches(data, pattern)
     for link, img, title, rating, plot in matches:
         if 'pelicula' in link:
             itemTitle = "%s [COLOR yellow](%s/100)[/COLOR]" % (title, rating)
-            itemlist.append(Item(channel = __channel__, title=itemTitle, fulltitle=title, thumbnail=img, 
+            itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=title, thumbnail=img, 
                 url=link, plot=plot, action="findvideos"))
             logger.info(link)
 
@@ -100,7 +98,7 @@ def episodes(item):
 
     matches = scrapertools.find_multiple_matches(data, seasonsPattern)
     for season, title in matches:
-        itemlist.append(Item(channel = __channel__, title="[COLOR blue]%s[/COLOR]" % title))
+        itemlist.append(Item(channel = item.channel, title="[COLOR blue]%s[/COLOR]" % title))
         episodeMatches = scrapertools.find_single_match(data, episodesPattern % season)
         put_episodes(itemlist, item, episodeMatches)
 
@@ -115,7 +113,7 @@ def shows(item):
 
     matches = scrapertools.find_multiple_matches(data, pattern)
     for link, title in matches:
-        itemlist.append(Item(channel = __channel__, title=title, url=host + link, action="episodes"))
+        itemlist.append(Item(channel = item.channel, title=title, url=host + link, action="episodes"))
 
     return itemlist
 
@@ -132,11 +130,11 @@ def movies(item):
     pattern += '<span style="width:([0-9]+)%">.*?'
     pattern += '"txt">(.*?)</div>' # text
 
-    put_movies(itemlist, data, pattern)
+    put_movies(itemlist, item, data, pattern)
 
     next_page = scrapertools.find_single_match(data, '<a class="nextpostslink" rel="next" href="([^"]+)">')
     if next_page:
-        itemlist.append(Item(channel = __channel__, title='Siguiente Pagina', url=next_page, action="movies"))
+        itemlist.append(Item(channel = item.channel, title='Siguiente Pagina', url=next_page, action="movies"))
 
     #coloca las peliculas encontradas en la lista
     return itemlist
@@ -154,8 +152,7 @@ def searchShows(itemlist, item, texto):
         logger.info(texto)
 
         if inArray(texto, keywords):
-            itemlist.append(Item(channel = __channel__, title=title, url=host + link, action="episodes"))
-
+            itemlist.append(Item(channel = item.channel, title=title, url=host + link, action="episodes"))
 
 def searchMovies(itemlist, item, texto):
     texto = texto.replace(' ', '+').lower()
@@ -197,7 +194,7 @@ def by(item, pattern):
 
     matches = scrapertools.find_multiple_matches(data, pattern)
     for link, genre in matches:
-        itemlist.append(Item(channel = __channel__, title=genre, url=link, action="movies"))
+        itemlist.append(Item(channel = item.channel, title=genre, url=link, action="movies"))
 
     return itemlist
 
@@ -208,9 +205,9 @@ def age(item):
     return by(item, '(\d+)')
 
 def GKPluginLink(hash):
-    re = requests.post('https://player4.cuevana2.com/plugins/gkpluginsphp.php', dict(link=hash))
-
-    return re.json()['link'] if re.content else ''
+    hashdata = urllib.urlencode({r'link':hash})
+    json = httptools.downloadpage('https://player4.cuevana2.com/plugins/gkpluginsphp.php', post=hashdata).data
+    return jsontools.load(json)['link'] if json else ''
 
 #el pattern esta raro para eliminar los duplicados, de todas formas asi es un lenguaje de programacion verificando su sintaxis
 def getContentMovie(data, item):
@@ -244,7 +241,7 @@ def findvideos(item):
     pattern = '<iframe width="650" height="450" scrolling="no" src="([^"]+)'
     subtitles = scrapertools.find_single_match(data, '<iframe width="650" height="450" scrolling="no" src=".*?sub=([^"]+)"')
 
-    #itemlist.append(Item(channel = __channel__, title=item.url))
+    #itemlist.append(Item(channel = item.channel, title=item.url))
     for link in scrapertools.find_multiple_matches(data, pattern):
         #php.*?=(\w+)&
         #url=(.*?)&
@@ -271,6 +268,9 @@ def findvideos(item):
         # personalizadas para Directo, se agradece, por ahora solo devuelve el primero que encuentre
         if type(link) is list:
             link = link[0]['link']
+        if r'chomikuj.pl' in link:
+            # En algunas personas la opcion CH les da error 401
+            link += "|Referer=https://player4.cuevana2.com/plugins/gkpluginsphp.php" 
 
         itemlist.append(
             item.clone(
@@ -287,4 +287,4 @@ def findvideos(item):
                                      action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
                                      fulltitle = item.fulltitle
                                      ))
-    return itemlist
\ No newline at end of file
+    return itemlist
diff --git a/plugin.video.alfa/channels/cuevana2espanol.py b/plugin.video.alfa/channels/cuevana2espanol.py
index b55440fd..318c01cc 100644
--- a/plugin.video.alfa/channels/cuevana2espanol.py
+++ b/plugin.video.alfa/channels/cuevana2espanol.py
@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
 import re
+import urllib
 from channelselector import get_thumb
 
 from core.item import Item
 from core import httptools
+from core import jsontools
 from core import scrapertools
 from core import servertools
 from platformcode import config, logger
 from channels import autoplay
-from lib import requests
-
-
 
 host = "http://cuevana2espanol.com/"
-__channel__ = "cuevana2espanol"
 list_quality = []
 list_servers = ['rapidvideo', 'streamango', 'directo', 'yourupload', 'openload', 'dostream']
 
@@ -55,12 +53,12 @@ def movies(item):
     matches = scrapertools.find_multiple_matches(data, pattern)
     for img, title, ranking, link, age in matches:
         itemTitle = "%s [COLOR yellow](%s)[/COLOR] [COLOR blue](%s)[/COLOR]" % (title, ranking, age)
-        itemlist.append(Item(channel = __channel__, title=itemTitle, fulltitle=title, thumbnail=img, 
+        itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=title, thumbnail=img, 
             url=link, action="findvideos"))
 
     next_page = scrapertools.find_single_match(data, 'href="([^"]+)" ><span class="icon-chevron-right">')
     if next_page:
-        itemlist.append(Item(channel = __channel__, title="Siguiente Pagina", 
+        itemlist.append(Item(channel = item.channel, title="Siguiente Pagina", 
             url=next_page, action="movies"))
 
     return itemlist
@@ -79,7 +77,7 @@ def moviesIMDB(item):
         itemTitle = "%s [COLOR blue](#%s)[/COLOR] [COLOR yellow](%s)[/COLOR]" % (title, rank, rating)
         img = img.replace('-90x135', '')
 
-        itemlist.append(Item(channel = __channel__, title=itemTitle, fulltitle=title, thumbnail=img, 
+        itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=title, thumbnail=img, 
             url=link, action="findvideos"))
 
     return itemlist
@@ -97,12 +95,12 @@ def searchMovies(item):
     for link, img, title, year, plot in matches:
         itemTitle = "%s [COLOR blue](%s)[/COLOR]" % (title, year)
 
-        itemlist.append(Item(channel = __channel__, title=itemTitle, fulltitle=title, thumbnail=img,
+        itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=title, thumbnail=img,
             url=link, plot=plot, action="findvideos"))
 
     next_page = scrapertools.find_single_match(data, 'href="([^"]+)" ><span class="icon-chevron-right">')
     if next_page:
-        itemlist.append(Item(channel = __channel__, title="Siguiente Pagina", 
+        itemlist.append(Item(channel = item.channel, title="Siguiente Pagina", 
             url=next_page, action="searchMovies"))
 
     return itemlist
@@ -114,9 +112,9 @@ def search(item, text):
     return searchMovies(item)
 
 def GKPluginLink(hash):
-    re = requests.post('https://player4.cuevana2.com/plugins/gkpluginsphp.php', dict(link=hash))
-
-    return re.json()['link'] if re.content else ''
+    hashdata = urllib.urlencode({r'link':hash})
+    json = httptools.downloadpage('https://player4.cuevana2.com/plugins/gkpluginsphp.php', post=hashdata).data
+    return jsontools.load(json)['link'] if json else ''
 
 def getContent(item, data):
     item.infoLabels["year"] = scrapertools.find_single_match(data, 'class="date">.*?(\d+)</span>')
@@ -141,7 +139,7 @@ def findvideos(item):
     """
     pattern = '<iframe class="metaframe rptss" src="([^"]+)"'
 
-    #itemlist.append(Item(channel = __channel__, title=item.url))
+    #itemlist.append(Item(channel = item.channel, title=item.url))
     for link in scrapertools.find_multiple_matches(data, pattern):
         #php.*?=(\w+)&
         #url=(.*?)&
@@ -169,6 +167,9 @@ def findvideos(item):
         # personalizadas para Directo, se agradece, por ahora solo devuelve el primero que encuentre
         if type(link) is list:
             link = link[0]['link']
+        if r'chomikuj.pl' in link:
+            # En algunas personas la opcion CH les da error 401
+            link += "|Referer=https://player4.cuevana2.com/plugins/gkpluginsphp.php" 
 
         itemlist.append(
             item.clone(

From c305aa5d849b3c76f481913b2aebdb5cc9a9c9c6 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 29 May 2018 14:50:44 -0500
Subject: [PATCH 18/29] animeshd: fix

---
 plugin.video.alfa/channels/animeshd.py | 106 ++++++++++++++++++++-----
 1 file changed, 85 insertions(+), 21 deletions(-)

diff --git a/plugin.video.alfa/channels/animeshd.py b/plugin.video.alfa/channels/animeshd.py
index d1f5635a..8d343d3b 100644
--- a/plugin.video.alfa/channels/animeshd.py
+++ b/plugin.video.alfa/channels/animeshd.py
@@ -10,6 +10,8 @@ from channelselector import get_thumb
 from core import tmdb
 from core.item import Item
 from platformcode import logger, config
+from channels import autoplay
+from channels import filtertools
 
 tgenero = {"Comedia": "https://s7.postimg.cc/ne9g9zgwb/comedia.png",
            "Drama": "https://s16.postimg.cc/94sia332d/drama.png",
@@ -31,42 +33,60 @@ tgenero = {"Comedia": "https://s7.postimg.cc/ne9g9zgwb/comedia.png",
 
 host = "http://www.animeshd.tv"
 
-headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
-           ['Referer', host]]
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'poseidonhd')
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'poseidonhd')
+
+
+IDIOMAS = {'Castellano':'CAST','Latino': 'LAT', 'Subtitulado': 'VOSE'}
+list_language = IDIOMAS.values()
+list_quality = []
+list_servers = ['rapidvideo', 'openload', 'gvideo', 'streamango']
 
 
 def mainlist(item):
     logger.info()
+
+    autoplay.init(item.channel, list_servers, list_quality)
+
     itemlist = []
 
-    itemlist.append(item.clone(title="Ultimas",
+
+    itemlist.append(item.clone(title="Castellano",
                                action="lista",
-                               thumbnail=get_thumb('last', auto=True),
-                               fanart='https://s22.postimg.cc/cb7nmhwv5/ultimas.png',
-                               url=host + '/ultimos'
-                               ))
+                               thumbnail=get_thumb('channels_spanish.png'),
+                               fanart='https://s18.postimg.cc/fwvaeo6qh/todas.png',
+                               url=host + '/castellano'))
+
+    itemlist.append(item.clone(title="Latino",
+                               action="lista",
+                               thumbnail=get_thumb('channels_latino.png'),
+                               fanart='https://s18.postimg.cc/fwvaeo6qh/todas.png',
+                               url=host + '/latino'))
 
     itemlist.append(item.clone(title="Todas",
                                action="lista",
                                thumbnail=get_thumb('all', auto=True),
                                fanart='https://s18.postimg.cc/fwvaeo6qh/todas.png',
-                               url=host + '/buscar?t=todos&q='
-                               ))
+                               url=host + '/buscar?t=todo&q='))
 
     itemlist.append(item.clone(title="Generos",
                                action="generos",
                                url=host,
                                thumbnail=get_thumb('genres', auto=True),
-                               fanart='https://s3.postimg.cc/5s9jg2wtf/generos.png'
-                               ))
+                               fanart='https://s3.postimg.cc/5s9jg2wtf/generos.png'))
 
     itemlist.append(item.clone(title="Buscar",
                                action="search",
-                               url=host + '/buscar?t=todos&q=',
+                               url=host + '/buscar?t=todo&q=',
                                thumbnail=get_thumb('search', auto=True),
                                fanart='https://s30.postimg.cc/pei7txpa9/buscar.png'
                                ))
 
+    itemlist = filtertools.show_option(itemlist, item.channel, list_language, list_quality)
+
+    autoplay.show_option(item.channel, itemlist)
+
+
     return itemlist
 
 
@@ -98,21 +118,22 @@ def lista(item):
                                    title=title,
                                    url=url,
                                    thumbnail=thumbnail,
-                                   contentSerieName=title
+                                   contentSerieName=title,
+                                   context=filtertools.context(item, list_language, list_quality)
                                    ))
 
         # Paginacion
     next_page = scrapertools.find_single_match(data,
-                                               '<li class=active><span>.*?<\/span><\/li><li><a href=(.*?)>.*?<\/a><\/li>')
+                                               '<a href=([^ ]+) rel=next>&raquo;</a>')
     next_page_url = scrapertools.decodeHtmlentities(next_page)
     if next_page_url != "":
         itemlist.append(Item(channel=item.channel,
                              action="lista",
                              title=">> Página siguiente",
-                             url=next_page_url,
+                             url=host+next_page_url,
                              thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png'
                              ))
-    tmdb.set_infoLabels(itemlist)
+    tmdb.set_infoLabels(itemlist, seekTmdb=True)
     return itemlist
 
 
@@ -137,7 +158,7 @@ def generos(item):
     itemlist = []
 
     data = get_source(item.url)
-    patron = '<li class=><a href=http:\/\/www\.animeshd\.tv\/genero\/(.*?)>(.*?)<\/a><\/li>'
+    patron = '<li class=><a href=https:\/\/www\.animeshd\.tv\/genero\/(.*?)>(.*?)<\/a><\/li>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedtitle in matches:
@@ -159,16 +180,59 @@ def episodios(item):
     itemlist = []
 
     data = get_source(item.url)
-    patron = '<li id=epi-.*? class=list-group-item ><a href=(.*?) class=badge.*?width=25 title=(.*?)> <\/span>(.*?) (\d+)<\/li>'
+    patron = '<li id=epi-.*? class=list-group-item.*?><a href=(.*?) class=badge.*?width=25 title=(.*?)>.*?<\/span>(' \
+             '.*?) (\d+)<\/li>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
+    infoLabels = item.infoLabels
     for scrapedurl, scrapedlang, scrapedtitle, episode in matches:
         language = scrapedlang
         title = scrapedtitle + " " + "1x" + episode
         url = scrapedurl
-        itemlist.append(item.clone(title=title, url=url, action='findvideos', language=language))
+        infoLabels['season'] ='1'
+        infoLabels['episode'] = episode
+
+        itemlist.append(Item(channel=item.channel, title=title, contentSerieName=item.contentSerieName, url=url,
+                             action='findvideos', language=IDIOMAS[language], infoLabels=infoLabels))
            
-    if config.get_videolibrary_support():
-        itemlist.append(Item(channel=item.channel, title="Añadir serie a la biblioteca", url=item.url, action="add_serie_to_library", extra="episodios", fanart=item.thumbnail, thumbnail=item.thumbnail, contentTitle=item.show, show=item.show)) 
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(
+            Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url,
+                 action="add_serie_to_library", extra="episodios", contentSerieName=item.contentSerieName,
+                 extra1='library'))
     
     return itemlist
+
+def findvideos(item):
+    logger.info()
+
+    itemlist = []
+
+    data = get_source(item.url)
+    patron = "<option value=(.*?) data-content=.*?width='16'> (.*?) <span class='text-muted'>"
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, language in matches:
+        if 'jpg' in scrapedurl:
+            vip_data = httptools.downloadpage(scrapedurl, follow_redirects=False)
+            scrapedurl = vip_data.headers['location']
+        title = '%s [%s]'
+        itemlist.append(item.clone(title=title, url=scrapedurl.strip(), action='play',
+                        language=IDIOMAS[language]))
+
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % (x.server.capitalize(), x.language))
+
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
+
+    # Requerido para FilterTools
+
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+
+    autoplay.start(itemlist, item)
+
+    return itemlist

From 315fc0b972ab9d57fa8f38bc3048018b5b3a5c10 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 29 May 2018 14:51:10 -0500
Subject: [PATCH 19/29] animeshd: fix

---
 plugin.video.alfa/channels/animeshd.json | 33 ++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/plugin.video.alfa/channels/animeshd.json b/plugin.video.alfa/channels/animeshd.json
index 23b4e042..8aeb2a89 100755
--- a/plugin.video.alfa/channels/animeshd.json
+++ b/plugin.video.alfa/channels/animeshd.json
@@ -8,5 +8,38 @@
   "banner": "https://s4.postimg.cc/lulxulmql/animeshd-banner.png",
   "categories": [
     "anime"
+  ],
+  "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": false,
+      "enabled": false,
+      "visible": false
+    },
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "LAT",
+        "CAST",
+        "VOSE"
+      ]
+    },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
+    }
   ]
 }

From 48e72dc8ffb739f4120295eec19f081ac16d6350 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 29 May 2018 14:55:03 -0500
Subject: [PATCH 20/29] filebebo: patron actualizado

---
 plugin.video.alfa/servers/filebebo.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/servers/filebebo.json b/plugin.video.alfa/servers/filebebo.json
index d6e43254..906fa4fe 100644
--- a/plugin.video.alfa/servers/filebebo.json
+++ b/plugin.video.alfa/servers/filebebo.json
@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "(https://filebebo.com/e/[a-zA-Z0-9]+)",
+        "pattern": "(https://filebebo.com/(?:e|d)/[a-zA-Z0-9]+)",
         "url": "\\1"
       }
     ]
@@ -39,4 +39,4 @@
     }
   ],
   "thumbnail": "https://filebebo.com/images/logo.png"
-}
\ No newline at end of file
+}

From 846ca4d84b763db19e10c1777dc85240ec0ebe19 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 29 May 2018 14:55:51 -0500
Subject: [PATCH 21/29] seriesverde: nuevo canal

---
 plugin.video.alfa/channels/seriesverde.json |  37 +++
 plugin.video.alfa/channels/seriesverde.py   | 311 ++++++++++++++++++++
 2 files changed, 348 insertions(+)
 create mode 100644 plugin.video.alfa/channels/seriesverde.json
 create mode 100644 plugin.video.alfa/channels/seriesverde.py

diff --git a/plugin.video.alfa/channels/seriesverde.json b/plugin.video.alfa/channels/seriesverde.json
new file mode 100644
index 00000000..8a9a8aeb
--- /dev/null
+++ b/plugin.video.alfa/channels/seriesverde.json
@@ -0,0 +1,37 @@
+{
+  "id": "seriesverde",
+  "name": "SeriesVerde",
+  "active": true,
+  "adult": false,
+  "language": ["cast", "lat"],
+  "thumbnail": "https://s33.postimg.cc/96dhv4trj/seriesverde.png",
+  "banner": "",
+  "categories": [
+    "tvshow"
+  ],
+  "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": false,
+      "enabled": false,
+      "visible": false
+    },
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+		"Cast",
+		"Lat",
+        "VOSE",
+        "VO"
+      ]
+    }
+  ]
+}
diff --git a/plugin.video.alfa/channels/seriesverde.py b/plugin.video.alfa/channels/seriesverde.py
new file mode 100644
index 00000000..4061bcf9
--- /dev/null
+++ b/plugin.video.alfa/channels/seriesverde.py
@@ -0,0 +1,311 @@
+# -*- coding: utf-8 -*-
+# -*- Channel SeriesVerde -*-
+# -*- Created for Alfa-addon -*-
+# -*- By the Alfa Develop Group -*-
+
+import re
+
+from channels import autoplay
+from channels import filtertools
+from core import httptools
+from core import scrapertools
+from core import servertools
+from core import tmdb
+from core.item import Item
+from platformcode import config, logger
+from channelselector import get_thumb
+
+host = 'http://seriesverde.com/'
+
+IDIOMAS = {'es': 'Cast', 'la': 'Lat', 'vos': 'VOSE', 'vo': 'VO'}
+list_language = IDIOMAS.values()
+list_quality = ['SD', 'Micro-HD-720p', '720p', 'HDitunes', 'Micro-HD-1080p' ]
+list_servers = ['powvideo','yourupload', 'openload', 'gamovideo', 'flashx', 'clipwatching', 'streamango', 'streamcloud']
+
+
+def mainlist(item):
+    logger.info()
+
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist = []
+
+    itemlist.append(Item(channel=item.channel,
+                         title="Todas",
+                         action="list_all",
+                         thumbnail=get_thumb('all', auto=True),
+                         url=host + 'listado/',
+                         ))
+
+    itemlist.append(Item(channel=item.channel,
+                         title="Generos",
+                         action="section",
+                         thumbnail=get_thumb('genres', auto=True),
+                         url=host,
+                         ))
+
+    itemlist.append(Item(channel=item.channel,
+                         title="A - Z",
+                         action="section",
+                         thumbnail=get_thumb('alphabet', auto=True),
+                         url=host+'listado/', ))
+
+    itemlist.append(Item(channel=item.channel,
+                         title="Buscar",
+                         action="search",
+                         thumbnail=get_thumb('search', auto=True)))
+
+    itemlist = filtertools.show_option(itemlist, item.channel, list_language, list_quality)
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+
+def get_source(url):
+    logger.info()
+    data = httptools.downloadpage(url).data
+    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+
+def list_all(item):
+    logger.info()
+
+    itemlist = []
+    data = get_source(item.url)
+    contentSerieName = ''
+
+    patron = "<div style='float.*?<a href='(.*?)'>.*?src='(.*?)' title='(.*?)'"
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
+
+        url = host + scrapedurl
+        thumbnail = scrapedthumbnail
+        title = scrapedtitle
+
+        itemlist.append(Item(channel=item.channel,
+                             action='seasons',
+                             title=title,
+                             url=url,
+                             thumbnail=thumbnail,
+                             contentTitle=scrapedtitle,
+                             contentSerieName=contentSerieName,
+                             context=filtertools.context(item, list_language, list_quality),
+                             ))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    # #Paginacion
+
+    if itemlist != []:
+        base_page = scrapertools.find_single_match(item.url,'(.*?)?')
+        next_page = scrapertools.find_single_match(data, '</span><a href=?pagina=2>>></a>')
+        if next_page != '':
+            itemlist.append(Item(channel=item.channel,
+                                 action="lista",
+                                 title='Siguiente >>>',
+                                 url=base_page+next_page,
+                                 thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png',
+                                 ))
+    return itemlist
+
+
+def section(item):
+    logger.info()
+
+    itemlist = []
+    data = get_source(item.url)
+    if item.title == 'Generos':
+        patron = '<li><a href=([^ ]+) rel=nofollow><i class=fa fa-bookmark-o></i> (.*?)</a></li>'
+    elif item.title == 'A - Z':
+        patron = "<a dir='ltr' href=(.*?) class='label label-success'>(.*?)</a>"
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedtitle in matches:
+
+        url = host + scrapedurl
+        title = scrapedtitle
+        itemlist.append(Item(channel=item.channel,
+                             action='list_all',
+                             title=title,
+                             url=url
+                             ))
+    return itemlist
+
+def seasons(item):
+    logger.info()
+    itemlist = []
+    data = get_source(item.url)
+
+    patron = '<span itemprop=seasonNumber class=fa fa-arrow-down>.*?Temporada (\d+) '
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    infoLabels=item.infoLabels
+    for scrapedseason in matches:
+        url = item.url
+        title = 'Temporada %s' % scrapedseason
+        contentSeasonNumber = scrapedseason
+        infoLabels['season'] = contentSeasonNumber
+        thumbnail = item.thumbnail
+        itemlist.append(Item(channel=item.channel,
+                             action="episodesxseason",
+                             title=title,
+                             url=url,
+                             thumbnail=thumbnail,
+                             contentSeasonNumber=contentSeasonNumber,
+                             infoLabels=infoLabels
+                             ))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(Item(channel=item.channel,
+                             title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]',
+                             url=item.url,
+                             action="add_serie_to_library",
+                             extra="all_episodes",
+                             contentSerieName=item.contentSerieName,
+                             ))
+
+    return itemlist
+
+
+def all_episodes(item):
+    logger.info()
+    itemlist = []
+    templist = seasons(item)
+    for tempitem in templist:
+        itemlist += episodesxseason(tempitem)
+    return itemlist
+
+
+def episodesxseason(item):
+    logger.info()
+    itemlist = []
+    data = get_source(item.url)
+    season = item.contentSeasonNumber
+    patron = "<td><a href='([^ ]+)'.*?itemprop='episodeNumber'>%s+x(\d+)</span> - (.*?) </a>.*?(/banderas.*?)</td>" % \
+             season
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    infoLabels = item.infoLabels
+    for scrapedurl, scraped_episode, scrapedtitle, lang_data in matches:
+        url = host + scrapedurl
+        title = '%sx%s - %s' % (season, scraped_episode, scrapedtitle.strip())
+        infoLabels['episode'] = scraped_episode
+        thumbnail = item.thumbnail
+        title, language = add_language(title, lang_data)
+        itemlist.append(Item(channel=item.channel,
+                             action="findvideos",
+                             title=title,
+                             url=url,
+                             thumbnail=thumbnail,
+                             language=language,
+                             infoLabels=infoLabels
+                             ))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+
+def add_language(title, string):
+    logger.info()
+    language = []
+    languages = scrapertools.find_multiple_matches(string, '/banderas/(.*?).png')
+
+    for lang in languages:
+        if lang == 'japvose':
+            lang = 'vos'
+        language.append(IDIOMAS[lang])
+        title = '%s [%s]' % (title, IDIOMAS[lang])
+
+    return title, language
+
+
+def findvideos(item):
+    logger.info()
+
+    itemlist = []
+
+    data = get_source(item.url)
+    patron = "<a href=([^ ]+) target=_blank><img src='/servidores/(.*?).(?:png|jpg)'.*?sno.*?"
+    patron += "sno><span>(.*?)<.*?(/banderas.*?)td"
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+
+    for scrapedurl, server, quality, lang_data in matches:
+
+        title = server.capitalize()
+        if quality == '':
+            quality = 'SD'
+        title = '%s [%s]' % (title, quality)
+        title, language = add_language(title, lang_data)
+        thumbnail = item.thumbnail
+
+        enlace_id, serie_id, se, ep = scrapertools.find_single_match(scrapedurl,'enlace(\d+)/(\d+)/(\d+)/(\d+)/')
+
+        url = host + 'ajax/load_enlace.php?serie=%s&temp=%s&cap=%s&id=%s' % (serie_id, se, ep, enlace_id)
+        itemlist.append(Item(channel=item.channel,
+                             title=title,
+                             url=url,
+                             action="play",
+                             thumbnail=thumbnail,
+                             server=server,
+                             quality=quality,
+                             language=language,
+                             infoLabels=item.infoLabels
+                             ))
+    # Requerido para FilterTools
+
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+
+    autoplay.start(itemlist, item)
+
+    return sorted(itemlist, key=lambda it: it.language)
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url, follow_redirects=False).data
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.infoLabels = item.infoLabels
+
+
+    return itemlist
+
+
+def search_results(item):
+    logger.info()
+    itemlist = []
+
+    data = httptools.downloadpage(host + 'finder.php', post=item.post).data
+    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    patron = "<a href='(.*?)'>.*?src=(.*?) style.*?value=(.*?)>"
+
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumb, scrapedtitle in matches:
+        itemlist.append(Item(channel=item.channel,
+                             title=scrapedtitle,
+                             url=host+scrapedurl,
+                             action="seasons",
+                             thumbnail=scrapedthumb,
+                             contentSerieName=scrapedtitle,
+                             context=filtertools.context(item, list_language, list_quality)
+                             ))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    import urllib
+    if texto != '':
+        post = {'query':texto}
+        post = urllib.urlencode(post)
+        item.post = post
+
+        return search_results(item)

From 0876c48a72e75c1f554decdd1b27047d5a5a91d0 Mon Sep 17 00:00:00 2001
From: Alfa <30527549+alfa-addon@users.noreply.github.com>
Date: Tue, 29 May 2018 15:23:22 -0500
Subject: [PATCH 22/29] Update settings.xml

---
 plugin.video.alfa/resources/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.video.alfa/resources/settings.xml b/plugin.video.alfa/resources/settings.xml
index 06a777e8..ab3aa14a 100644
--- a/plugin.video.alfa/resources/settings.xml
+++ b/plugin.video.alfa/resources/settings.xml
@@ -46,7 +46,7 @@
                  default="Peliculas" visible="eq(-3,True)+eq(-1,True)+eq(-2,False)" enable="eq(-3,True)+eq(-1,True)+(-2,false)"/>
    </category>
     <category label="Opciones Visuales">
-        <setting id="icon_set" type="labelenum" label="Set de iconos" values="default|dark" default="default"/>
+        <setting id="icon_set" type="labelenum" label="Set de iconos" values="default|dark|angedam" default="default"/>
         <setting id="infoplus_set" type="labelenum" label="Opción visual Infoplus" values="Sin animación|Con animación" default="Sin animación"/>
         <setting id="video_thumbnail_type" type="enum" label="Thumbnail para videos" values="Poster|Logo del servidor" default="0"/>
         <setting label="Opciones para Titulos" type="lsep"/>

From f33c3157b3b6d6390699ccdceeb73d3023bd101f Mon Sep 17 00:00:00 2001
From: Alfa <30527549+alfa-addon@users.noreply.github.com>
Date: Tue, 29 May 2018 15:25:42 -0500
Subject: [PATCH 23/29] =?UTF-8?q?A=C3=B1adir=20opci=C3=B3n=20para=20reduir?=
 =?UTF-8?q?=20el=20item=20en=20context?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/language/Spanish (Mexico)/strings.po          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po
index bc41ec1b..fb8cbf4d 100644
--- a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po	
+++ b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po	
@@ -251,6 +251,10 @@ msgctxt "#30164"
 msgid "Delete this file"
 msgstr "Borrar este fichero"
 
+msgctxt "#30300"
+msgid "Faster context menus"
+msgstr "Menús contextuales rápidos (puede causar que algunas opciones no funcionen)"
+
 msgctxt "#30501"
 msgid "Paths"
 msgstr "Rutas"
@@ -261,4 +265,4 @@ msgstr "Acceso directo"
 
 msgctxt "#30999"
 msgid "Add key to open Shortcut"
-msgstr "Añadir tecla para acceso directo"
\ No newline at end of file
+msgstr "Añadir tecla para acceso directo"

From b51a06b473ae1aeec93bae5fd0956d063d9eb010 Mon Sep 17 00:00:00 2001
From: Alfa <30527549+alfa-addon@users.noreply.github.com>
Date: Tue, 29 May 2018 15:26:59 -0500
Subject: [PATCH 24/29] =?UTF-8?q?A=C3=B1adir=20opci=C3=B3n=20para=20reduir?=
 =?UTF-8?q?=20el=20item=20en=20context?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/language/Spanish (Argentina)/strings.po       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po
index bc41ec1b..fb8cbf4d 100644
--- a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po	
+++ b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po	
@@ -251,6 +251,10 @@ msgctxt "#30164"
 msgid "Delete this file"
 msgstr "Borrar este fichero"
 
+msgctxt "#30300"
+msgid "Faster context menus"
+msgstr "Menús contextuales rápidos (puede causar que algunas opciones no funcionen)"
+
 msgctxt "#30501"
 msgid "Paths"
 msgstr "Rutas"
@@ -261,4 +265,4 @@ msgstr "Acceso directo"
 
 msgctxt "#30999"
 msgid "Add key to open Shortcut"
-msgstr "Añadir tecla para acceso directo"
\ No newline at end of file
+msgstr "Añadir tecla para acceso directo"

From c24c6605552374403d73b2e6615f20cfd9f20406 Mon Sep 17 00:00:00 2001
From: Alfa <30527549+alfa-addon@users.noreply.github.com>
Date: Tue, 29 May 2018 15:29:12 -0500
Subject: [PATCH 25/29] =?UTF-8?q?A=C3=B1adir=20opci=C3=B3n=20para=20reduir?=
 =?UTF-8?q?=20el=20item=20en=20context?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/resources/language/English/strings.po | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/resources/language/English/strings.po b/plugin.video.alfa/resources/language/English/strings.po
index 9623bdf3..574a56a4 100644
--- a/plugin.video.alfa/resources/language/English/strings.po
+++ b/plugin.video.alfa/resources/language/English/strings.po
@@ -251,6 +251,10 @@ msgctxt "#30164"
 msgid "Delete this file"
 msgstr ""
 
+msgctxt "#30300"
+msgid "Faster context menus"
+msgstr ""
+
 msgctxt "#30501"
 msgid "Paths"
 msgstr ""
@@ -261,4 +265,4 @@ msgstr ""
 
 msgctxt "#30999"
 msgid "Add key to open Shortcut"
-msgstr ""
\ No newline at end of file
+msgstr ""

From 3f03905f4d816d1e144a5e086e458a42cd6ef21d Mon Sep 17 00:00:00 2001
From: Alfa <30527549+alfa-addon@users.noreply.github.com>
Date: Tue, 29 May 2018 15:47:53 -0500
Subject: [PATCH 26/29] v2.5.16

---
 plugin.video.alfa/addon.xml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml
index ec030a61..73abc370 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.5.15" provider-name="Alfa Addon">
+<addon id="plugin.video.alfa" name="Alfa" version="2.5.16" provider-name="Alfa Addon">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.libtorrent" optional="true"/>
@@ -18,17 +18,16 @@
       <screenshot>resources/media/themes/ss/4.jpg</screenshot>
     </assets>
       <news>[B]Estos son los cambios para esta versión:[/B]
-      » dailymotion                     » ver-peliculas
-      » poseidonhd                     » cinedetodo 
-      » wikiseries                         » uptobox
-      » allpeliculas                       » gounlimited
-      » pepecine                          » descargas2020
-      » mejortorrent                   » mispelisyseries
-      » torrentlocura                  » torrentrapid
-      » tumejortorrent               » tvsinpagar
-      » elitetorrent                      » netutv
+      [COLOR green][B]Canales agregados y arreglos[/B][/COLOR] 
+      » clipwatching                     » vidup
+      » allcalidad                           » descargacineclasico
+      » mastorrent                       » tiotorrent
+      » animeshd                          » filebebo
+      » cuevana2                           » Cuevana2español
+      » seriesverde                       » flashx
       ¤ arreglos internos
-      ¤ Agradecimientos a @angedam, @alaquepasa por colaborar con ésta versión.
+
+      ¤ Agradecimientos a @angedam, @alaquepasa, @mrgaturus, @axlt2002 por colaborar con ésta versión.
       
     </news>
     <description lang="es">Navega con Kodi por páginas web para ver sus videos de manera fácil.</description>

From b210b06b26d5c2e6d1e3bc8918c49d6328f38ab3 Mon Sep 17 00:00:00 2001
From: Alfa <30527549+alfa-addon@users.noreply.github.com>
Date: Tue, 29 May 2018 16:10:21 -0500
Subject: [PATCH 27/29] Update filtertools.py

---
 plugin.video.alfa/channels/filtertools.py | 132 ++++++++++++----------
 1 file changed, 73 insertions(+), 59 deletions(-)

diff --git a/plugin.video.alfa/channels/filtertools.py b/plugin.video.alfa/channels/filtertools.py
index 4d606190..02bec0b0 100755
--- a/plugin.video.alfa/channels/filtertools.py
+++ b/plugin.video.alfa/channels/filtertools.py
@@ -7,6 +7,7 @@ from core import jsontools
 from core.item import Item
 from platformcode import config, logger
 from platformcode import platformtools
+from core import channeltools
 
 TAG_TVSHOW_FILTER = "TVSHOW_FILTER"
 TAG_NAME = "name"
@@ -405,74 +406,87 @@ def config_item(item):
     dict_series = jsontools.get_node_from_file(item.from_channel, TAG_TVSHOW_FILTER)
 
     tvshow = item.show.lower().strip()
+    default_lang = ''
 
-    lang_selected = dict_series.get(tvshow, {}).get(TAG_LANGUAGE, 'Español')
-    list_quality = dict_series.get(tvshow, {}).get(TAG_QUALITY_ALLOWED, [x.lower() for x in item.list_quality])
-    # logger.info("lang selected {}".format(lang_selected))
-    # logger.info("list quality {}".format(list_quality))
+    channel_parameters = channeltools.get_channel_parameters(item.from_channel)
+    list_language = channel_parameters["filter_languages"]
+    try:
+        if channel_parameters["filter_languages"] != '' and len(list_language) > 0:
+            default_lang = list_language[1]
+    except:
+        pass
 
-    active = True
-    custom_button = {'visible': False}
-    allow_option = False
-    if item.show.lower().strip() in dict_series:
-        allow_option = True
-        active = dict_series.get(item.show.lower().strip(), {}).get(TAG_ACTIVE, False)
-        custom_button = {'label': 'Borrar', 'function': 'delete', 'visible': True, 'close': True}
+    if default_lang == '':
+        platformtools.dialog_notification("FilterTools", "No hay idiomas definidos")
+        return
+    else:
+        lang_selected = dict_series.get(tvshow, {}).get(TAG_LANGUAGE, default_lang)
+        list_quality = dict_series.get(tvshow, {}).get(TAG_QUALITY_ALLOWED, [x.lower() for x in item.list_quality])
+        # logger.info("lang selected {}".format(lang_selected))
+        # logger.info("list quality {}".format(list_quality))
 
-    list_controls = []
+        active = True
+        custom_button = {'visible': False}
+        allow_option = False
+        if item.show.lower().strip() in dict_series:
+            allow_option = True
+            active = dict_series.get(item.show.lower().strip(), {}).get(TAG_ACTIVE, False)
+            custom_button = {'label': 'Borrar', 'function': 'delete', 'visible': True, 'close': True}
 
-    if allow_option:
-        active_control = {
-            "id": "active",
-            "type": "bool",
-            "label": "¿Activar/Desactivar filtro?",
-            "color": "",
-            "default": active,
-            "enabled": allow_option,
-            "visible": allow_option,
-        }
-        list_controls.append(active_control)
+        list_controls = []
 
-    language_option = {
-        "id": "language",
-        "type": "list",
-        "label": "Idioma",
-        "color": "0xFFee66CC",
-        "default": item.list_language.index(lang_selected),
-        "enabled": True,
-        "visible": True,
-        "lvalues": item.list_language
-    }
-    list_controls.append(language_option)
-
-    if item.list_quality:
-        list_controls_calidad = [
-            {
-                "id": "textoCalidad",
-                "type": "label",
-                "label": "Calidad permitida",
-                "color": "0xffC6C384",
-                "enabled": True,
-                "visible": True,
-            },
-        ]
-        for element in sorted(item.list_quality, key=str.lower):
-            list_controls_calidad.append({
-                "id": element,
+        if allow_option:
+            active_control = {
+                "id": "active",
                 "type": "bool",
-                "label": element,
-                "default": (False, True)[element.lower() in list_quality],
-                "enabled": True,
-                "visible": True,
-            })
+                "label": "¿Activar/Desactivar filtro?",
+                "color": "",
+                "default": active,
+                "enabled": allow_option,
+                "visible": allow_option,
+            }
+            list_controls.append(active_control)
 
-        # concatenamos list_controls con list_controls_calidad
-        list_controls.extend(list_controls_calidad)
+        language_option = {
+            "id": "language",
+            "type": "list",
+            "label": "Idioma",
+            "color": "0xFFee66CC",
+            "default": item.list_language.index(lang_selected),
+            "enabled": True,
+            "visible": True,
+            "lvalues": item.list_language
+        }
+        list_controls.append(language_option)
 
-    title = "Filtrado de enlaces para: [COLOR %s]%s[/COLOR]" % (COLOR.get("selected", "auto"), item.show)
+        if item.list_quality:
+            list_controls_calidad = [
+                {
+                    "id": "textoCalidad",
+                    "type": "label",
+                    "label": "Calidad permitida",
+                    "color": "0xffC6C384",
+                    "enabled": True,
+                    "visible": True,
+                },
+            ]
+            for element in sorted(item.list_quality, key=str.lower):
+                list_controls_calidad.append({
+                    "id": element,
+                    "type": "bool",
+                    "label": element,
+                    "default": (False, True)[element.lower() in list_quality],
+                    "enabled": True,
+                    "visible": True,
+                })
 
-    platformtools.show_channel_settings(list_controls=list_controls, callback='save', item=item,
-                                        caption=title, custom_button=custom_button)
+            # concatenamos list_controls con list_controls_calidad
+            list_controls.extend(list_controls_calidad)
+
+        title = "Filtrado de enlaces para: [COLOR %s]%s[/COLOR]" % (COLOR.get("selected", "auto"), item.show)
+
+        platformtools.show_channel_settings(list_controls=list_controls, callback='save', item=item,
+                                            caption=title, custom_button=custom_button)
 
 
 def delete(item, dict_values):

From b149af0aeeb1ac41ce71d713ac4f9397ae67fac6 Mon Sep 17 00:00:00 2001
From: Alfa <30527549+alfa-addon@users.noreply.github.com>
Date: Tue, 29 May 2018 16:11:13 -0500
Subject: [PATCH 28/29] Update channeltools.py

---
 plugin.video.alfa/core/channeltools.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin.video.alfa/core/channeltools.py b/plugin.video.alfa/core/channeltools.py
index b37dcd39..c39c3922 100755
--- a/plugin.video.alfa/core/channeltools.py
+++ b/plugin.video.alfa/core/channeltools.py
@@ -84,6 +84,8 @@ def get_channel_parameters(channel_name):
                         if 'id' in s:
                             if s['id'] == "include_in_global_search":
                                 channel_parameters["include_in_global_search"] = True
+                            elif s['id'] == "filter_languages":
+                                channel_parameters["filter_languages"] = s.get('lvalues',[])
                             elif not s['id'].startswith("include_in_") and \
                                     (s.get('enabled', False) or s.get('visible', False)):
                                 channel_parameters["has_settings"] = True

From 6759e7ac3f1b5f2d97fbdb4f8844479d8ff25c45 Mon Sep 17 00:00:00 2001
From: Alfa <30527549+alfa-addon@users.noreply.github.com>
Date: Tue, 29 May 2018 16:55:45 -0500
Subject: [PATCH 29/29] Update seriesverde.py

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

diff --git a/plugin.video.alfa/channels/seriesverde.py b/plugin.video.alfa/channels/seriesverde.py
index 4061bcf9..7a6631f4 100644
--- a/plugin.video.alfa/channels/seriesverde.py
+++ b/plugin.video.alfa/channels/seriesverde.py
@@ -183,8 +183,7 @@ def episodesxseason(item):
     itemlist = []
     data = get_source(item.url)
     season = item.contentSeasonNumber
-    patron = "<td><a href='([^ ]+)'.*?itemprop='episodeNumber'>%s+x(\d+)</span> - (.*?) </a>.*?(/banderas.*?)</td>" % \
-             season
+    patron = "<td><a href='([^ ]+)'.*?itemprop='episodeNumber'>%s+x(\d+)</span> - (.*?) </a>.*?(/banderas.*?)</td>" % season
     matches = re.compile(patron, re.DOTALL).findall(data)
     infoLabels = item.infoLabels
     for scrapedurl, scraped_episode, scrapedtitle, lang_data in matches:
@@ -212,8 +211,9 @@ def add_language(title, string):
     languages = scrapertools.find_multiple_matches(string, '/banderas/(.*?).png')
 
     for lang in languages:
-        if lang == 'japvose':
+        if 'jap' in lang or lang not in IDIOMAS:
             lang = 'vos'
+					
         language.append(IDIOMAS[lang])
         title = '%s [%s]' % (title, IDIOMAS[lang])
 
@@ -226,6 +226,7 @@ def findvideos(item):
     itemlist = []
 
     data = get_source(item.url)
+
     patron = "<a href=([^ ]+) target=_blank><img src='/servidores/(.*?).(?:png|jpg)'.*?sno.*?"
     patron += "sno><span>(.*?)<.*?(/banderas.*?)td"
     matches = re.compile(patron, re.DOTALL).findall(data)