From 98a432fcf5b9ca28fa8dd159f995422a55f5c32e Mon Sep 17 00:00:00 2001
From: Alhaziel <tomas.massarenti@gmail.comm>
Date: Mon, 25 Mar 2019 19:23:16 +0100
Subject: [PATCH] Same Menu Apparence and auto thumb

---
 .../channels/altadefinizioneclick.py          | 21 +++--
 .../channels/altadefinizionehd.py             | 19 +++--
 plugin.video.alfa/channels/casacinema.py      | 48 +++++------
 plugin.video.alfa/channels/eurostreaming.py   | 14 ++--
 plugin.video.alfa/channels/seriehd.py         | 84 +++++++++++--------
 5 files changed, 104 insertions(+), 82 deletions(-)

diff --git a/plugin.video.alfa/channels/altadefinizioneclick.py b/plugin.video.alfa/channels/altadefinizioneclick.py
index e5141222..5ab1c0b5 100644
--- a/plugin.video.alfa/channels/altadefinizioneclick.py
+++ b/plugin.video.alfa/channels/altadefinizioneclick.py
@@ -7,11 +7,11 @@ import base64
 import re
 import urlparse
 
-from channels import autoplay
-from channels import filtertools, support
+from channels import autoplay, filtertools, support
 from core import scrapertools, servertools, httptools, tmdb
 from core.item import Item
 from platformcode import logger, config
+from channelselector import thumb, get_thumb
 
 host = "https://altadefinizione.center"   ### <- cambio Host da .fm a .center
 
@@ -31,33 +31,36 @@ def mainlist(item):
     autoplay.init(item.channel, list_servers, list_quality)
     itemlist = [
         Item(channel=item.channel,
-             title="[COLOR azure]Novita'[/COLOR]",
+             title="[B]Novità[/B]",
              action="fichas",
              url=host + "/nuove-uscite/",
              thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
         Item(channel=item.channel,
-             title="[COLOR azure]Film per Genere[/COLOR]",
+             title="[B] > Film per Genere[/B]",
              action="genere",
              url=host,
              thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
         Item(channel=item.channel,
-             title="[COLOR azure]Film per Anno[/COLOR]",
+             title="[B] > Film per Anno[/B]",
              action="anno",
              url=host,
              thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
         Item(channel=item.channel,
-             title="[COLOR azure]Film Sub-Ita[/COLOR]",
+             title="Film Sub-Ita",
              action="fichas",
              url=host + "/sub-ita/",
              thumbnail="http://i.imgur.com/qUENzxl.png"),
         Item(channel=item.channel,
-             title="[COLOR orange]Cerca...[/COLOR]",
+             title="[COLOR blue]Cerca Film...[/COLOR]",
              action="search",
              extra="movie",
              thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search")]
 
     autoplay.show_option(item.channel, itemlist)
 
+    # auto thumb
+    itemlist=thumb(itemlist) 
+
     return itemlist
 
 
@@ -167,7 +170,7 @@ def fichas(item):
                  action="fichas",
                  title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
                  url=next_page,
-                 thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png"))
+                 thumbnail=thumb()))
 
     return itemlist
 
@@ -212,7 +215,7 @@ def fichas_src(item):
                  action="fichas_src",
                  title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
                  url=next_page,
-                 thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png"))
+                 thumbnail=thumb(item)))
 
     return itemlist
 
diff --git a/plugin.video.alfa/channels/altadefinizionehd.py b/plugin.video.alfa/channels/altadefinizionehd.py
index 7c92df51..431ee445 100644
--- a/plugin.video.alfa/channels/altadefinizionehd.py
+++ b/plugin.video.alfa/channels/altadefinizionehd.py
@@ -9,6 +9,7 @@ from core import httptools, scrapertools, servertools, tmdb
 from platformcode import logger, config
 from core.item import Item
 from channels import autoplay
+from channelselector import thumb
 
 
 host = "https://altadefinizione.doctor"
@@ -31,14 +32,14 @@ def mainlist(item):
                      fanart=FilmFanart),
                 Item(channel=item.channel,
                      action="menu",
-                     title="[B] > Genere[/B]",
+                     title="[B] > Film per Genere[/B]",
                      url=host,
                      extra='GENERE',
                      thumbnail=NovitaThumbnail,
                      fanart=FilmFanart),
                 Item(channel=item.channel,
                      action="menu",
-                     title="[B] > Anno[/B]",
+                     title="[B] > Film per Anno[/B]",
                      url=host,
                      extra='ANNO',
                      thumbnail=NovitaThumbnail,
@@ -64,12 +65,14 @@ def mainlist(item):
                 Item(channel=item.channel,
                      action="search",
                      extra="movie",
-                     title="[B]Cerca...[/B]",
+                     title="[COLOR blue]Cerca Film...[/COLOR]",
                      thumbnail=CercaThumbnail,
                      fanart=FilmFanart)]
 
     autoplay.show_option(item.channel, itemlist)
 
