Merge branch 'master' of github.com:kodiondemand/addon

channels/autorenumber.py

@@ -44,11 +44,25 @@ def config_item(item):
     tvdb.find_and_set_infoLabels(item)
     data = ''
     data = add_season(data)
-    if not item.infoLabels['tvdb_id']:
+    title = item.show
-        heading = 'TVDB ID'
+    count = 0
-        item.infoLabels['tvdb_id'] = platformtools.dialog_numeric(0, heading)
+    
+    while not item.infoLabels['tvdb_id']:
+        try:
+            item.show = platformtools.dialog_input(default=item.show, heading=config.get_localized_string(30112))
+            tvdb.find_and_set_infoLabels(item)
+            count = count + 1
+        except:
+            heading = config.get_localized_string(70704)
+            item.infoLabels['tvdb_id'] = platformtools.dialog_numeric(0, heading)
     data.append(item.infoLabels['tvdb_id'])
-    write_data(item.from_channel, item.show, data)
+    if item.infoLabels['tvdb_id'] != 0:
+        write_data(item.from_channel, title, data)
+    else:
+        message = config.get_localized_string(60444)
+        heading = item.show.strip()
+        platformtools.dialog_notification(heading, message)
+
 
 
 def add_season(data=None):
@@ -59,6 +73,7 @@ def add_season(data=None):
     if season != "":
         heading = config.get_localized_string(70687)
         episode = platformtools.dialog_numeric(0, heading)
+
         if episode == "0":
             heading = config.get_localized_string(70688)
             special = platformtools.dialog_numeric(0, heading)
@@ -92,6 +107,8 @@ def write_data(channel, show, data):
     heading = show.strip()
     platformtools.dialog_notification(heading, message)
 
+
+
 def renumber(itemlist, item='', typography=''):    
     log()
 
@@ -118,7 +135,7 @@ def renumber(itemlist, item='', typography=''):
                             if E == 0: 
                                 epList.append([0, SP])
                                 E = 1
-                            if episodes['airedEpisodeNumber'] >= E:
+                            if episodes['airedEpisodeNumber'] >= E or episodes['airedSeason'] > S:
                                 epList.append([episodes['airedSeason'], episodes['airedEpisodeNumber']])
                     page = page + 1
                 else:

channels/support.py

@@ -372,7 +372,8 @@ def menu(itemlist, title='', action='', url='', contentType='movie', args=[]):
 
 def typo(string, typography=''):
 
-    kod_color = '0xFF0081C2'
+    kod_color = '0xFF65B3DA' #'0xFF0081C2'
+
 
     # Check if the typographic attributes are in the string or outside
     if typography:
@@ -381,7 +382,7 @@ def typo(string, typography=''):
         string = string + ' >'
 
     # If there are no attributes, it applies the default ones
-    attribute = ['[]','()','{}','submenu','color','bold','italic','_','[B]','[I]','[COLOR]']
+    attribute = ['[]','()','{}','submenu','color','bold','italic','_','--','[B]','[I]','[COLOR]']
 
     movie_word_list = ['film', 'serie', 'tv', 'anime', 'cinema', 'sala']
     search_word_list = ['cerca']
@@ -415,6 +416,8 @@ def typo(string, typography=''):
             string = '[I]' + re.sub(r'\sitalic','',string) + '[/I]' 
         if '_' in string:
             string = ' ' + re.sub(r'\s_','',string)
+        if '--' in string:
+            string = ' - ' + re.sub(r'\s--','',string)
 
     return string
 
@@ -448,7 +451,7 @@ def videolibrary(itemlist, item, typography=''):
         action = 'add_serie_to_library'
         extra = 'episodios'
         contentType = 'tvshow'
-
+    if not typography: typography = 'color kod bold'
     title = typo(config.get_localized_string(30161) + ' ' + typography)
     if inspect.stack()[1][3] == 'findvideos' and contentType == 'movie' or inspect.stack()[1][3] != 'findvideos' and contentType != 'movie':
         if config.get_videolibrary_support() and len(itemlist) > 0:
