Merge branch 'master' of github.com:kodiondemand/plugin.video.alfa

channels/altadefinizione01.py

@@ -114,7 +114,7 @@ def peliculas(item):
         fulltitle = scrapedtitle
         if subDiv:
             fulltitle += support.typo(subText + ' _ () color limegreen')
-        fulltitle += support.typo(scrapedquality.strip()+ ' _ [] color blue')
+        fulltitle += support.typo(scrapedquality.strip()+ ' _ [] color kod')
 
         itemlist.append(
             Item(channel=item.channel,
@@ -158,6 +158,6 @@ def findvideos(item):
     # Requerido para AutoPlay
     autoplay.start(itemlist, item)
 
-    support.videolibrary(itemlist, item, 'color blue')
+    support.videolibrary(itemlist, item, 'color kod')
 
     return itemlist

channels/altadefinizioneclick.py

@@ -104,6 +104,6 @@ def findvideos(item):
     itemlist = filtertools.get_links(itemlist, item, list_language)
 
     autoplay.start(itemlist, item)
-    support.videolibrary(itemlist, item ,'color blue bold')
+    support.videolibrary(itemlist, item ,'color kod bold')
 
     return itemlist

channels/animeworld.py

@@ -30,12 +30,12 @@ def mainlist(item):
     
     itemlist =[]
     
-    support.menu(itemlist, '[B] > Anime ITA[/B]', 'build_menu', host+'/filter?language[]=1')
+    support.menu(itemlist, 'Anime ITA submenu bold', 'build_menu', host+'/filter?language[]=1')
-    support.menu(itemlist, '[B] > Anime SUB[/B]', 'build_menu', host+'/filter?language[]=0')
+    support.menu(itemlist, 'Anime SUB submenu bold', 'build_menu', host+'/filter?language[]=0')
-    support.menu(itemlist, ' > Anime A-Z', 'alfabetico', host+'/az-list')
+    support.menu(itemlist, 'Anime A-Z sub', 'alfabetico', host+'/az-list')
     support.menu(itemlist, 'Anime - Ultimi Aggiunti', 'alfabetico', host+'/newest')
     support.menu(itemlist, 'Anime - Ultimi Episodi', 'alfabetico', host+'/newest')
-    support.menu(itemlist, '[COLOR blue]Cerca...[/COLOR]', 'search')
+    support.menu(itemlist, 'Cerca...', 'search')
 
     
     autoplay.init(item.channel, list_servers, list_quality)
@@ -52,9 +52,7 @@ def build_menu(item):
                     channel=item.channel,
                     action="video",
                     title="[B]Tutti[/B]",
-                    url=item.url,
+                    url=item.url))
-                    thumbnail=CategoriaThumbnail,
-                    fanart=CategoriaFanart))
 
     data = httptools.downloadpage(item.url).data
     data = re.sub(r'\n|\t','',data)
@@ -73,7 +71,9 @@ def build_menu(item):
                  fulltitle=title,
                  show=title,
                  url=item.url,
-                 html=html))
+                 html=html,
+                 thumbnail=item.thumbnail,
+                 fanart=item.fanart))
 
     # Elimina FLingua dal Menu
     itemlist.pop(6)
@@ -413,13 +413,3 @@ def findvideos(item):
     return itemlist
 
 
-
-# riferimenti di servizio ====================================================
-AnimeThumbnail = "http://img15.deviantart.net/f81c/i/2011/173/7/6/cursed_candies_anime_poster_by_careko-d3jnzg9.jpg"
-AnimeFanart = "https://i.ytimg.com/vi/IAlbvyBdYdY/maxresdefault.jpg"
-CategoriaThumbnail = "http://static.europosters.cz/image/750/poster/street-fighter-anime-i4817.jpg"
-CategoriaFanart = "https://i.ytimg.com/vi/IAlbvyBdYdY/maxresdefault.jpg"
-CercaThumbnail = "http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search"
-CercaFanart = "https://i.ytimg.com/vi/IAlbvyBdYdY/maxresdefault.jpg"
-AvantiTxt = config.get_localized_string(30992)
-AvantiImg = "http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png"