+    itemlist = thumb(itemlist)
+
     return itemlist
 
 
@@ -163,8 +166,9 @@ def video(item):
         itemlist.append(
             Item(channel=item.channel,
                  action="video",
-                 title="[COLOR blue]" + config.get_localized_string(30992) + " >[/COLOR]",
-                 url=next_page))
+                 title="[COLOR blue]" + config.get_localized_string(30992) + "[/COLOR]",
+                 url=next_page,
+                 thumbnail=thumb()))
 
     return itemlist
 
@@ -199,8 +203,9 @@ def search_page(item):
             itemlist.append(
                 Item(channel=item.channel,
                     action="search_page",
-                    title="[COLOR blue]" + config.get_localized_string(30992) + " >[/COLOR]",
-                    url=next_page))
+                    title="[COLOR blue]" + config.get_localized_string(30992) + "[/COLOR]",
+                    url=next_page,
+                    thumbnail=thumb()))
     
         return itemlist    
 
diff --git a/plugin.video.alfa/channels/casacinema.py b/plugin.video.alfa/channels/casacinema.py
index a2d345dc..fd2cdaf4 100644
--- a/plugin.video.alfa/channels/casacinema.py
+++ b/plugin.video.alfa/channels/casacinema.py
@@ -9,6 +9,7 @@ from core import scrapertools, scrapertoolsV2, httptools, servertools, tmdb
 from channels import autoplay, filtertools, support
 from core.item import Item
 from platformcode import logger, config
+from channelselector import thumb, get_thumb
 
 
 host = 'https://www.casacinema.site'
@@ -30,49 +31,45 @@ def mainlist(item):
     autoplay.init(item.channel, list_servers, list_quality)
 
     itemlist = [Item(channel=item.channel,
-                     title="[COLOR azure]Film - Novita'[/COLOR]",
+                     title="[B]Film[/B]",
                      action="peliculas",
                      extra="movie",
-                     url="%s/genere/film" % host,
-                     thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
+                     url="%s/genere/film" % host),
                 Item(channel=item.channel,
-                     title="[COLOR azure]Film - HD[/COLOR]",
+                     title="[B]Film - HD[/B]",
                      action="peliculas",
                      extra="movie",
-                     url="%s/?s=[HD]" % host,
-                     thumbnail="http://jcrent.com/apple%20tv%20final/HD.png"),
+                     url="%s/?s=[HD]" % host),
                 Item(channel=item.channel,
-                     title="[COLOR azure]Categorie[/COLOR]",
+                     title="[B] > Categorie[/B]",
                      action="categorias",
                      extra="movie",
-                     url="%s/genere/film" % host,
-                     thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
+                     url="%s/genere/film" % host),
                 Item(channel=item.channel,
-                     title="[COLOR azure]Film Sub - Ita[/COLOR]",
+                     title="[B]Film Sub - Ita[/B]",
                      action="peliculas",
                      extra="movie",
-                     url="%s/genere/sub-ita" % host,
-                     thumbnail="http://i.imgur.com/qUENzxl.png"),
+                     url="%s/genere/sub-ita" % host),
                 Item(channel=item.channel,
-                     title="[COLOR yellow]Cerca...[/COLOR]",
+                     title="[COLOR blue]Cerca Film...[/COLOR]",
                      action="search",
-                     extra="movie",
-                     thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search"),
+                     extra="movie",),
                 Item(channel=item.channel,
-                     title="[COLOR azure]Serie TV[/COLOR]",
+                     title="[B]Serie TV[/B]",
                      extra="tvshow",
                      action="peliculas_tv",
-                     url="%s/genere/serie-tv" % host,
-                     thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
+                     url="%s/genere/serie-tv" % host),
                 Item(channel=item.channel,
-                     title="[COLOR yellow]Cerca Serie TV...[/COLOR]",
+                     title="[COLOR blue]Cerca Serie TV...[/COLOR]",
                      action="search",
-                     extra="tvshow",
-                     thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search")]
+                     extra="tvshow")]
 
     
     autoplay.show_option(item.channel, itemlist)
 
