From b9059b3b5dcb270b9089d943d589308307cc5609 Mon Sep 17 00:00:00 2001
From: mrgaturus <mrgaturus@gmail.com>
Date: Tue, 29 May 2018 23:15:23 -0500
Subject: [PATCH 1/4] Solucionado mini-error en el buscador de cuevana2

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

diff --git a/plugin.video.alfa/channels/cuevana2.py b/plugin.video.alfa/channels/cuevana2.py
index 938a1bda..7f39807d 100644
--- a/plugin.video.alfa/channels/cuevana2.py
+++ b/plugin.video.alfa/channels/cuevana2.py
@@ -166,7 +166,7 @@ def searchMovies(itemlist, item, texto):
     #coloca las peliculas encontradas en la lista, improvisando do while
     next_page = True
     while next_page:
-        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:

From 19fd3ed29d549af15e84e0c82a458c9d0a3ce09c Mon Sep 17 00:00:00 2001
From: mrgaturus <mrgaturus@gmail.com>
Date: Wed, 30 May 2018 01:11:40 -0500
Subject: [PATCH 2/4] =?UTF-8?q?Mejoras=20en=20canales=20cuevana2=20y=20cue?=
 =?UTF-8?q?vana2espa=C3=B1ol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/cuevana2.py        | 28 +++++--------
 plugin.video.alfa/channels/cuevana2espanol.py | 40 +++++++++++++++++--
 2 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/plugin.video.alfa/channels/cuevana2.py b/plugin.video.alfa/channels/cuevana2.py
index 7f39807d..95b63fcb 100644
--- a/plugin.video.alfa/channels/cuevana2.py
+++ b/plugin.video.alfa/channels/cuevana2.py
@@ -21,18 +21,9 @@ 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 = []
+    # PELICULAS
+    itemlist.append(Item(channel = item.channel, title = "Peliculas", folder=False, 
+        thumbnail = get_thumb("movies", auto = True), text_bold=True))
 
     itemlist.append(Item(channel = item.channel, title = "Novedades", action = "movies", 
         url = host + "pelicula", thumbnail = get_thumb("newest", auto = True)))
@@ -42,18 +33,20 @@ def movies_menu(item):
         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
+    # SERIES
+    itemlist.append(Item(channel = item.channel, title = "Series", folder=False, 
+        thumbnail = get_thumb("tvshows", auto = True), text_bold=True))
 
-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)))
+
+    autoplay.show_option(item.channel, itemlist)
+
     return itemlist
 
 ### FIN MENUS ###
@@ -98,7 +91,8 @@ def episodes(item):
 
     matches = scrapertools.find_multiple_matches(data, seasonsPattern)
     for season, title in matches:
-        itemlist.append(Item(channel = item.channel, title="[COLOR blue]%s[/COLOR]" % title))
+        itemlist.append(Item(channel = item.channel, title="[COLOR blue]%s[/COLOR]" % title, 
+            folder=False, text_bold=True))
         episodeMatches = scrapertools.find_single_match(data, episodesPattern % season)
         put_episodes(itemlist, item, episodeMatches)
 
diff --git a/plugin.video.alfa/channels/cuevana2espanol.py b/plugin.video.alfa/channels/cuevana2espanol.py
index 318c01cc..0282210b 100644
--- a/plugin.video.alfa/channels/cuevana2espanol.py
+++ b/plugin.video.alfa/channels/cuevana2espanol.py
@@ -33,7 +33,9 @@ def mainlist(item):
         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 = "Busqueda", folder=False, text_bold=True))
+    itemlist.append(Item(channel = item.channel, title = "Por Letra", action = "letters",
+        url = host, thumbnail = get_thumb("letter", auto = True)))
     itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search", 
         url = host + "?s=", thumbnail = get_thumb("search", auto = True)))
 
@@ -82,6 +84,38 @@ def moviesIMDB(item):
 
     return itemlist
 
+def byLetter(item):
+    itemlist = []
+    letter = item.extra
+
+    pageForNonce = load_data(item.url)
+    nonce = scrapertools.find_single_match(pageForNonce, '"nonce":"([^"]+)"')
+    raw = httptools.downloadpage('http://cuevana2espanol.com/wp-json/dooplay/glossary/?term=%s&nonce=%s&type=all' % (letter, nonce)).data
+    json = jsontools.load(raw).items()
+    logger.info(nonce)
+
+    for movie in json:
+        data = movie[1]
+        itemTitle = data['title']
+        if 'year' in data:
+            itemTitle += " [COLOR blue](%s)[/COLOR]" % data['year'] 
+        if data['imdb']:
+            itemTitle += " [COLOR yellow](%s)[/COLOR]" % data['imdb']
+
+        itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=data['title'], url=data['url'], 
+            thumbnail=data['img'].replace('-90x135', ''), action="findvideos"))
+
+    return itemlist
+
+def letters(item):
+    itemlist = []
+    letter = '#ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+    for let in letter:
+        itemlist.append(item.clone(title=let, extra=let.lower(), action="byLetter"))
+
+    return itemlist
+
 def searchMovies(item):
     itemlist = []
 