channels/autorenumber.py

@@ -110,6 +110,9 @@ def renumber(itemlist, item='', typography=''):
                 if data:
                     for episodes in data['data']:
                         if episodes['airedSeason'] >= S:
+                            if E == 0: 
+                                epList.append(str(episodes['airedSeason']) + 'x0')
+                                E = 1
                             if episodes['airedEpisodeNumber'] >= E:
                                 epList.append(str(episodes['airedSeason']) + 'x' + str(episodes['airedEpisodeNumber']))
                     page = page + 1

channels/cineblog01.py

@@ -45,13 +45,13 @@ def mainlist(item):
     support.menu(itemlist, 'HD submenu', 'menu', host, args="Film HD Streaming")
     support.menu(itemlist, 'Per genere submenu', 'menu', host, args="Film per Genere")
     support.menu(itemlist, 'Per anno submenu', 'menu', host, args="Film per Anno")
-    support.menu(itemlist, 'Cerca... submenu color blue', 'search', host, args='film')
+    support.menu(itemlist, 'Cerca... submenu', 'search', host, args='film')
 
     support.menu(itemlist, 'Serie TV bold', 'peliculas', host + '/serietv/', contentType='episode')
     support.menu(itemlist, 'Per Lettera submenu', 'menu', host + '/serietv/', contentType='episode', args="Serie-Tv per Lettera")
     support.menu(itemlist, 'Per Genere submenu', 'menu', host + '/serietv/', contentType='episode', args="Serie-Tv per Genere")
     support.menu(itemlist, 'Per anno submenu', 'menu', host + '/serietv/', contentType='episode', args="Serie-Tv per Anno")
-    support.menu(itemlist, 'Cerca... submenu color blue', 'search', host + '/serietv/', contentType='episode', args='serie')
+    support.menu(itemlist, 'Cerca... submenu', 'search', host + '/serietv/', contentType='episode', args='serie')
     
     autoplay.show_option(item.channel, itemlist)
 

channels/seriehd.py

@@ -122,7 +122,7 @@ def episodios(item):
                      show=item.show,
                      thumbnail=item.thumbnail))
 
-    support.videolibrary(itemlist, item, 'color blue bold')
+    support.videolibrary(itemlist, item, 'color kod bold')
 
     return itemlist
 

channels/serietvonline.py

@@ -25,8 +25,8 @@ def mainlist(item):
     logger.info(item.channel + 'mainlist')
 
     itemlist = web_menu()
-    support.menu(itemlist, "Cerca Film... color blue", 'search', '', 'movie')
+    support.menu(itemlist, "Cerca Film... color kod", 'search', '', 'movie')
-    support.menu(itemlist, "Cerca Serie... color blue", 'search', '', 'episode')
+    support.menu(itemlist, "Cerca Serie... color kod", 'search', '', 'episode')
 
     autoplay.init(item.channel, list_servers, list_quality)
     autoplay.show_option(item.channel, itemlist)
@@ -149,7 +149,7 @@ def episodios(item):
                  title=title,
                  url=episode))
 
-    support.videolibrary(itemlist,item,'bold color blue')
+    support.videolibrary(itemlist,item,'bold color kod')
 
     return itemlist
 

channels/side_menu.py

@@ -116,9 +116,9 @@ class Main(xbmcgui.WindowXMLDialog):
         selected = 'selected0.png'
         width = 260
         height = 30
-        textcolor = "0xffffd700"
+        textcolor = "0xFFCCCCCC"
-        conditional_textcolor = "0xffff3030"
+        conditional_textcolor = "0xFF0081C2"
-        shadow = "0xFF000000"
+        shadow = "0x00000000"
         offsetx = 30
         offsety = 5
         font = 'font25_title'

channels/support.py