+    # auto thumb
+    itemlist=thumb(itemlist) 
+
     return itemlist
 
 
@@ -125,6 +122,7 @@ def peliculas(item):
 
     # Carica la pagina 
     data = httptools.downloadpage(item.url, headers=headers).data
+    logger.info('DATA=' +data)
 
     # Estrae i contenuti 
     patron = '<li><a href="([^"]+)"[^=]+="([^"]+)"><div>\s*<div[^>]+>(.*?)<'
@@ -161,16 +159,16 @@ def peliculas(item):
     tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
     ## Paginación
-    next_page = scrapertools.find_single_match(data, '<li><a href="([^"]+)">Pagina')  ### <- Regex rimosso spazio - precedente <li><a href="([^"]+)" >Pagina -> Continua. riga 221
+    next_page = scrapertools.find_single_match(data, '<li><a href="([^"]+)".*?>Pagina')
 
     if next_page != "":
         itemlist.append(
             Item(channel=item.channel,
                  action="peliculas",
-                 title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
+                 title="[COLOR blue]" + config.get_localized_string(30992) + " >[/COLOR]",
                  url=next_page,
                  extra=item.extra,
-                 thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png"))
+                 thumbnail=get_thumb('next.png')))
 
     return itemlist
 
@@ -227,7 +225,7 @@ def peliculas_tv(item):
                  title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
                  url=next_page,
                  extra=item.extra,
-                 thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png"))
+                 thumbnail=get_thumb('next.png')))
 
     return itemlist
 
diff --git a/plugin.video.alfa/channels/eurostreaming.py b/plugin.video.alfa/channels/eurostreaming.py
index aaa12b2a..9264b90b 100644
--- a/plugin.video.alfa/channels/eurostreaming.py
+++ b/plugin.video.alfa/channels/eurostreaming.py
@@ -10,6 +10,7 @@ from core import scrapertools, httptools, servertools, tmdb, scrapertoolsV2
 from core.item import Item
 from lib import unshortenit
 from platformcode import logger, config
+from channelselector import thumb
 
 host = "https://eurostreaming.one"
 list_servers = ['openload', 'speedvideo', 'wstream', 'streamango' 'flashx', 'nowvideo']