@@ -94,8 +128,8 @@ def searchMovies(item):
     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 = item.channel, title=itemTitle, fulltitle=title, thumbnail=img,
+        fullimg = img.replace('-150x150', '')
+        itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=title, thumbnail=fullimg,
             url=link, plot=plot, action="findvideos"))
 
     next_page = scrapertools.find_single_match(data, 'href="([^"]+)" ><span class="icon-chevron-right">')

From 6f3f7093d097b13ee09832a66ddaf8f5f87a987c Mon Sep 17 00:00:00 2001
From: mrgaturus <mrgaturus@gmail.com>
Date: Wed, 30 May 2018 01:27:40 -0500
Subject: [PATCH 3/4] =?UTF-8?q?Colocar=20iconos=20faltantes=20en=20cuevana?=
 =?UTF-8?q?2espa=C3=B1ol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/cuevana2espanol.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/channels/cuevana2espanol.py b/plugin.video.alfa/channels/cuevana2espanol.py
index 0282210b..db33fafe 100644
--- a/plugin.video.alfa/channels/cuevana2espanol.py
+++ b/plugin.video.alfa/channels/cuevana2espanol.py
@@ -33,9 +33,10 @@ def mainlist(item):
         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 = "Busqueda", folder=False, text_bold=True))
+    itemlist.append(Item(channel = item.channel, title = "Busqueda", folder=False, text_bold=True,
+        thumbnail = get_thumb("search", auto = True)))
     itemlist.append(Item(channel = item.channel, title = "Por Letra", action = "letters",
-        url = host, thumbnail = get_thumb("letter", auto = True)))
+        url = host, thumbnail = get_thumb("alphabet", auto = True)))
     itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search", 
         url = host + "?s=", thumbnail = get_thumb("search", auto = True)))
 

From af974ea65314297dd089ed1f3cf4b1ce5ca8f91b Mon Sep 17 00:00:00 2001
From: mrgaturus <mrgaturus@gmail.com>
Date: Wed, 30 May 2018 01:44:56 -0500
Subject: [PATCH 4/4] C2ES/Buscar por letra: No mostrar error de kodi si no hay
 resultados

---
 plugin.video.alfa/channels/cuevana2espanol.py | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugin.video.alfa/channels/cuevana2espanol.py b/plugin.video.alfa/channels/cuevana2espanol.py
index db33fafe..368eaf18 100644
--- a/plugin.video.alfa/channels/cuevana2espanol.py
+++ b/plugin.video.alfa/channels/cuevana2espanol.py
@@ -92,19 +92,19 @@ def byLetter(item):
     pageForNonce = load_data(item.url)
     nonce = scrapertools.find_single_match(pageForNonce, '"nonce":"([^"]+)"')
     raw = httptools.downloadpage('http://cuevana2espanol.com/wp-json/dooplay/glossary/?term=%s&nonce=%s&type=all' % (letter, nonce)).data
-    json = jsontools.load(raw).items()
+    json = jsontools.load(raw)
     logger.info(nonce)
+    if 'error' not in json:
+        for movie in json.items():
+            data = movie[1]
+            itemTitle = data['title']
+            if 'year' in data:
+                itemTitle += " [COLOR blue](%s)[/COLOR]" % data['year'] 
+            if data['imdb']:
+                itemTitle += " [COLOR yellow](%s)[/COLOR]" % data['imdb']
 
-    for movie in json:
-        data = movie[1]
-        itemTitle = data['title']
-        if 'year' in data:
-            itemTitle += " [COLOR blue](%s)[/COLOR]" % data['year'] 
-        if data['imdb']:
-            itemTitle += " [COLOR yellow](%s)[/COLOR]" % data['imdb']
-
-        itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=data['title'], url=data['url'], 
-            thumbnail=data['img'].replace('-90x135', ''), action="findvideos"))
+            itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=data['title'], url=data['url'], 
+                thumbnail=data['img'].replace('-90x135', ''), action="findvideos"))
 
     return itemlist