@@ -493,11 +496,8 @@ def server(item, data='', headers='', AutoPlay=True, CheckLinks=True):
 
     if not data:
         data = httptools.downloadpage(item.url, headers=headers).data
-    ## fix by greko
-    data = str(item.url)
-    ## FINE fix by greko
         
-    itemlist = servertools.find_video_items(data=data)
+    itemlist = servertools.find_video_items(data=str(data))
 
     for videoitem in itemlist:
         videoitem.title = "".join([item.title, ' ', typo(videoitem.title, 'color kod []')])

core/servertools.py

@@ -727,13 +727,13 @@ def check_video_link(url, server, timeout=3):
     :return: str(2) '??':No se ha podido comprobar. 'Ok':Parece que el link funciona. 'NO':Parece que no funciona.
     """
 
-    # NK = "[COLOR 0xFFF9B613][B]" + u"\u25cf" + "[/B][/COLOR]"
+    NK = "[COLOR 0xFFF9B613][B]" + u"\u25cf".encode('utf-8') + "[/B][/COLOR]"
-    # OK = "[COLOR 0xFF00C289][B]" + u"\u25cf" + "[/B][/COLOR]"
+    OK = "[COLOR 0xFF00C289][B]" + u"\u25cf".encode('utf-8') + "[/B][/COLOR]"
-    # KO = "[COLOR 0xFFC20000][B]" + u"\u25cf" + "[/B][/COLOR]"
+    KO = "[COLOR 0xFFC20000][B]" + u"\u25cf".encode('utf-8') + "[/B][/COLOR]"
 
-    NK = "[COLOR 0xFFF9B613][B]O[/B][/COLOR]"
+    # NK = "[COLOR 0xFFF9B613][B]O[/B][/COLOR]"
-    OK = "[COLOR 0xFF00C289][B]O[/B][/COLOR]"
+    # OK = "[COLOR 0xFF00C289][B]O[/B][/COLOR]"
-    KO = "[COLOR 0xFFC20000][B]O[/B][/COLOR]"
+    # KO = "[COLOR 0xFFC20000][B]O[/B][/COLOR]"
 
     try:
         server_module = __import__('servers.%s' % server, None, None, ["servers.%s" % server])

resources/language/Italian/strings.po

@@ -721,6 +721,14 @@ msgctxt "#60055"
 msgid "Error of provider configuration in BD."
 msgstr "Errore di configurazione del provider in BD."
 
+msgctxt "#60056"
+msgid "Videolibrary %s not configured"
+msgstr "Videoteca %s non configurata"
+
+msgctxt "#60057"
+msgid "Videolibrary %s configured"
+msgstr "Videoteca %s configurata"
+
 msgctxt "#60058"
 msgid "You need to restart Kodi for the changes to take effect."
 msgstr "E' necessario riavviare Kodi affinchè le modifiche abbiano effetto."
@@ -729,6 +737,10 @@ msgctxt "#60059"
 msgid "Congratulations, Kodi's video library has been configured correctly."
 msgstr "Complimenti, la videoteca di Kodi è stata configurata correttamente."
 
+msgctxt "#60060"
+msgid "KOD Auto-configuration"
+msgstr "KOD Auto-configurazione"
+
 msgctxt "#60062"
 msgid "Adding movies to your video library..."
 msgstr "Aggiunta film alla videoteca..."
@@ -786,8 +798,8 @@ msgid "No coincidence"
 msgstr "Nessuna coincidenza"
 
 msgctxt "#60076"
-msgid "New quality/server available in \nConfiguration"
+msgid "New quality/server available in configuration"
-msgstr "Nuova qualità/server disponibile in \nConfigurazione"
+msgstr "Nuova qualità/server disponibile in configurazione"
 
 msgctxt "#60077"
 msgid "AutoPlay initialization error"
@@ -1886,7 +1898,7 @@ msgid "Uploading new data"
 msgstr "Caricamento nuovi dati"
 
 msgctxt "#60470"
-msgid "Buscando en Tmdb......."
+msgid "Searching in Tmdb......."
 msgstr "Ricerca in Tmdb......."
 
 msgctxt "#60471"
@@ -2334,7 +2346,7 @@ msgid " - Settings created"
 msgstr "- Impostazioni create"
 
 msgctxt "#60589"
-msgid "-  - No correction necessary"
+msgid " - No correction necessary"
 msgstr " - Nessuna correzione necessaria"
 
 msgctxt "#60590"
@@ -2754,7 +2766,7 @@ msgid "Search for actor"
 msgstr "Cerca attore"
 
 msgctxt "#70012"
-msgid "Beginnin"
+msgid "Beginning"
 msgstr "Inizio"
 
 msgctxt "#70013"
@@ -2794,12 +2806,12 @@ msgid "Search in TMDB"
 msgstr "Cerca in TMDB"
 
 msgctxt "#70022"
-msgid "        - Movies"
+msgid " - Movies"
-msgstr "        - Film"
+msgstr " - Film"
 
 msgctxt "#70023"
-msgid "        - TV Shows"
+msgid " - TV Shows"
-msgstr "        - Serie TV"
+msgstr " - Serie TV"
 
 msgctxt "#70024"
 msgid "Search in Filmaffinity"
@@ -2902,23 +2914,23 @@ msgid " My Account"
 msgstr " Il Mio Account"
 
 msgctxt "#70049"
-msgid "     Most Popular"
+msgid "Most Popular"
 msgstr "Più Popolari"
 
 msgctxt "#70050"
-msgid "     Recommended Now"
+msgid "Recommended Now"
 msgstr "Da Vedere"
 
 msgctxt "#70051"
-msgid "     Most Anticipated "
+msgid "Most Anticipated "
 msgstr "Più Attesi"
 
 msgctxt "#70052"
-msgid "     Custom recommendations"
+msgid "Custom recommendations"
 msgstr "Raccomandazioni personalizzate"
 
 msgctxt "#70053"
-msgid "     Most Viewed"
+msgid "Most Viewed"
 msgstr "Più Visti"
 
 msgctxt "#70054"
@@ -2982,11 +2994,11 @@ msgid "In my Collection"
 msgstr "Nella mia Collezione"
 
 msgctxt "#70069"
-msgid "Search %s in kod: %s"
+msgid "Search %s in KOD: %s"
-msgstr "Cerca %s in kod: %s"
+msgstr "Cerca %s in KOD: %s"
 
 msgctxt "#70070"
-msgid "    Search original title: %s"
+msgid "Search original title: %s"
 msgstr "Cerca il titolo originale: %s"
 
 msgctxt "#70071"
@@ -2994,8 +3006,8 @@ msgid "Cast"
 msgstr "Vedi Cast"
 
 msgctxt "#70072"
-msgid "     Most Viewed"
+msgid "Most Viewed"
-msgstr " Più Viste"
+msgstr "Più Viste"
 
 msgctxt "#70073"
 msgid "Most Anticipated"
@@ -3014,7 +3026,7 @@ msgid "Top rated"
 msgstr "Più Votate"
 
 msgctxt "#70077"
-msgid "     Most Viewed"
+msgid "Most Viewed"
 msgstr "Più Viste"
 
 msgctxt "#70078"
@@ -3495,7 +3507,7 @@ msgstr "Vuoi annullare il processo?"
 
 msgctxt "#70200"
 msgid "Finishing and deleting data"
-msgstr Fine e cancellazione dati"
+msgstr "Fine e cancellazione dati"
 
 msgctxt "#70201"
 msgid "Mass Testing Tools"
@@ -3841,7 +3853,6 @@ msgctxt "#70291"
 msgid "Error, during conversion"
 msgstr "Errore, in conversione"
 
-# Servers ---- 
 msgctxt "#70292"
 msgid "[%s] File no longer exist on this server."
 msgstr "[%s] Il file non è più presente nel server."
@@ -3893,7 +3904,6 @@ msgstr "[%s] Questo server non funziona con la tua versione di Plex, prova ad ag
 msgctxt "#70304"
 msgid "[%s] This server requires updating python to version 2.7.9 or higher."
 msgstr "[%s] Questo server richiede la versione 2.7.9 (O Maggiore) di Python."
-# ============
 
 msgctxt "#70305"
 msgid "Search in channels"
@@ -4060,7 +4070,7 @@ msgid "[Trakt] Remove %s from your collection"
 msgstr "[Trakt] Rimuovi %s dalla tua collezione"
 
 msgctxt "#70346"
-msgid "[Trakt] Add %s to your collection
+msgid "[Trakt] Add %s to your collection"
 msgstr "[Trakt] Aggiungi %s alla tua collezione"
 
 msgctxt "#70347"
@@ -5017,7 +5027,7 @@ msgstr "Configura la rinumerazione della serie..."
 
 msgctxt "#70587"
 msgid "Set up"
-msgstr ""
+msgstr "Configurazione"
 
 msgctxt "#70588"
 msgid "No series found, look for a series and click on contextual menu"
@@ -5100,8 +5110,8 @@ msgid "List informations"
 msgstr "Informazioni lista"
 
 msgctxt "#70608"
-msgid "Liste dei link"
+msgid "Link lists"
-msgstr "Listas de enlaces"
+msgstr "Liste dei link"
 
 msgctxt "#70609"
 msgid "File_id of tinyupload link"
@@ -5388,7 +5398,7 @@ msgstr "Aggiungi un canale"
 
 msgctxt "#70677"
 msgid "Episode"
-msgstr "%sx%s - Episodio %s"
+msgstr "Episodio"
 
 msgctxt "#70678"
 msgid "From local file"
@@ -5431,8 +5441,8 @@ msgid "Enter the number of the starting episode"
 msgstr "Inserisci il numero dell'episodio di partenza"
 
 msgctxt "#70688"
-msgid "Episode 0 is a special episode, enter the number of this episode"
+msgid "Episode 0 is a special episode, enter the number of this episode (0 to skip it)"
-msgstr "L'episodio 0 è un episodio speciale, inserisci il numero di questo episodio"
+msgstr "L'episodio 0 è un episodio speciale, inserisci il numero di questo episodio (0 per saltare)"
 
 msgctxt "#70689"
 msgid "Enable Download"
@@ -5488,4 +5498,8 @@ msgstr "Riavvia Kodi per applicare le modifiche"
 
 msgctxt "#70703"
 msgid "Create directories with lowercase letters"
-msgstr "Crea cartelle con le lettere minuscole"
+msgstr "Crea cartelle con le lettere minuscole"
+
+msgctxt "#70704"
+msgid "TMDB ID (0 to cancel)"
+msgstr "TMDB ID (0 per annullare)"

servers/decrypters/zcrypt.py

@@ -70,7 +70,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
             else:
                 logger.info("  url duplicada=" + url)
 
-    patron = r"""(https?://(?:www\.)?(?:threadsphere\.bid|adf\.ly|q\.gs|j\.gs|u\.bb|ay\.gy|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|adfoc\.us|lnx\.lu|sh\.st|href\.li|anonymz\.com|shrink-service\.it|rapidcrypt\.netz|ecleneue\.com)/[^"']+)"""
+    patron = r"""(https?://(?:www\.)?(?:threadsphere\.bid|adf\.ly|q\.gs|j\.gs|u\.bb|ay\.gy|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|adfoc\.us|lnx\.lu|sh\.st|href\.li|anonymz\.com|shrink-service\.it|rapidcrypt\.net|ecleneue\.com)/[^"']+)"""
 
     logger.info(" find_videos #" + patron + "#")
     matches = re.compile(patron).findall(page_url)