@@ -23,7 +24,7 @@ def mainlist(item):
     itemlist = [
         Item(
             channel=item.channel,
-            title="[COLOR azure]Serie TV[/COLOR]",
+            title="[B]Serie TV[/B]",
             action="serietv",
             extra="tvshow",
             url="%s/category/serie-tv-archive/" % host,
@@ -32,7 +33,7 @@ def mainlist(item):
         ),
         Item(
             channel=item.channel,
-            title="[COLOR azure]Anime / Cartoni[/COLOR]",
+            title="[B]Anime / Cartoni[/B]",
             action="serietv",
             extra="tvshow",
             url="%s/category/anime-cartoni-animati/" % host,
@@ -41,7 +42,7 @@ def mainlist(item):
         ),
         Item(
             channel=item.channel,
-            title="[COLOR yellow]Cerca...[/COLOR]",
+            title="[COLOR blue]Cerca...[/COLOR]",
             action="search",
             extra="tvshow",
             thumbnail=
@@ -50,6 +51,8 @@ def mainlist(item):
 
     autoplay.show_option(item.channel, itemlist)
 
+    itemlist = thumb(itemlist)
+
     return itemlist
 
 
@@ -99,10 +102,9 @@ def serietv(item):
             Item(
                 channel=item.channel,
                 action="serietv",
-                title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
+                title="[COLOR blue]" + config.get_localized_string(30992) + "[/COLOR]",
                 url=scrapedurl,
-                thumbnail=
-                "http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png",
+                thumbnail=thumb(),
                 extra=item.extra,
                 folder=True))
 
diff --git a/plugin.video.alfa/channels/seriehd.py b/plugin.video.alfa/channels/seriehd.py
index fdef6dd2..8e6cc7a3 100644
--- a/plugin.video.alfa/channels/seriehd.py
+++ b/plugin.video.alfa/channels/seriehd.py
@@ -2,21 +2,16 @@
 # ------------------------------------------------------------
 # Ringraziamo Icarus crew
 # Canale per seriehd
-# Alhaziel
 # ------------------------------------------------------------
 import base64
 import re
 import urlparse
 
-from channels import autoplay
-from channels import filtertools, support
-from core import scrapertools, servertools, httptools
+from channels import autoplay, filtertools, support
+from core import scrapertools, servertools, httptools, tmdb
 from platformcode import logger, config
 from core.item import Item
-from platformcode import config
-from core import tmdb
-
-__channel__ = "seriehd"
+from channelselector import thumb
 
 host = "https://www.seriehd.video"
 
@@ -38,22 +33,27 @@ def mainlist(item):
 
     itemlist = [Item(channel=item.channel,
                      action="fichas",
-                     title="[COLOR azure]Serie TV[/COLOR]",
-                     url=host + "/serie-tv-streaming/",
-                     thumbnail="http://i.imgur.com/rO0ggX2.png"),
-                Item(channel=__channel__,
+                     title="[B]Serie TV[/B]",
+                     url=host + "/serie-tv-streaming/"),
+                Item(channel=item.channel,
                      action="sottomenu",
-                     title="[COLOR orange]Categoria[/COLOR]",
-                     url=host,
-                     thumbnail="http://i.imgur.com/rO0ggX2.png"),
-                Item(channel=__channel__,
+                     title=" > Serie TV per Genere",
+                     url=host),
+                Item(channel=item.channel,
+                     action="nation",
+                     title=" > Serie TV per Nazione",
+                     url=host),
+                Item(channel=item.channel,
                      action="search",
                      extra="tvshow",
-                     title="[COLOR limegreen]Cerca...[/COLOR]",
+                     title="[COLOR blue]Cerca...[/COLOR]",
                      thumbnail="")]
 
     autoplay.show_option(item.channel, itemlist)
 
+    # auto thumb
+    itemlist=thumb(itemlist) 
+
     return itemlist
 
 
@@ -85,16 +85,32 @@ def sottomenu(item):
 
     for scrapedurl, scrapedtitle in matches:
         itemlist.append(
-            Item(channel=__channel__,
+            Item(channel=item.channel,
                  action="fichas",
                  title=scrapedtitle,
                  url=scrapedurl))
 
-    # Elimina 'Serie TV' de la lista de 'sottomenu'
+    # Elimina 'voci dal menu' de la lista de 'sottomenu'
     itemlist.pop(0)
+    itemlist.pop(0)
+    itemlist.pop(0)
+    itemlist.pop(28)
 
     return itemlist
 
+def nation(item):
+    itemlist = [Item(channel=item.channel,
+                     action="fichas",
+                     title="Serie TV Americane",
+                     url=host+'/serie-tv-streaming/serie-tv-americane/'),
+                Item(channel=item.channel,
+                     action="fichas",
+                     title="Serie TV Italiane",
+                     url=host+'/serie-tv-streaming/serie-tv-italiane/')]
+    # auto thumb
+    itemlist=thumb(itemlist) 
+
+    return itemlist
 
 def fichas(item):
     logger.info("[seriehd.py] fichas")
@@ -102,8 +118,8 @@ def fichas(item):
 
     data = httptools.downloadpage(item.url).data
 
-    patron = '<h2>(.*?)</h2>\s*'
-    patron += '<img src="([^"]+)" alt="[^"]*" />\s*'
+    patron = r'<h2>(.*?)</h2>\s*'
+    patron += r'<img src="([^"]+)" alt="[^"]*" />\s*'
     patron += '<A HREF="([^"]+)">'
 
     matches = re.compile(patron, re.DOTALL).findall(data)
@@ -112,7 +128,7 @@ def fichas(item):
         scrapedthumbnail = httptools.get_url_headers(scrapedthumbnail)
         scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip()
         itemlist.append(
-            Item(channel=__channel__,
+            Item(channel=item.channel,
                  action="episodios",
                  title="[COLOR azure]" + scrapedtitle + "[/COLOR]",
                  fulltitle=scrapedtitle,
@@ -120,14 +136,15 @@ def fichas(item):
                  show=scrapedtitle,
                  thumbnail=scrapedthumbnail))
 
-    patron = "<span class='current'>\d+</span><a rel='nofollow' class='page larger' href='([^']+)'>\d+</a>"
+    patron = r"<span class='current'>\d+</span><a rel='nofollow' class='page larger' href='([^']+)'>\d+</a>"
     next_page = scrapertools.find_single_match(data, patron)
     if next_page != "":
         itemlist.append(
-            Item(channel=__channel__,
+            Item(channel=item.channel,
                  action="fichas",
-                 title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
-                 url=next_page))
+                 title="[COLOR blue]" + config.get_localized_string(30992) + "[/COLOR]",
+                 url=next_page,
+                 thumbnali=thumb()))
 
     tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
     return itemlist
@@ -146,7 +163,7 @@ def episodios(item):
 
 
     section_stagione = scrapertools.find_single_match(data, '<h3>STAGIONE</h3><ul>(.*?)</ul>')
-    patron = '<li[^>]+><a href="([^"]+)">(\d+)<'
+    patron = r'<li[^>]+><a href="([^"]+)">(\d+)<'
     seasons = re.compile(patron, re.DOTALL).findall(section_stagione)
 
     for scrapedseason_url, scrapedseason in seasons:
@@ -155,7 +172,7 @@ def episodios(item):
         data = httptools.downloadpage(season_url).data.replace('\t', '').replace('\n', '').replace(' class="active"', '')
 
         section_episodio = scrapertools.find_single_match(data, '<h3>EPISODIO</h3><ul>(.*?)</ul>')
-        patron = '<a href="([^"]+)">(\d+)<'
+        patron = r'<a href="([^"]+)">(\d+)<'
         episodes = re.compile(patron, re.DOTALL).findall(section_episodio)
 
         for scrapedepisode_url, scrapedepisode in episodes:
@@ -164,7 +181,7 @@ def episodios(item):
             title = scrapedseason + "x" + scrapedepisode.zfill(2)
 
             itemlist.append(
-                Item(channel=__channel__,
+                Item(channel=item.channel,
                      action="findvideos",
                      contentType="episode",
                      title=title,
@@ -175,7 +192,7 @@ def episodios(item):
 
     if config.get_videolibrary_support() and len(itemlist) != 0:
         itemlist.append(
-            Item(channel=__channel__,
+            Item(channel=item.channel,
                  title="[COLOR lightblue]%s[/COLOR]" % config.get_localized_string(30161),
                  url=item.url,
                  action="add_serie_to_library",
@@ -205,11 +222,8 @@ def findvideos(item):
 
     autoplay.start(itemlist, item)
 
-    #if item.contentType != 'episode':
-        #if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
-            #itemlist.append(
-                #Item(channel=item.channel, title='[COLOR yellow][B]Aggiungi alla videoteca[/B][/COLOR]', url=item.url,
-                     #action="add_pelicula_to_library", extra="findvideos", contentTitle=item.contentTitle))
+    for item in itemlist:
+        logger.info('ITEM= ' +str(item))
 
     return itemlist