@@ -358,6 +358,8 @@ def menu(itemlist, title='', action='', url='', contentType='movie', args=[]):
 
 def typo(string, typography=''):
 
+    kod_color = '0xFF0081C2'
+
     # Check if the typographic attributes are in the string or outside
     if typography:
         string = string + ' ' + typography
@@ -373,7 +375,7 @@ def typo(string, typography=''):
 
     if not any(word in string for word in attribute):
         if any(word in string.lower() for word in search_word_list):
-            string = '[COLOR blue]' + string + '[/COLOR]'
+            string = '[COLOR '+ kod_color +']' + string + '[/COLOR]'
         elif any(word in string.lower() for word in categories_word_list):
             string = ' > ' + string
         elif any(word in string.lower() for word in movie_word_list):
@@ -391,6 +393,7 @@ def typo(string, typography=''):
             string = ' > ' + re.sub(r'\ssubmenu','',string)
         if 'color' in string:
             color = scrapertoolsV2.find_single_match(string,'color ([a-z]+)')
+            if color == 'kod' or '': color = kod_color
             string = '[COLOR '+ color +']' + re.sub(r'\scolor\s([a-z]+)','',string) + '[/COLOR]'
         if 'bold' in string:
             string = '[B]' + re.sub(r'\sbold','',string) + '[/B]'
@@ -456,7 +459,7 @@ def nextPage(itemlist, item, data, patron, function_level=1):
             Item(channel=item.channel,
                  action=inspect.stack()[function_level][3],
                  contentType=item.contentType,
-                 title=typo(config.get_localized_string(30992), 'color blue bold'),
+                 title=typo(config.get_localized_string(30992), 'color kod bold'),
                  url=next_page,
                  args=item.args,
                  thumbnail=thumb()))
@@ -472,7 +475,7 @@ def server(item, data='', headers=''):
     itemlist = servertools.find_video_items(data=data)
 
     for videoitem in itemlist:
-        videoitem.title = "".join([item.title, ' ', typo(videoitem.title, 'color blue []')])
+        videoitem.title = "".join([item.title, ' ', typo(videoitem.title, 'color kod []')])
         videoitem.fulltitle = item.fulltitle
         videoitem.show = item.show
         videoitem.thumbnail = item.thumbnail

channels/url.json

@@ -1,8 +1,8 @@
 {
   "id": "url",
-  "name": "Tengo una URL",
+  "name": "URL",
   "active": false,
   "adult": false,
-  "thumbnail": "tengourl.png",
+  "thumbnail": "url.png",
-  "banner": "tengourl.png"
+  "banner": "url.png"
 }

channelselector.py

@@ -224,28 +224,6 @@ def filterchannels(category, view="thumb_"):
     return channelslist
 
 
-# def get_thumb(thumb_name, view="thumb_", auto=False):
-
-#     if auto:
-#         thumbnail = ''
-
-#         thumb_name = unify.set_genre(unify.simplify(thumb_name))
-
-
-#         if thumb_name in thumb_dict:
-#             thumbnail = thumb_dict[thumb_name]
-#         return thumbnail
-#     else:
-#         icon_pack_name = config.get_setting('icon_set', default="default")
-#         if icon_pack_name == "default":
-#             resource_path = os.path.join(config.get_runtime_path(), "resources", "media", "themes")
-#         else:
-#             resource_path = "https://raw.githubusercontent.com/alfa-addon/media/master/themes/"
-
-#         media_path = os.path.join(resource_path, icon_pack_name)
-
-#         return os.path.join(media_path, view + thumb_name)
-
 def get_thumb(thumb_name, view="thumb_", auto=False):
 
     if auto:
@@ -261,19 +239,16 @@ def get_thumb(thumb_name, view="thumb_", auto=False):
     else:
         icon_pack_name = config.get_setting('icon_set', default="default")
 
