stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix Ricerca Alternativa e altri micro fix

Browse Source
This commit is contained in:
Alhaziel01
2020-09-04 17:41:44 +02:00
parent 265252f317
commit 3004199d0d
6 changed files with 1490 additions and 1825 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/support.py
+25 -16
View File
@@ -442,6 +442,7 @@ def scrape(func):
data = re.sub("='([^']+)'", '="\\1"', page.data) data = re.sub("='([^']+)'", '="\\1"', page.data)
data = data.replace('\n', ' ') data = data.replace('\n', ' ')
data = data.replace('\t', ' ') data = data.replace('\t', ' ')
data = data.replace(' ', ' ')
data = re.sub(r'>\s+<', '> <', data) data = re.sub(r'>\s+<', '> <', data)
# replace all ' with " and eliminate newline, so we don't need to worry about # replace all ' with " and eliminate newline, so we don't need to worry about
scrapingTime = time() scrapingTime = time()
@@ -928,6 +929,7 @@ def match(item_url_string, **args):
data = re.sub("='([^']+)'", '="\\1"', data) data = re.sub("='([^']+)'", '="\\1"', data)
data = data.replace('\n', ' ') data = data.replace('\n', ' ')
data = data.replace('\t', ' ') data = data.replace('\t', ' ')
data = data.replace('&nbsp;', ' ')
data = re.sub(r'>\s+<', '><', data) data = re.sub(r'>\s+<', '><', data)
data = re.sub(r'([a-zA-Z])"([a-zA-Z])', "\1'\2", data) data = re.sub(r'([a-zA-Z])"([a-zA-Z])', "\1'\2", data)
@@ -1358,42 +1360,48 @@ def thumb(item_itemlist_string=None, genre=False, live=False):
'tvshow':['serie','tv','episodi','episodio','fiction', 'show'], 'tvshow':['serie','tv','episodi','episodio','fiction', 'show'],
'documentary':['documentari','documentario', 'documentary', 'documentaristico'], 'documentary':['documentari','documentario', 'documentary', 'documentaristico'],
'teenager':['ragazzi','teenager', 'teen'], 'teenager':['ragazzi','teenager', 'teen'],
'learning':['learning'], 'learning':['learning', 'school', 'scuola'],
'all':['tutti', 'all'], 'all':['tutti', 'all'],
'news':['novità', "novita'", 'aggiornamenti', 'nuovi', 'nuove', 'new', 'newest', 'news', 'ultimi'], 'news':['novità', "novita'", 'aggiornamenti', 'nuovi', 'nuove', 'new', 'newest', 'news', 'ultimi', 'notizie'],
'now_playing':['cinema', 'in sala'], 'now_playing':['cinema', 'in sala'],
'anime':['anime'], 'anime':['anime'],
'genres':['genere', 'generi', 'categorie', 'categoria', 'category'], 'genres':['genere', 'generi', 'categorie', 'categoria', 'category'],
'animation': ['animazione', 'cartoni', 'cartoon', 'animation'], 'animation': ['animazione', 'cartoni', 'cartoon', 'animation'],
'action':['azione', 'arti marziali', 'action'], 'action':['azione', 'marziali', 'action', 'martial'],
'adventure': ['avventura', 'adventure'], 'adventure': ['avventura', 'adventure'],
'biographical':['biografico', 'biographical'], 'biographical':['biografico', 'biographical', 'biografia'],
'comedy':['comico', 'commedia', 'demenziale', 'comedy', 'brillante'], 'comedy':['comico', 'commedia', 'demenziale', 'comedy', 'brillante', 'demential', 'parody'],
'adult':['erotico', 'hentai', 'harem', 'ecchi', 'adult'], 'adult':['erotico', 'hentai', 'harem', 'ecchi', 'adult'],
'drama':['drammatico', 'drama', 'dramma'], 'drama':['drammatico', 'drama', 'dramma'],
'syfy':['fantascienza', 'science fiction', 'syfy', 'sci'], 'syfy':['fantascienza', 'science fiction', 'syfy', 'sci-fi'],
'fantasy':['fantasy', 'magia', 'magic', 'fantastico'], 'fantasy':['fantasy', 'magia', 'magic', 'fantastico'],
'crime':['gangster','poliziesco', 'crime', 'crimine'], 'crime':['gangster','poliziesco', 'crime', 'crimine', 'police'],
'grotesque':['grottesco', 'grotesque'], 'grotesque':['grottesco', 'grotesque'],
'war':['guerra', 'war'], 'war':['guerra', 'war', 'military'],
'children':['bambini', 'kids'], 'children':['bambini', 'kids'],
'horror':['horror'], 'horror':['horror', 'orrore'],
'music':['musical', 'musica', 'music', 'musicale'], 'music':['musical', 'musica', 'music', 'musicale'],
'mistery':['mistero', 'giallo', 'mystery'], 'mistery':['mistero', 'giallo', 'mystery'],
'noir':['noir'], 'noir':['noir'],
'popular' : ['popolari','popolare', 'più visti'], 'popular':['popolari','popolare', 'più visti', 'raccomandati', 'raccomandazioni' 'recommendations'],
'thriller':['thriller'], 'thriller':['thriller'],
'top_rated' : ['fortunato', 'votati', 'lucky', 'top'], 'top_rated' : ['fortunato', 'votati', 'lucky', 'top'],
'on_the_air' : ['corso', 'onda', 'diretta', 'dirette'], 'on_the_air' : ['corso', 'onda', 'diretta', 'dirette'],
'western':['western'], 'western':['western'],
'vos':['sub','sub-ita'], 'vos':['sub','sub-ita'],
'romance':['romantico','sentimentale', 'romance', 'soap'], 'romance':['romantico','sentimentale', 'romance', 'soap'],
'family':['famiglia','famiglie', 'family', 'historical'], 'family':['famiglia','famiglie', 'family'],
'historical':['storico', 'history', 'storia'], 'historical':['storico', 'history', 'storia', 'historical'],
'az':['lettera','lista','alfabetico','a-z', 'alphabetical'], 'az':['lettera','lista','alfabetico','a-z', 'alphabetical'],
'year':['anno', 'anni', 'year'], 'year':['anno', 'anni', 'year'],
'update':['replay', 'update'], 'update':['replay', 'update'],
'videolibrary':['teche'], 'videolibrary':['teche'],
'info':['info','information','informazioni'],
'star':['star', 'personaggi', 'interpreti', 'stars', 'characters', 'performers', 'staff', 'actors', 'attori'],
'winter':['inverno', 'winter'],
'spring':['primavera', 'spring'],
'summer':['estate', 'summer'],
'autumn':['autunno', 'autumn'],
'autoplay':[config.get_localized_string(60071)] 'autoplay':[config.get_localized_string(60071)]
} }
@@ -1409,18 +1417,19 @@ def thumb(item_itemlist_string=None, genre=False, live=False):
'_tvshow':['serie','tv', 'fiction']} '_tvshow':['serie','tv', 'fiction']}
def autoselect_thumb(item, genre): def autoselect_thumb(item, genre):
log('SPLIT',re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ',item.title.lower()))
if genre == False: if genre == False:
for thumb, titles in icon_dict.items(): for thumb, titles in icon_dict.items():
if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)| ',item.title.lower()) for word in search): if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ',item.title.lower()) for word in search):
thumb = 'search' thumb = 'search'
for suffix, titles in search_suffix.items(): for suffix, titles in search_suffix.items():
if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)| ',item.title.lower()) for word in titles ): if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ',item.title.lower()) for word in titles ):
thumb = thumb + suffix thumb = thumb + suffix
item.thumbnail = get_thumb(thumb + '.png') item.thumbnail = get_thumb(thumb + '.png')
elif any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)| ',item.title.lower()) for word in titles ): elif any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)| ',item.title.lower()) for word in titles ):
if thumb == 'movie' or thumb == 'tvshow': if thumb == 'movie' or thumb == 'tvshow':
for suffix, titles in suffix_dict.items(): for suffix, titles in suffix_dict.items():
if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)| ',item.title.lower()) for word in titles ): if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ',item.title.lower()) for word in titles ):
thumb = thumb + suffix thumb = thumb + suffix
item.thumbnail = get_thumb(thumb + '.png') item.thumbnail = get_thumb(thumb + '.png')
else: item.thumbnail = get_thumb(thumb + '.png') else: item.thumbnail = get_thumb(thumb + '.png')
@@ -1429,7 +1438,7 @@ def thumb(item_itemlist_string=None, genre=False, live=False):
else: else:
for thumb, titles in icon_dict.items(): for thumb, titles in icon_dict.items():
if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)| ',item.title.lower()) for word in titles ): if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ',item.title.lower()) for word in titles ):
item.thumbnail = get_thumb(thumb + '.png') item.thumbnail = get_thumb(thumb + '.png')
else: else:
thumb = item.thumbnail thumb = item.thumbnail
resources/language/resource.language.en_gb/strings.po
+7 -7
View File
@@ -2921,7 +2921,7 @@ msgid "Search similar"
msgstr "" msgstr ""
msgctxt "#70021" msgctxt "#70021"
msgid "Search in TMDB" msgid "Search %s in %s"
msgstr "" msgstr ""
msgctxt "#70022" msgctxt "#70022"
@@ -4209,11 +4209,11 @@ msgid "Search in KoD: %s"
msgstr "" msgstr ""
msgctxt "#70351" msgctxt "#70351"
msgid " Search alternative title: %s" msgid "Search alternative title: %s"
msgstr "" msgstr ""
msgctxt "#70352" msgctxt "#70352"
msgid " Search title in english: %s" msgid "Search title in english: %s"
msgstr "" msgstr ""
msgctxt "#70353" msgctxt "#70353"
@@ -4332,10 +4332,6 @@ msgctxt "#70381"
msgid "Dropped" msgid "Dropped"
msgstr "" msgstr ""
msgctxt "#70381"
msgid "Myanimelist username and/or password blank"
msgstr ""
msgctxt "#70382" msgctxt "#70382"
msgid "Currently watching" msgid "Currently watching"
msgstr "" msgstr ""
@@ -4380,6 +4376,10 @@ msgctxt "#70392"
msgid "Rate with a %s" msgid "Rate with a %s"
msgstr "" msgstr ""
msgctxt "#70393"
msgid "Myanimelist username and/or password blank"
msgstr ""
msgctxt "#70394" msgctxt "#70394"
msgid "Action" msgid "Action"
msgstr "" msgstr ""
resources/language/resource.language.it_it/strings.po
+13 -13
View File
@@ -2920,8 +2920,8 @@ msgid "Search similar"
msgstr "Cerca simili" msgstr "Cerca simili"
msgctxt "#70021" msgctxt "#70021"
msgid "Search in TMDB" msgid "Search %s in %s"
msgstr "Cerca in TMDB" msgstr "Cerca %s in %s"
msgctxt "#70022" msgctxt "#70022"
msgid " - Movies" msgid " - Movies"
@@ -4048,7 +4048,7 @@ msgid "TV shows by Genre"
msgstr "Serie TV per Genere" msgstr "Serie TV per Genere"
msgctxt "#70311" msgctxt "#70311"
msgid "TV Shows most popular" msgid "TV shows most popular"
msgstr "Serie TV più popolari" msgstr "Serie TV più popolari"
msgctxt "#70312" msgctxt "#70312"
@@ -4208,12 +4208,12 @@ msgid "Search in KoD: %s"
msgstr "Cerca in KoD: %s" msgstr "Cerca in KoD: %s"
msgctxt "#70351" msgctxt "#70351"
msgid " Search alternative title: %s" msgid "Search alternative title: %s"
msgstr " Cerca titolo alternativo: %s" msgstr "Cerca titolo alternativo: %s"
msgctxt "#70352" msgctxt "#70352"
msgid " Search title in english: %s" msgid "Search title in english: %s"
msgstr " Cerca titolo in inglese: %s" msgstr "Cerca titolo in inglese: %s"
msgctxt "#70353" msgctxt "#70353"
msgid "Vídeos (Episodes, Trailers...)" msgid "Vídeos (Episodes, Trailers...)"
@@ -4301,11 +4301,11 @@ msgstr "Anime dove appare:"
msgctxt "#70374" msgctxt "#70374"
msgid "Give voice to/in:" msgid "Give voice to/in:"
msgstr "Dai voce a/in:" msgstr "Da voce a/in:"
msgctxt "#70375" msgctxt "#70375"
msgid "Staff in animes:" msgid "Staff in animes:"
msgstr "Staff in anime:" msgstr "Staff negli anime:"
msgctxt "#70376" msgctxt "#70376"
msgid "Info in AniDB %s" msgid "Info in AniDB %s"
@@ -4331,10 +4331,6 @@ msgctxt "#70381"
msgid "Dropped" msgid "Dropped"
msgstr "Abbandonata" msgstr "Abbandonata"
msgctxt "#70381"
msgid "Myanimelist username and/or password blank"
msgstr "Username e/o password di Myanimelist vuoti"
msgctxt "#70382" msgctxt "#70382"
msgid "Currently watching" msgid "Currently watching"
msgstr "In visione attualmente" msgstr "In visione attualmente"
@@ -4379,6 +4375,10 @@ msgctxt "#70392"
msgid "Rate with a %s" msgid "Rate with a %s"
msgstr "Dai un punteggio con un %s" msgstr "Dai un punteggio con un %s"
msgctxt "#70393"
msgid "Myanimelist username and/or password blank"
msgstr "Username e/o password di Myanimelist vuoti"
msgctxt "#70394" msgctxt "#70394"
msgid "Action" msgid "Action"
msgstr "Azione" msgstr "Azione"
specials/search.py
+2 -2
View File
@@ -39,6 +39,7 @@ def mainlist(item):
Item(channel=item.channel, title=config.get_localized_string(70741) % config.get_localized_string(70314), action='new_search', page=1, mode='person', thumbnail=get_thumb("search_star.png")), Item(channel=item.channel, title=config.get_localized_string(70741) % config.get_localized_string(70314), action='new_search', page=1, mode='person', thumbnail=get_thumb("search_star.png")),
Item(channel=item.channel, title=config.get_localized_string(59995), action='saved_search', thumbnail=get_thumb('search.png')), Item(channel=item.channel, title=config.get_localized_string(59995), action='saved_search', thumbnail=get_thumb('search.png')),
Item(channel=item.channel, title=config.get_localized_string(60420), action='sub_menu', thumbnail=get_thumb('search.png')), Item(channel=item.channel, title=config.get_localized_string(60420), action='sub_menu', thumbnail=get_thumb('search.png')),
Item(channel="tvmoviedb", title=config.get_localized_string(70274), action="mainlist", thumbnail=get_thumb("search.png")),
Item(channel=item.channel, title=typo(config.get_localized_string(59994), 'color kod bold'), action='setting_channel_new', thumbnail=get_thumb('setting_0.png')), Item(channel=item.channel, title=typo(config.get_localized_string(59994), 'color kod bold'), action='setting_channel_new', thumbnail=get_thumb('setting_0.png')),
Item(channel='shortcuts', title=typo(config.get_localized_string(70286), 'color kod bold'), action='SettingOnPosition', category=5, setting=1, thumbnail=get_thumb('setting_0.png'))] Item(channel='shortcuts', title=typo(config.get_localized_string(70286), 'color kod bold'), action='SettingOnPosition', category=5, setting=1, thumbnail=get_thumb('setting_0.png'))]
@@ -58,8 +59,7 @@ def sub_menu(item):
Item(channel=item.channel, action='years_menu', title=config.get_localized_string(70743), mode='tvshow', thumbnail=get_thumb("tvshow_year.png")), Item(channel=item.channel, action='years_menu', title=config.get_localized_string(70743), mode='tvshow', thumbnail=get_thumb("tvshow_year.png")),
Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70311), search_type='list', list_type='tv/popular', mode='tvshow', thumbnail=get_thumb("popular.png")), Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70311), search_type='list', list_type='tv/popular', mode='tvshow', thumbnail=get_thumb("popular.png")),
Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70312), search_type='list', list_type='tv/on_the_air', mode='tvshow', thumbnail=get_thumb("tvshow_on_the_air.png")), Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70312), search_type='list', list_type='tv/on_the_air', mode='tvshow', thumbnail=get_thumb("tvshow_on_the_air.png")),
Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70313), search_type='list', list_type='tv/top_rated', mode='tvshow', thumbnail=get_thumb("tvshow_top.png")), Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70313), search_type='list', list_type='tv/top_rated', mode='tvshow', thumbnail=get_thumb("tvshow_top.png")),]
Item(channel="tvmoviedb", action="mainlist", title=config.get_localized_string(70274), thumbnail=get_thumb("search.png"))]
itemlist = set_context(itemlist) itemlist = set_context(itemlist)
return itemlist return itemlist
specials/setting.py
+2 -1
View File
@@ -405,7 +405,8 @@ def cb_servers_favorites(server_names, dict_values):
progreso.update(old_div((i * 100), n), config.get_localized_string(60559) % server_parameters['name']) progreso.update(old_div((i * 100), n), config.get_localized_string(60559) % server_parameters['name'])
i += 1 i += 1
c = 2 c = 1
logger.log(dict_favorites)
favorites_servers_list = [] favorites_servers_list = []
while c in dict_favorites: while c in dict_favorites:
favorites_servers_list.append(dict_favorites[c]) favorites_servers_list.append(dict_favorites[c])
specials/tvmoviedb.py
+1441 -1786
View File
File diff suppressed because it is too large Load Diff