diff --git a/core/channeltools.py b/core/channeltools.py index 610ac19f..abbfea73 100644 --- a/core/channeltools.py +++ b/core/channeltools.py @@ -364,7 +364,7 @@ def set_channel_setting(name, value, channel): file_settings = os.path.join(config.get_data_path(), "settings_channels", channel + "_data.json") dict_settings = {} - def_settings = get_default_settings(channel) + if channel not in ['trakt']: def_settings = get_default_settings(channel) dict_file = None diff --git a/core/trakt_tools.py b/core/trakt_tools.py index 0669e89a..b5b842fb 100644 --- a/core/trakt_tools.py +++ b/core/trakt_tools.py @@ -3,19 +3,14 @@ # -*- Created for Alfa-addon -*- # -*- By the Alfa Develop Group -* -import os +import os, xbmc +from core import httptools, jsontools +from core.item import Item +from platformcode import config, logger from threading import Thread -import xbmc - -from core import httptools -from core import jsontools -from core.item import Item -from platformcode import config -from platformcode import logger - -client_id = "c40ba210716aee87f6a9ddcafafc56246909e5377b623b72c15909024448e89d" -client_secret = "999164f25832341f0214453bb11c915adb18e9490d6b5e9a707963a5a1bee43e" +client_id = "404dac2771a60701f1b4e2ec0e9515ece058ec47a66cffce1480aaa022e0aee9" +client_secret = " ad7c56c19f8a633441b3011a7b228c74977deb2eb2749fb5b022f2dc0c96473a" def auth_trakt(): @@ -29,7 +24,7 @@ def auth_trakt(): post = jsontools.dump(post) # Se solicita url y código de verificación para conceder permiso a la app url = "http://api-v2launch.trakt.tv/oauth/device/code" - data = httptools.downloadpage(url, post=post, headers=headers, replace_headers=True).data + data = httptools.downloadpage(url, post=post, headers=headers).data data = jsontools.load(data) item.verify_url = data["verification_url"] item.user_code = data["user_code"] @@ -63,12 +58,12 @@ def token_trakt(item): post = {'refresh_token': refresh, 'client_id': client_id, 'client_secret': client_secret, 'redirect_uri': 'urn:ietf:wg:oauth:2.0:oob', 'grant_type': 'refresh_token'} post = jsontools.dump(post) - data = httptools.downloadpage(url, post, headers, replace_headers=True).data + data = httptools.downloadpage(url, post=post, headers=headers).data data = jsontools.load(data) elif item.action == "token_trakt": url = "http://api-v2launch.trakt.tv/oauth/device/token" post = "code=%s&client_id=%s&client_secret=%s" % (item.device_code, client_id, client_secret) - data = httptools.downloadpage(url, post, headers, replace_headers=True).data + data = httptools.downloadpage(url, post=post, headers=headers).data data = jsontools.load(data) else: import time @@ -89,7 +84,7 @@ def token_trakt(item): url = "http://api-v2launch.trakt.tv/oauth/device/token" post = {'code': item.device_code, 'client_id': client_id, 'client_secret': client_secret} post = jsontools.dump(post) - data = httptools.downloadpage(url, post, headers, replace_headers=True).data + data = httptools.downloadpage(url, post=post, headers=headers).data data = jsontools.load(data) if "access_token" in data: # Código introducido, salimos del bucle @@ -169,7 +164,7 @@ def get_trakt_watched(id_type, mediatype, update=False): if token_auth: headers.append(['Authorization', "Bearer %s" % token_auth]) url = "https://api.trakt.tv/sync/watched/%s" % mediatype - data = httptools.downloadpage(url, headers=headers, replace_headers=True).data + data = httptools.downloadpage(url, headers=headers).data watched_dict = jsontools.load(data) if mediatype == 'shows': @@ -214,7 +209,7 @@ def trakt_check(itemlist): if not synced: get_sync_from_file() synced = True - + mediatype = 'movies' id_type = 'tmdb' diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 3f4f83c2..e839c241 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -1495,11 +1495,11 @@ msgid "Go to the Main Menu" msgstr "" msgctxt "#60350" -msgid "[COLOR yellow]Search in other channels[/COLOR]" -msgstr "[COLOR yellow]Search in other channels[/COLOR]" +msgid "Search in other channels" +msgstr "Search in other channels" msgctxt "#60351" -msgid "[COLOR 0xffccff00]Set as Homepage[/COLOR]" +msgid "Set as Homepage" msgstr "" msgctxt "#60352" @@ -1627,11 +1627,11 @@ msgid "AutoPlay" msgstr "" msgctxt "#60392" -msgid "\n\n\nTotal Reset of the addon %s.\n\n[COLOR red]Attention This function completely resets the addon.[/COLOR]" +msgid "\n\n\nTotal Reset of the addon %s.\n\nAttention This function completely resets the addon." msgstr "" msgctxt "#60393" -msgid "[COLOR red]Reset %s[/COLOR]" +msgid "Reset %s" msgstr "" msgctxt "#60394" @@ -1679,19 +1679,19 @@ msgid "Choose cache setting" msgstr "" msgctxt "#60405" -msgid "\n[COLOR orange]Cache Set for 512 Mega RAM[/COLOR]" +msgid "\nCache Set for 512 Mega RAM" msgstr "" msgctxt "#60406" -msgid "\n[COLOR orange]Cache Set for 1 Gb RAM[/COLOR]" +msgid "\nCache Set for 1 Gb RAM" msgstr "" msgctxt "#60407" -msgid "\n[COLOR orange]Cache Set for 2 Gb RAM[/COLOR]" +msgid "\nCache Set for 2 Gb RAM" msgstr "" msgctxt "#60408" -msgid "\n[COLOR orange]Cache Set higher than 2 Gb of RAM[/COLOR]" +msgid "\nCache Set higher than 2 Gb of RAM" msgstr "" msgctxt "#60409" @@ -1711,15 +1711,15 @@ msgid "Choose channels to include" msgstr "" msgctxt "#60413" -msgid "[COLOR yellow]New Movie Search...[/COLOR]" +msgid "New Movie Search..." msgstr "" msgctxt "#60414" -msgid "[COLOR yellow]New search tv series...[/COLOR]" +msgid "New search tv series..." msgstr "" msgctxt "#60415" -msgid "[COLOR green]Other settings[/COLOR]" +msgid "Other settings" msgstr "" msgctxt "#60416" @@ -1727,7 +1727,7 @@ msgid "Delete saved searches" msgstr "" msgctxt "#60417" -msgid "[COLOR red]Delete search history[/COLOR]" +msgid "Delete search history" msgstr "" msgctxt "#60418" @@ -1775,7 +1775,7 @@ msgid "FILTER: Delete '%s'" msgstr "" msgctxt "#60429" -msgid "[COLOR %s]Filter configuration for TV series...[/COLOR]" +msgid "Filter configuration for TV series..." msgstr "" msgctxt "#60430" @@ -1795,7 +1795,7 @@ msgid " (disabled)" msgstr "" msgctxt "#60434" -msgid "Configure [COLOR %s][%s][/COLOR]%s" +msgid "Configure [%s]%s" msgstr "" msgctxt "#60435" @@ -1823,7 +1823,7 @@ msgid "Permitted quality" msgstr "" msgctxt "#60441" -msgid "Filter links for: [COLOR %s]%s[/COLOR]" +msgid "Filter links for: %s" msgstr "" msgctxt "#60442" @@ -1831,7 +1831,7 @@ msgid "Are you sure you want to delete the filter?" msgstr "" msgctxt "#60443" -msgid "Click 'Yes' to remove the filter from [COLOR %s]%s[/COLOR], click 'No' or close the window to do nothing." +msgid "Click 'Yes' to remove the filter from %s, click 'No' or close the window to do nothing." msgstr "" msgctxt "#60444" @@ -1963,7 +1963,7 @@ msgid "Filmaffinity recording......." msgstr "" msgctxt "#60476" -msgid "[COLOR yellow][B]There is no information about this movie...[/B][/COLOR]" +msgid "[B]There is no information about this movie...[/B]" msgstr "" msgctxt "#60477" @@ -1971,11 +1971,11 @@ msgid "Important recommendations......." msgstr "" msgctxt "#60478" -msgid "[COLOR aquamarine][B]Completated %s[/B][/COLOR]" +msgid "[B]Completated %s[/B]" msgstr "" msgctxt "#60479" -msgid "[COLOR aquamarine][B]In progress %s[/B][/COLOR]" +msgid "[B]In progress %s[/B]" msgstr "" msgctxt "#60480" @@ -1995,11 +1995,11 @@ msgid "Picture collection on FANART.TV" msgstr "" msgctxt "#60484" -msgid "[COLOR red][B]Update Kodi to its latest version[/B][/COLOR]" +msgid "[B]Update Kodi to its latest version[/B]" msgstr "" msgctxt "#60485" -msgid "[COLOR skyblue]for detailed info[/COLOR]" +msgid "for detailed info" msgstr "" msgctxt "#60486" @@ -2015,31 +2015,31 @@ msgid "No information..." msgstr "" msgctxt "#60489" -msgid "[COLOR limegreen][B]Production company: [/B][/COLOR]" +msgid "[B]Production company: [/B]" msgstr "" msgctxt "#60490" -msgid "[COLOR limegreen][B]Country: [/B][/COLOR]" +msgid "[B]Country: [/B]" msgstr "" msgctxt "#60491" -msgid "[COLOR limegreen][B]Preview: [/B][/COLOR]" +msgid "[B]Preview: [/B]" msgstr "" msgctxt "#60492" -msgid "[COLOR limegreen][B]Seasons/Episodes: [/B][/COLOR]" +msgid "[B]Seasons/Episodes: [/B]" msgstr "" msgctxt "#60493" -msgid "[COLOR orange][B]Is there the tv series you're looking for?[/B][/COLOR]" +msgid "[B]Is there the tv series you're looking for?[/B]" msgstr "" msgctxt "#60494" -msgid "[COLOR orange][B]Is there the movie you are looking for?[/B][/COLOR]" +msgid "[B]Is there the movie you are looking for?[/B]" msgstr "" msgctxt "#60495" -msgid "[COLOR tomato][B]Close[/B][/COLOR]" +msgid "[B]Close[/B]" msgstr "" msgctxt "#60496" @@ -2051,7 +2051,7 @@ msgid "Wait........" msgstr "" msgctxt "#60498" -msgid "[COLOR orange][B]Select...[/B][/COLOR]" +msgid "[B]Select...[/B]" msgstr "" msgctxt "#60499" @@ -2063,7 +2063,7 @@ msgid "Nothing to play" msgstr "" msgctxt "#60501" -msgid "[COLOR orange][B]Department[/B][/COLOR]" +msgid "[B]Department[/B]" msgstr "" msgctxt "#60502" @@ -2079,19 +2079,19 @@ msgid "No information" msgstr "" msgctxt "#60505" -msgid "[COLOR rosybrown]Uploading filmography...[/COLOR]" +msgid "Uploading filmography..." msgstr "" msgctxt "#60506" -msgid "[COLOR plum]Picture collection...[/COLOR]" +msgid "Picture collection..." msgstr "" msgctxt "#60507" -msgid "[COLOR crimson][B]Error[/B][/COLOR]" +msgid "[B]Error[/B]" msgstr "" msgctxt "#60508" -msgid "[COLOR tomato]Video not available[/COLOR]" +msgid "Video not available" msgstr "" msgctxt "#60509" @@ -2287,7 +2287,7 @@ msgid "Saving configuration...%s" msgstr "" msgctxt "#60560" -msgid " - [COLOR red] CORRECTED!![/COLOR]" +msgid " - CORRECTED!!" msgstr "" msgctxt "#60561" @@ -2331,7 +2331,7 @@ msgid " | Error Detail: %s" msgstr "" msgctxt "#60571" -msgid " - [COLOR red] Default settings cannot be loaded![/COLOR]" +msgid " - Default settings cannot be loaded!" msgstr "" msgctxt "#60572" @@ -2411,7 +2411,7 @@ msgid "All channels" msgstr "" msgctxt "#60595" -msgid " [COLOR grey](Default disabled)[/COLOR]" +msgid " (Default disabled)" msgstr "" msgctxt "#60596" @@ -2839,7 +2839,7 @@ msgid "Documentary" msgstr "" msgctxt "#70020" -msgid "[COLOR yellow]Search similar[/COLOR]" +msgid "Search similar" msgstr "" msgctxt "#70021" @@ -3751,7 +3751,7 @@ msgid "Check the log in %s for more details." msgstr "" msgctxt "#70252" -msgid "[COLOR mediumturquoise][B]Duration: %s minutes[/B][/COLOR]" +msgid "[B]Duration: %s minutes[/B]" msgstr "" msgctxt "#70253" @@ -4727,7 +4727,7 @@ msgid "Genre: " msgstr "" msgctxt "#70500" -msgid "Notification([COLOR red][B]Update Kodi to its latest version[/B][/COLOR], [COLOR skyblue]for best info[/COLOR],8000, 'http://i.imgur.com/mHgwcn3.png')" +msgid "Notification([B]Update Kodi to its latest version[/B], for best info,8000, 'http://i.imgur.com/mHgwcn3.png')" msgstr "" msgctxt "#70501" @@ -4783,11 +4783,11 @@ msgid "Manual Search in Jayhap" msgstr "" msgctxt "#70515" -msgid "[COLOR aquamarine][B]Completed %s[/B][/COLOR]" +msgid "[B]Completed %s[/B]" msgstr "" msgctxt "#70516" -msgid "[COLOR aquamarine][B]In progress %s[/B][/COLOR]" +msgid "[B]In progress %s[/B]" msgstr "" msgctxt "#70517" @@ -5127,7 +5127,7 @@ msgid "Update from the Internet:" msgstr "" msgctxt "#70602" -msgid "The first season that is added always starts in \"0 \" episodes, the second season that is added starts in the total number of episodes of the first season, the third season will be the sum of the episodes of the previous seasons and so on.\n [COLOR blue] \nSerial example divided into several seasons: \n\nFairy Tail: \n - SEASON 1: EPISODE 48 -> [season 1, episode: 0] \n - SEASON 2: EPISODE 48 - -> [season 2, episode: 48] \n - SEASON 3: EPISODE 54 -> [season 3, episode: 96 ([48 = season2] + [48 = season1])] \n - SEASON 4: EPISODE 175 -> [season 4: episode: 150 ([54 = season3] + [48 = season2] + [48 = season3])] [/COLOR] \n [COLOR green] \nExample of a series that continues in the season of the original: \n \nFate / Zero 2nd Season: \n - SEASON 1: EPISODE 12 -> [season 1, episode: 13] [/COLOR] \n [COLOR blue] \nExample example which is the second Season of the original: \n \nFate / kaleid liner Prism☆Illya 2wei!: \n - SEASON 1: EPISODE 12 -> [season 2, episode: 0] [/COLOR] \n" +msgid "The first season that is added always starts in \"0 \" episodes, the second season that is added starts in the total number of episodes of the first season, the third season will be the sum of the episodes of the previous seasons and so on.\n \nSerial example divided into several seasons: \n\nFairy Tail: \n - SEASON 1: EPISODE 48 -> [season 1, episode: 0] \n - SEASON 2: EPISODE 48 - -> [season 2, episode: 48] \n - SEASON 3: EPISODE 54 -> [season 3, episode: 96 ([48 = season2] + [48 = season1])] \n - SEASON 4: EPISODE 175 -> [season 4: episode: 150 ([54 = season3] + [48 = season2] + [48 = season3])] \n \nExample of a series that continues in the season of the original: \n \nFate / Zero 2nd Season: \n - SEASON 1: EPISODE 12 -> [season 1, episode: 13] \n \nExample example which is the second Season of the original: \n \nFate / kaleid liner Prism☆Illya 2wei!: \n - SEASON 1: EPISODE 12 -> [season 2, episode: 0] \n" msgstr "" msgctxt "#70603" diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index 3b771397..3092b32e 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -1494,12 +1494,12 @@ msgid "Go to the Main Menu" msgstr "Andare al Menu Principale" msgctxt "#60350" -msgid "[COLOR yellow]Search in other channels[/COLOR]" -msgstr "[COLOR yellow]Cerca negli altri canali[/COLOR]" +msgid "Search in other channels" +msgstr "Cerca negli altri canali" msgctxt "#60351" -msgid "[COLOR 0xffccff00]Set as Homepage[/COLOR]" -msgstr "[COLOR 0xffccff00]Impostare come Homepage[/COLOR]" +msgid "Set as Homepage" +msgstr "Impostare come Homepage" msgctxt "#60352" msgid "Add TV Series to Videolibrary" @@ -1626,12 +1626,12 @@ msgid "AutoPlay" msgstr "AutoPlay" msgctxt "#60392" -msgid "\n\n\nTotal Reset of the addon %s.\n\n[COLOR red]Attention This function completely resets the addon.[/COLOR]" -msgstr "\n\n\nReset totale dell'addon %s.\n\n[COLOR red]Attenzione questa funzione resetta totalmente l'addon.[/COLOR]" +msgid "\n\n\nTotal Reset of the addon %s.\n\nAttention This function completely resets the addon." +msgstr "\n\n\nReset totale dell'addon %s.\n\nAttenzione questa funzione resetta totalmente l'addon." msgctxt "#60393" -msgid "[COLOR red]Reset %s[/COLOR]" -msgstr "[COLOR red]Reset %s[/COLOR]" +msgid "Reset %s" +msgstr "Reset %s" msgctxt "#60394" msgid "Reset %s" @@ -1678,20 +1678,20 @@ msgid "Choose cache setting" msgstr "Scegli settaggio cache" msgctxt "#60405" -msgid "\n[COLOR orange]Cache Set for 512 Mega RAM[/COLOR]" -msgstr "\n[COLOR orange]Cache Impostata per 512 Mega di RAM[/COLOR]" +msgid "\nCache Set for 512 Mega RAM" +msgstr "\nCache Impostata per 512 Mega di RAM" msgctxt "#60406" -msgid "\n[COLOR orange]Cache Set for 1 Gb RAM[/COLOR]" -msgstr "\n[COLOR orange]Cache Impostata per 1 Gb di RAM[/COLOR]" +msgid "\nCache Set for 1 Gb RAM" +msgstr "\nCache Impostata per 1 Gb di RAM" msgctxt "#60407" -msgid "\n[COLOR orange]Cache Set for 2 Gb RAM[/COLOR]" -msgstr "\n[COLOR orange]Cache Impostata per 2 Gb di RAM[/COLOR]" +msgid "\nCache Set for 2 Gb RAM" +msgstr "\nCache Impostata per 2 Gb di RAM" msgctxt "#60408" -msgid "\n[COLOR orange]Cache Set higher than 2 Gb of RAM[/COLOR]" -msgstr "\n[COLOR orange]Cache Impostata superiore a 2 Gb di RAM[/COLOR]" +msgid "\nCache Set higher than 2 Gb of RAM" +msgstr "\nCache Impostata superiore a 2 Gb di RAM" msgctxt "#60409" msgid "plugin" @@ -1710,24 +1710,24 @@ msgid "Choose channels to include" msgstr "Scegli i canali da includere" msgctxt "#60413" -msgid "[COLOR yellow]New Movie Search...[/COLOR]" -msgstr "[COLOR yellow]Nuova ricerca film...[/COLOR]" +msgid "New Movie Search..." +msgstr "Nuova ricerca film..." msgctxt "#60414" -msgid "[COLOR yellow]New search tv series...[/COLOR]" -msgstr "[COLOR yellow]Nuova ricerca serie tv...[/COLOR]" +msgid "New search tv series..." +msgstr "Nuova ricerca serie tv..." msgctxt "#60415" -msgid "[COLOR green]Other settings[/COLOR]" -msgstr "[COLOR green]Altre impostazioni[/COLOR]" +msgid "Other settings" +msgstr "Altre impostazioni" msgctxt "#60416" msgid "Delete saved searches" msgstr "Cancella ricerche salvate" msgctxt "#60417" -msgid "[COLOR red]Delete search history[/COLOR]" -msgstr "[COLOR red]Elimina cronologia ricerche[/COLOR]" +msgid "Delete search history" +msgstr "Elimina cronologia ricerche" msgctxt "#60418" msgid "Choose channels to include in your search" @@ -1774,8 +1774,8 @@ msgid "FILTER: Delete '%s'" msgstr "FILTRO: Eliminare '%s'" msgctxt "#60429" -msgid "[COLOR %s]Filter configuration for TV series...[/COLOR]" -msgstr "[COLOR %s]Configura filtro per serie tv...[/COLOR]" +msgid "Filter configuration for TV series..." +msgstr "Configura filtro per serie tv..." msgctxt "#60430" msgid "FILTRO: Delete '%s'" @@ -1794,8 +1794,8 @@ msgid " (disabled)" msgstr " (disattivato)" msgctxt "#60434" -msgid "Configure [COLOR %s][%s][/COLOR]%s" -msgstr "Configurare [COLOR %s][%s][/COLOR]%s" +msgid "Configure [%s]%s" +msgstr "Configurare [%s]%s" msgctxt "#60435" msgid "There are no filters, search for a TV series and click on the context menu 'FILTER: Configure'" @@ -1822,16 +1822,16 @@ msgid "Permitted quality" msgstr "Qualità consentita" msgctxt "#60441" -msgid "Filter links for: [COLOR %s]%s[/COLOR]" -msgstr "Filtro link per: [COLOR %s]%s[/COLOR]" +msgid "Filter links for: %s" +msgstr "Filtro link per: %s" msgctxt "#60442" msgid "Are you sure you want to delete the filter?" msgstr "Sei sicuro di voler eliminare il filtro?" msgctxt "#60443" -msgid "Click 'Yes' to remove the filter from [COLOR %s]%s[/COLOR], click 'No' or close the window to do nothing." -msgstr "Clicca 'Sì' per rimuovere il filtro da [COLOR %s]%s[/COLOR], Clicca 'No' o chiudere la finestra per non fare nulla." +msgid "Click 'Yes' to remove the filter from %s, click 'No' or close the window to do nothing." +msgstr "Clicca 'Sì' per rimuovere il filtro da %s, Clicca 'No' o chiudere la finestra per non fare nulla." msgctxt "#60444" msgid "FILTER DELETED" @@ -1962,20 +1962,20 @@ msgid "Filmaffinity recording......." msgstr "Registrazione filmaffinity......." msgctxt "#60476" -msgid "[COLOR yellow][B]There is no information about this movie...[/B][/COLOR]" -msgstr "[COLOR yellow][B]Non ci sono informazioni su questo film...[/B][/COLOR]" +msgid "[B]There is no information about this movie...[/B]" +msgstr "[B]Non ci sono informazioni su questo film...[/B]" msgctxt "#60477" msgid "Important recommendations......." msgstr "Raccomandazioni importanti......." msgctxt "#60478" -msgid "[COLOR aquamarine][B]Completated %s[/B][/COLOR]" -msgstr "[COLOR aquamarine][B]Completata %s[/B][/COLOR]" +msgid "[B]Completated %s[/B]" +msgstr "[B]Completata %s[/B]" msgctxt "#60479" -msgid "[COLOR aquamarine][B]In progress %s[/B][/COLOR]" -msgstr "[COLOR aquamarine][B]In corso %s[/B][/COLOR]" +msgid "[B]In progress %s[/B]" +msgstr "[B]In corso %s[/B]" msgctxt "#60480" msgid "(Seasons: %s)" @@ -1994,12 +1994,12 @@ msgid "Picture collection on FANART.TV" msgstr "Raccolta di immagini su FANART.TV" msgctxt "#60484" -msgid "[COLOR red][B]Update Kodi to its latest version[/B][/COLOR]" -msgstr "[COLOR red][B]Aggiorna Kodi alla sua ultima versione[/B][/COLOR]" +msgid "[B]Update Kodi to its latest version[/B]" +msgstr "[B]Aggiorna Kodi alla sua ultima versione[/B]" msgctxt "#60485" -msgid "[COLOR skyblue]for detailed info[/COLOR]" -msgstr "[COLOR skyblue]per info dettagliate[/COLOR]" +msgid "for detailed info" +msgstr "per info dettagliate" msgctxt "#60486" msgid "Uploading new information" @@ -2014,32 +2014,32 @@ msgid "No information..." msgstr "Nessuna informazione..." msgctxt "#60489" -msgid "[COLOR limegreen][B]Production company: [/B][/COLOR]" -msgstr "[COLOR limegreen][B]Compagnia di produzione: [/B][/COLOR]" +msgid "[B]Production company: [/B]" +msgstr "[B]Compagnia di produzione: [/B]" msgctxt "#60490" -msgid "[COLOR limegreen][B]Country: [/B][/COLOR]" -msgstr "[COLOR limegreen][B]Nazione: [/B][/COLOR]" +msgid "[B]Country: [/B]" +msgstr "[B]Nazione: [/B]" msgctxt "#60491" -msgid "[COLOR limegreen][B]Preview: [/B][/COLOR]" -msgstr "[COLOR limegreen][B]Anteprima: [/B][/COLOR]" +msgid "[B]Preview: [/B]" +msgstr "[B]Anteprima: [/B]" msgctxt "#60492" -msgid "[COLOR limegreen][B]Seasons/Episodes: [/B][/COLOR]" -msgstr "[COLOR limegreen][B]Stagioni/Episodi: [/B][/COLOR]" +msgid "[B]Seasons/Episodes: [/B]" +msgstr "[B]Stagioni/Episodi: [/B]" msgctxt "#60493" -msgid "[COLOR orange][B]Is there the tv series you're looking for?[/B][/COLOR]" -msgstr "[COLOR orange][B]C'è la serie che cerchi?[/B][/COLOR]" +msgid "[B]Is there the tv series you're looking for?[/B]" +msgstr "[B]C'è la serie che cerchi?[/B]" msgctxt "#60494" -msgid "[COLOR orange][B]Is there the movie you are looking for?[/B][/COLOR]" -msgstr "[COLOR orange][B]C'è il film che stai cercando?[/B][/COLOR]" +msgid "[B]Is there the movie you are looking for?[/B]" +msgstr "[B]C'è il film che stai cercando?[/B]" msgctxt "#60495" -msgid "[COLOR tomato][B]Close[/B][/COLOR]" -msgstr "[COLOR tomato][B]Chiudere[/B][/COLOR]" +msgid "[B]Close[/B]" +msgstr "[B]Chiudere[/B]" msgctxt "#60496" msgid "Loading results" @@ -2050,8 +2050,8 @@ msgid "Wait........" msgstr "Attendere........" msgctxt "#60498" -msgid "[COLOR orange][B]Select...[/B][/COLOR]" -msgstr "[COLOR orange][B]Seleziona...[/B][/COLOR]" +msgid "[B]Select...[/B]" +msgstr "[B]Seleziona...[/B]" msgctxt "#60499" msgid "plugin" @@ -2062,8 +2062,8 @@ msgid "Nothing to play" msgstr "Nulla da riprodurre" msgctxt "#60501" -msgid "[COLOR orange][B]Department[/B][/COLOR]" -msgstr "[COLOR orange][B]Reparto[/B][/COLOR]" +msgid "[B]Department[/B]" +msgstr "[B]Reparto[/B]" msgctxt "#60502" msgid "Uploading new data" @@ -2078,20 +2078,20 @@ msgid "No information" msgstr "Nessuna informazione" msgctxt "#60505" -msgid "[COLOR rosybrown]Uploading filmography...[/COLOR]" -msgstr "[COLOR rosybrown]Caricamento filmografia...[/COLOR]" +msgid "Uploading filmography..." +msgstr "Caricamento filmografia..." msgctxt "#60506" -msgid "[COLOR plum]Picture collection...[/COLOR]" -msgstr "[COLOR plum]Raccolta di immagini...[/COLOR]" +msgid "Picture collection..." +msgstr "Raccolta di immagini..." msgctxt "#60507" -msgid "[COLOR crimson][B]Error[/B][/COLOR]" -msgstr "[COLOR crimson][B]Errore[/B][/COLOR]" +msgid "[B]Error[/B]" +msgstr "[B]Errore[/B]" msgctxt "#60508" -msgid "[COLOR tomato]Video not available[/COLOR]" -msgstr "[COLOR tomato]Video non disponibile[/COLOR]" +msgid "Video not available" +msgstr "Video non disponibile" msgctxt "#60509" msgid "Movies" @@ -2286,8 +2286,8 @@ msgid "Saving configuration...%s" msgstr "Salvataggio configurazione...%s" msgctxt "#60560" -msgid " - [COLOR red] CORRECTED!![/COLOR]" -msgstr " - [COLOR red] CORRETTO!![/COLOR]" +msgid " - CORRECTED!!" +msgstr " - CORRETTO!!" msgctxt "#60561" msgid "Saving configuration..." @@ -2330,8 +2330,8 @@ msgid " | Error Detail: %s" msgstr " | Dettaglio dell' errore: %s" msgctxt "#60571" -msgid " - [COLOR red] Default settings cannot be loaded![/COLOR]" -msgstr " - [COLOR red] Non è possibile caricare le impostazioni di default![/COLOR]" +msgid " - Default settings cannot be loaded!" +msgstr " - Non è possibile caricare le impostazioni di default!" msgctxt "#60572" msgid "Ask" @@ -2410,8 +2410,8 @@ msgid "All channels" msgstr "Tutti i canali" msgctxt "#60595" -msgid " [COLOR grey](Default disabled)[/COLOR]" -msgstr " [COLOR grey](Disattivato di default)[/COLOR]" +msgid " (Default disabled)" +msgstr " (Disattivato di default)" msgctxt "#60596" msgid "Channels" @@ -2838,8 +2838,8 @@ msgid "Documentary" msgstr "Documentari" msgctxt "#70020" -msgid "[COLOR yellow]Search similar[/COLOR]" -msgstr "[COLOR yellow]Cerca simili[/COLOR]" +msgid "Search similar" +msgstr "Cerca simili" msgctxt "#70021" msgid "Search in TMDB" @@ -3750,8 +3750,8 @@ msgid "Check the log in %s for more details." msgstr "Controllare il log in %s per maggiori dettagli." msgctxt "#70252" -msgid "[COLOR mediumturquoise][B]Duration: %s minutes[/B][/COLOR]" -msgstr "[COLOR mediumturquoise][B]Durata: %s minuti[/B][/COLOR]" +msgid "[B]Duration: %s minutes[/B]" +msgstr "[B]Durata: %s minuti[/B]" msgctxt "#70253" msgid "Torrent client settings" @@ -4726,8 +4726,8 @@ msgid "Genre: " msgstr "Genere: " msgctxt "#70500" -msgid "Notification([COLOR red][B]Update Kodi to its latest version[/B][/COLOR], [COLOR skyblue]for best info[/COLOR],8000, 'http://i.imgur.com/mHgwcn3.png')" -msgstr "Notification([COLOR red][B]Aggiorna Kodi alla sua ultima versione[/B][/COLOR], [COLOR skyblue]per migliori info[/COLOR],8000, 'http://i.imgur.com/mHgwcn3.png')" +msgid "Notification([B]Update Kodi to its latest version[/B], for best info,8000, 'http://i.imgur.com/mHgwcn3.png')" +msgstr "Notification([B]Aggiorna Kodi alla sua ultima versione[/B], per migliori info,8000, 'http://i.imgur.com/mHgwcn3.png')" msgctxt "#70501" msgid "Search did not match (%s)" @@ -4782,12 +4782,12 @@ msgid "Manual Search in Jayhap" msgstr "Ricerca Manuale in Jayhap" msgctxt "#70515" -msgid "[COLOR aquamarine][B]Completed %s[/B][/COLOR]" -msgstr "[COLOR aquamarine][B]Completata %s[/B][/COLOR]" +msgid "[B]Completed %s[/B]" +msgstr "[B]Completata %s[/B]" msgctxt "#70516" -msgid "[COLOR aquamarine][B]In progress %s[/B][/COLOR]" -msgstr "[COLOR aquamarine][B]In Corso %s[/B][/COLOR]" +msgid "[B]In progress %s[/B]" +msgstr "[B]In Corso %s[/B]" msgctxt "#70517" msgid "Pre-selected currently activated" @@ -5126,8 +5126,8 @@ msgid "Update from the Internet:" msgstr "Aggiorna da Internet" msgctxt "#70602" -msgid "The first season that is added always starts in \"0 \" episodes, the second season that is added starts in the total number of episodes of the first season, the third season will be the sum of the episodes of the previous seasons and so on.\n [COLOR blue] \nSerial example divided into several seasons: \n\nFairy Tail: \n - SEASON 1: EPISODE 48 -> [season 1, episode: 0] \n - SEASON 2: EPISODE 48 - -> [season 2, episode: 48] \n - SEASON 3: EPISODE 54 -> [season 3, episode: 96 ([48 = season2] + [48 = season1])] \n - SEASON 4: EPISODE 175 -> [season 4: episode: 150 ([54 = season3] + [48 = season2] + [48 = season3])] [/COLOR] \n [COLOR green] \nExample of a series that continues in the season of the original: \n \nFate / Zero 2nd Season: \n - SEASON 1: EPISODE 12 -> [season 1, episode: 13] [/COLOR] \n [COLOR blue] \nExample example which is the second Season of the original: \n \nFate / kaleid liner Prism☆Illya 2wei!: \n - SEASON 1: EPISODE 12 -> [season 2, episode: 0] [/COLOR] \n" -msgstr "La prima stagione che viene aggiunta inizia sempre dagli episodi \"0 \", la seconda stagione che viene aggiunta inizia nel numero totale di episodi della prima stagione, la terza stagione sarà la somma degli episodi delle stagioni precedenti e a seguire. \n [COLOR blue] \nEsempio serie divisa in diverse stagioni: \n \nFairy Tail: \n - STAGIONE 1: EPISODIO 48 -> [stagione 1, episodio: 0] \n - STAGIONE 2: EPISODIO 48 - -> [stagione 2, episodio: 48] \n - STAGIONE 3: EPISODIO 54 -> [stagione 3, episodio: 96 ([48 = stagione2] + [48 = stagione1])] \n - STAGIONE 4: EPISODIO 175 -> [stagione 4: episodio: 150 ([54 = stagione3] + [48 = stagione2] + [48 = stagione3])] [/COLOR] \n [COLOR green] \nEsempio di serie che continua nella stagione dell'originale: \n \nFate/Zero 2a stagione: \n - STAGIONE 1: EPISODIO 12 -> [stagione 1, episodio: 13] [/COLOR] \n [COLOR blue] \nEsempio di esempio che è la seconda stagione dell'originale: \n \nFate/kaleid liner Prism☆Illya 2wei!: \n - STAGIONE 1: EPISODIO 12 -> [stagione 2, episodio: 0] [/COLOR] \n" +msgid "The first season that is added always starts in \"0 \" episodes, the second season that is added starts in the total number of episodes of the first season, the third season will be the sum of the episodes of the previous seasons and so on.\n \nSerial example divided into several seasons: \n\nFairy Tail: \n - SEASON 1: EPISODE 48 -> [season 1, episode: 0] \n - SEASON 2: EPISODE 48 - -> [season 2, episode: 48] \n - SEASON 3: EPISODE 54 -> [season 3, episode: 96 ([48 = season2] + [48 = season1])] \n - SEASON 4: EPISODE 175 -> [season 4: episode: 150 ([54 = season3] + [48 = season2] + [48 = season3])] \n \nExample of a series that continues in the season of the original: \n \nFate / Zero 2nd Season: \n - SEASON 1: EPISODE 12 -> [season 1, episode: 13] \n \nExample example which is the second Season of the original: \n \nFate / kaleid liner Prism☆Illya 2wei!: \n - SEASON 1: EPISODE 12 -> [season 2, episode: 0] \n" +msgstr "La prima stagione che viene aggiunta inizia sempre dagli episodi \"0 \", la seconda stagione che viene aggiunta inizia nel numero totale di episodi della prima stagione, la terza stagione sarà la somma degli episodi delle stagioni precedenti e a seguire. \n \nEsempio serie divisa in diverse stagioni: \n \nFairy Tail: \n - STAGIONE 1: EPISODIO 48 -> [stagione 1, episodio: 0] \n - STAGIONE 2: EPISODIO 48 - -> [stagione 2, episodio: 48] \n - STAGIONE 3: EPISODIO 54 -> [stagione 3, episodio: 96 ([48 = stagione2] + [48 = stagione1])] \n - STAGIONE 4: EPISODIO 175 -> [stagione 4: episodio: 150 ([54 = stagione3] + [48 = stagione2] + [48 = stagione3])] \n \nEsempio di serie che continua nella stagione dell'originale: \n \nFate/Zero 2a stagione: \n - STAGIONE 1: EPISODIO 12 -> [stagione 1, episodio: 13] \n \nEsempio di esempio che è la seconda stagione dell'originale: \n \nFate/kaleid liner Prism☆Illya 2wei!: \n - STAGIONE 1: EPISODIO 12 -> [stagione 2, episodio: 0] \n" msgctxt "#70603" msgid "Manage link lists" diff --git a/specials/search.py b/specials/search.py index 45b63899..2c90501e 100644 --- a/specials/search.py +++ b/specials/search.py @@ -612,13 +612,12 @@ def do_search(item, categories=None): if result_mode == 0: if len(search_results[channel]) > 1: title += " -%s" % element["item"].title.strip() - title += " (%s)" % len(element["itemlist"]) - title = re.sub("\[COLOR [^\]]+\]", "", title) - title = re.sub("\[/COLOR]", "", title) - plot = config.get_localized_string(60491) + '\n' + title = re.sub(r"\[[^\]]+\]|•", "", title) + title = typo(title,'bold') + typo("%02d" % len(element["itemlist"]),'_ [] color kod bold') + plot = config.get_localized_string(60491) + '\n' + typo('','submenu')+ '\n' for i in element["itemlist"]: if type(i) == Item: - plot += i.title + '\n' + plot += re.sub(r'\[(?:/)?B\]','', i.title) + '\n' itemlist.append(Item(title=title, channel="search", action="show_result", url=element["item"].url, extra=element["item"].extra, folder=True, adult=element["adult"], plot=plot, thumbnail=element["thumbnail"], itemlist=[e.tourl() for e in element["itemlist"]], @@ -706,7 +705,7 @@ def discover_list(item): elem['tmdb_id']=elem['id'] if 'title' in elem: title = unify.normalize(elem['title']).capitalize() - elem['year'] = scrapertools.find_single_match(elem['release_date'], '(\d{4})-\d+-\d+') + elem['year'] = scrapertools.find_single_match(elem['release_date'], r'(\d{4})-\d+-\d+') else: title = unify.normalize(elem['name']).capitalize() tvshow = True