-        if auto_filter(True) == 'ita' and icon_pack_name == "default":
-            icon_pack_name = 'default_ita'
-
         resource_path = os.path.join(config.get_runtime_path(), "resources", "media", "themes")
         media_path = os.path.join(resource_path, icon_pack_name)
 
         if config.get_setting('enable_custom_theme') and config.get_setting('custom_theme') and os.path.isfile(config.get_setting('custom_theme') + view + thumb_name):
             media_path = config.get_setting('custom_theme')
 
-        elif os.path.isdir(media_path) == False:
+        # elif os.path.isdir(media_path) == False:
-            media_path = os.path.join("https://raw.githubusercontent.com/alfa-addon/media/master/themes/", icon_pack_name)
+        #     media_path = os.path.join("https://raw.githubusercontent.com/alfa-addon/media/master/themes/", icon_pack_name)
-        else:
+        
-            media_path = os.path.join(resource_path, icon_pack_name)
+        media_path = os.path.join(resource_path, icon_pack_name)
         
 
         return os.path.join(media_path, view + thumb_name)
@@ -287,17 +262,12 @@ def set_channel_info(parameters):
     content = ''
     langs = parameters['language']
     lang_dict = {'ita':'Italiano',
-                 'lat':'Latino',
+                 '*':'Italiano, VOSI, VO'}
-                 'cast':'Castellano',
-                 'esp':'Latino, Castellano, VOSE, VO',
-                 '*':'Latino, Castellano, VOSE, VO'}
     for lang in langs:
         if 'vos' in parameters['categories']:
             lang = '*'
         if 'vosi' in parameters['categories']:
             lang = 'ita'
-        if 'vose' in parameters['categories']:
-            lang = 'esp'
 
         if lang in lang_dict:
             if language != '' and language != '*' and not parameters['adult']:
@@ -326,10 +296,7 @@ def auto_filter(auto_lang=False):
     def_lang = addon.getSetting('language')
     lang = 'all'
 
-    lang_dict = {'ita':'it',
+    lang_dict = {'ita':'it'}
-                 'esp':'es',
-                 'cast':'eu-ES',
-                 'lat':'es-MX'}
   
     if config.get_setting("channel_language") == 'auto' or auto_lang == True:
         for langs, variant in lang_dict.items():

resources/language/English/strings.po

@@ -3122,7 +3122,7 @@ msgid "Congratulations, the Kodi video library has been configured correctly."
 msgstr ""
 
 msgctxt "#70105"
-msgid "Do you want KOD to automatically configure the Kodi library?You will be asked to set up scrapers for movies and series."
+msgid "Do you want KOD to automatically configure the Kodi library? You will be asked to set up scrapers for movies and series."
 msgstr ""
 
 msgctxt "#70106"
@@ -8118,7 +8118,7 @@ msgid "Congratulations, the Kodi video library has been configured correctly."
 msgstr ""
 
 msgctxt "#70105"
-msgid "Do you want KOD to automatically configure the Kodi library?You will be asked to set up scrapers for movies and series."
+msgid "Do you want KOD to automatically configure the Kodi library? You will be asked to set up scrapers for movies and series."
 msgstr ""
 
 msgctxt "#70106"

resources/language/Italian/strings.po

@@ -3114,8 +3114,8 @@ msgid "Congratulations, the Kodi video library has been configured correctly."
 msgstr "Complimenti, la videoteca di Kodi è stata configurata correttamente."
 
 msgctxt "#70105"
-msgid "Do you want KOD to automatically configure the Kodi library?You will be asked to set up scrapers for movies and series."
+msgid "Do you want KOD to automatically configure the Kodi library? You will be asked to set up scrapers for movies and series."
-msgstr "Vuoi che KOD auto-configuri la videoteca di Kodi?Ti verrà chiesto di installare i providers info per film e serie tv."
+msgstr "Vuoi che KOD auto-configuri la videoteca di Kodi? Ti verrà chiesto di installare i providers info per film e serie tv."
 
 msgctxt "#70106"
 msgid "If you choose 'No' you can do it later from 'Configuration > Preferences > Paths'."