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

Fix Typo

Browse Source
This commit is contained in:
Alhaziel01
2020-05-30 17:18:56 +02:00
parent f31ea2eb74
commit 42c93aa2dc
9 changed files with 75 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/cineblog01.py
+2 -2
View File
@@ -44,8 +44,8 @@ def mainlist(item):
('Per anno', ['/serietv/', 'menu', 'Serie-Tv per Anno']), ('Per anno', ['/serietv/', 'menu', 'Serie-Tv per Anno']),
('Ultime Aggiornate', ['/serietv/', 'peliculas', 'newest']) ('Ultime Aggiornate', ['/serietv/', 'peliculas', 'newest'])
] ]
docu = [('Documentari bullet bold', ['/category/documentario/', 'peliculas']), docu = [('Documentari {bullet bold}', ['/category/documentario/', 'peliculas']),
('HD submenu {documentari}', ['category/hd-alta-definizione/documentario-hd/', 'peliculas']) ('HD {submenu} {documentari}', ['category/hd-alta-definizione/documentario-hd/', 'peliculas'])
] ]
return locals() return locals()
channels/eurostreaming.py
+2 -2
View File
@@ -26,8 +26,8 @@ def mainlist(item):
tvshow = [] tvshow = []
anime = ['/category/anime-cartoni-animati/'] anime = ['/category/anime-cartoni-animati/']
mix = [('Aggiornamenti bullet bold {TV}', ['/aggiornamento-episodi/', 'peliculas', 'newest']), mix = [('Aggiornamenti {bullet bold} {TV}', ['/aggiornamento-episodi/', 'peliculas', 'newest']),
('Archivio bullet bold {TV}', ['/category/serie-tv-archive/', 'peliculas'])] ('Archivio {bullet bold} {TV}', ['/category/serie-tv-archive/', 'peliculas'])]
search = '' search = ''
return locals() return locals()
channels/fastsubita.py
+1 -1
View File
@@ -33,7 +33,7 @@ def mainlist(item):
Tvshow = [ Tvshow = [
('Aggiornamenti', ['', 'peliculas', '', 'update']), ('Aggiornamenti', ['', 'peliculas', '', 'update']),
('Per Lettera {TV}', ['/elenco-serie-tv/', 'genres', 'genres']), ('Per Lettera {TV}', ['/elenco-serie-tv/', 'genres', 'genres']),
('Cerca... {TV} bold', ['','search']) ('Cerca... {bold}{TV}', ['','search'])
] ]
# search = '' # search = ''
channels/ilcorsaronero.py
+9 -9
View File
@@ -23,23 +23,23 @@ def mainlist(item):
menu = [ menu = [
('BDRiP {film}', ['/categoria.php?active=0&category=1&order=data&by=DESC&page=', 'peliculas', [0, 'movie', True]]), ('BDRiP {film}', ['/categoria.php?active=0&category=1&order=data&by=DESC&page=', 'peliculas', [0, 'movie', True]]),
('Cerca BDRiP... submenu {film}', ['/torrent-ita/1/', 'search', ['search', 'movie', True]]), ('Cerca BDRiP... {submenu} {film}', ['/torrent-ita/1/', 'search', ['search', 'movie', True]]),
('DVD {film}', ['/categoria.php?active=0&category=20&order=data&by=DESC&page=', 'peliculas', [0, 'movie', True]]), ('DVD {film}', ['/categoria.php?active=0&category=20&order=data&by=DESC&page=', 'peliculas', [0, 'movie', True]]),
('Cerca DVD... submenu {film}', ['/torrent-ita/20/', 'search', ['search', 'movie', True]]), ('Cerca DVD... {submenu} {film}', ['/torrent-ita/20/', 'search', ['search', 'movie', True]]),
('Screener {film}', ['/categoria.php?active=0&category=19&order=data&by=DESC&page=', 'peliculas', [0, 'movie', True]]), ('Screener {film}', ['/categoria.php?active=0&category=19&order=data&by=DESC&page=', 'peliculas', [0, 'movie', True]]),
('Cerca Screener.. submenu {film}', ['/torrent-ita/19/', 'search', ['search', 'movie', True]]), ('Cerca Screener.. {submenu} {film}', ['/torrent-ita/19/', 'search', ['search', 'movie', True]]),
('Serie TV', ['/categoria.php?active=0&category=15&order=data&by=DES&page=', 'peliculas', [0 , 'tvshow', True]]), ('Serie TV', ['/categoria.php?active=0&category=15&order=data&by=DES&page=', 'peliculas', [0 , 'tvshow', True]]),
('Cerca Serie TV.. submenu', ['/torrent-ita/15/', 'search', ['search', 'tvshow',True]]), ('Cerca Serie TV.. {submenu}', ['/torrent-ita/15/', 'search', ['search', 'tvshow',True]]),
('Anime', ['/categoria.php?active=0&category=5&order=data&by=DESC&page=', 'peliculas', [0, 'anime', True]]), ('Anime', ['/categoria.php?active=0&category=5&order=data&by=DESC&page=', 'peliculas', [0, 'anime', True]]),
('Cerca Anime.. submenu', ['/torrent-ita/5/', 'search', ['search', 'anime', True]]), ('Cerca Anime.. {submenu}', ['/torrent-ita/5/', 'search', ['search', 'anime', True]]),
('Musica', ['/categoria.php?active=0&category=2&order=data&by=DESC&page=', 'peliculas', [0, 'music', False]]), ('Musica', ['/categoria.php?active=0&category=2&order=data&by=DESC&page=', 'peliculas', [0, 'music', False]]),
('Cerca Musica.. submenu', ['/torrent-ita/2/', 'search', ['search', 'music', False]]), ('Cerca Musica.. {submenu}', ['/torrent-ita/2/', 'search', ['search', 'music', False]]),
('Audiolibri {musica}', ['/categoria.php?active=0&category=18&order=data&by=DESC&page=', 'peliculas', [0, 'music', False]]), ('Audiolibri {musica}', ['/categoria.php?active=0&category=18&order=data&by=DESC&page=', 'peliculas', [0, 'music', False]]),
('Cerca Audiolibri.. submenu', ['/torrent-ita/18/', 'search', ['search', 'music', False]]), ('Cerca Audiolibri.. {submenu}', ['/torrent-ita/18/', 'search', ['search', 'music', False]]),
# mostrerebbe anche risultati non "multimediali" e allungherebbero inutilmente la ricerca globale # mostrerebbe anche risultati non "multimediali" e allungherebbero inutilmente la ricerca globale
# ('Altro {film}', ['/categoria.php?active=0&category=4&order=data&by=DESC&page=', 'peliculas', [0, 'other', False]]), # ('Altro {film}', ['/categoria.php?active=0&category=4&order=data&by=DESC&page=', 'peliculas', [0, 'other', False]]),
# ('Cerca altro.. submenu', ['/torrent-ita/4/', 'search', ['search', 'other', False]]), # ('Cerca altro.. {submenu}', ['/torrent-ita/4/', 'search', ['search', 'other', False]]),
# ('Cerca Tutto... color kod bold', ['/argh.php?search=', 'search', ['search', 'all', False]]) # ('Cerca Tutto... {color kod bold}', ['/argh.php?search=', 'search', ['search', 'all', False]])
] ]
return locals() return locals()
channels/mondoserietv.py
+1 -1
View File
@@ -27,7 +27,7 @@ def mainlist(item):
anime = ['/lista-cartoni-animati-e-anime'] anime = ['/lista-cartoni-animati-e-anime']
docu = [('Documentari bullet bold',['/lista-documentari', 'peliculas', '', 'tvshow'])] docu = [('Documentari {bullet bold}',['/lista-documentari', 'peliculas', '', 'tvshow'])]
search = '' search = ''
channels/serietvonline.py
+1 -1
View File
@@ -51,7 +51,7 @@ def mainlist(item):
anime = ['/lista-cartoni-animati-e-anime/'] anime = ['/lista-cartoni-animati-e-anime/']
documentari = [('Documentari bullet bold', ['/lista-documentari/' , 'peliculas' , 'doc', 'tvshow'])] documentari = [('Documentari {bullet bold}', ['/lista-documentari/' , 'peliculas' , 'doc', 'tvshow'])]
search = '' search = ''
channels/serietvsubita.py
+2 -2
View File
@@ -25,8 +25,8 @@ def mainlist(item):
log() log()
itemlist = [] itemlist = []
tvshowSub = [ tvshowSub = [
('Novità bold',[ '', 'peliculas_tv', '', 'tvshow']), ('Novità {bold}',[ '', 'peliculas_tv', '', 'tvshow']),
('Serie TV bold',[ '', 'lista_serie', '', 'tvshow']), ('Serie TV {bold}',[ '', 'lista_serie', '', 'tvshow']),
('Per Lettera', ['', 'list_az', 'serie', 'tvshow']) ('Per Lettera', ['', 'list_az', 'serie', 'tvshow'])
] ]
cerca = [(support.typo('Cerca...', 'bold'),[ '', 'search', '', 'tvshow'])] cerca = [(support.typo('Cerca...', 'bold'),[ '', 'search', '', 'tvshow'])]
channels/vvvvid.py
+13 -13
View File
@@ -54,22 +54,22 @@ def mainlist(item):
('Generi',['series/', 'peliculas', 'channel/10004/last/?category=']), ('Generi',['series/', 'peliculas', 'channel/10004/last/?category=']),
('A-Z',['series/', 'peliculas', 'channel/10003/last/?filter=']) ('A-Z',['series/', 'peliculas', 'channel/10003/last/?filter='])
] ]
show = [('Show bold {tv}',['show/', 'peliculas', '', 'tvshow']), show = [('Show {bold} {tv}',['show/', 'peliculas', '', 'tvshow']),
('Popolari submenu {tv}',['show/', 'peliculas', 'channel/10002/last/', 'tvshow']), ('Popolari {submenu} {tv}',['show/', 'peliculas', 'channel/10002/last/', 'tvshow']),
('Nuove Uscite submenu {tv}',['show/', 'peliculas', 'channel/10007/last/', 'tvshow']), ('Nuove Uscite {submenu} {tv}',['show/', 'peliculas', 'channel/10007/last/', 'tvshow']),
('Generi submenu {tv}',['show/', 'peliculas', 'channel/10004/last/?category=', 'tvshow']), ('Generi {submenu} {tv}',['show/', 'peliculas', 'channel/10004/last/?category=', 'tvshow']),
('A-Z submenu {tv}',['show/', 'peliculas', 'channel/10003/last/?filter=', 'tvshow']), ('A-Z {submenu} {tv}',['show/', 'peliculas', 'channel/10003/last/?filter=', 'tvshow']),
('Cerca Show... bold submenu {tv}', ['show/', 'search', '', 'tvshow']) ('Cerca Show... {bold submenu} {tv}', ['show/', 'search', '', 'tvshow'])
] ]
kids = [('Kids bold',['kids/', 'peliculas', '', 'tvshow']), kids = [('Kids {bold}',['kids/', 'peliculas', '', 'tvshow']),
('Popolari submenu {kids}',['kids/', 'peliculas', 'channel/10002/last/', 'tvshow']), ('Popolari {submenu} {kids}',['kids/', 'peliculas', 'channel/10002/last/', 'tvshow']),
('Nuove Uscite submenu {kids}',['kids/', 'peliculas', 'channel/10007/last/', 'tvshow']), ('Nuove Uscite {submenu} {kids}',['kids/', 'peliculas', 'channel/10007/last/', 'tvshow']),
('Generi submenu {kids}',['kids/', 'peliculas', 'channel/10004/last/?category=', 'tvshow']), ('Generi {submenu} {kids}',['kids/', 'peliculas', 'channel/10004/last/?category=', 'tvshow']),
('A-Z submenu {kids}',['kids/', 'peliculas', 'channel/10003/last/?filter=', 'tvshow']), ('A-Z {submenu} {kids}',['kids/', 'peliculas', 'channel/10003/last/?filter=', 'tvshow']),
('Cerca Kids... bold submenu {kids}', ['kids/', 'search', '', 'tvshow']) ('Cerca Kids... {bold submenu} {kids}', ['kids/', 'search', '', 'tvshow'])
] ]
else: else:
Top = [("Visibile solo dall'Italia bold",[])] Top = [("Visibile solo dall'Italia {bold}",[])]
return locals() return locals()
core/support.py
+44 -49
View File
@@ -727,7 +727,7 @@ def menu(func):
if not global_search: if not global_search:
for sub, var in dictUrl['top']: for sub, var in dictUrl['top']:
menuItem(itemlist, filename, menuItem(itemlist, filename,
title = sub + ' italic bold', title = sub + '{italic bold}',
url = host + var[0] if len(var) > 0 else '', url = host + var[0] if len(var) > 0 else '',
action = var[1] if len(var) > 1 else 'peliculas', action = var[1] if len(var) > 1 else 'peliculas',
args=var[2] if len(var) > 2 else '', args=var[2] if len(var) > 2 else '',
@@ -742,7 +742,7 @@ def menu(func):
if not global_search: if not global_search:
menuItem(itemlist, filename, menuItem(itemlist, filename,
title + ' bullet bold', 'peliculas', title + '{bullet bold}', 'peliculas',
host + url, host + url,
contentType='movie' if name == 'film' else 'tvshow') contentType='movie' if name == 'film' else 'tvshow')
if len(dictUrl[name]) > 0: if len(dictUrl[name]) > 0:
@@ -750,13 +750,13 @@ def menu(func):
if dictUrl[name] is not None and type(dictUrl[name]) is not str: if dictUrl[name] is not None and type(dictUrl[name]) is not str:
for sub, var in dictUrl[name]: for sub, var in dictUrl[name]:
menuItem(itemlist, filename, menuItem(itemlist, filename,
title = sub + ' submenu {' + title + '}', title = sub + '{submenu} {' + title + '}',
url = host + var[0] if len(var) > 0 else '', url = host + var[0] if len(var) > 0 else '',
action = var[1] if len(var) > 1 else 'peliculas', action = var[1] if len(var) > 1 else 'peliculas',
args=var[2] if len(var) > 2 else '', args=var[2] if len(var) > 2 else '',
contentType= var[3] if len(var) > 3 else 'movie' if name == 'film' else 'tvshow') contentType= var[3] if len(var) > 3 else 'movie' if name == 'film' else 'tvshow')
# add search menu for category # add search menu for category
if 'search' not in args: menuItem(itemlist, filename, config.get_localized_string(70741) % title + ' … submenu bold', 'search', host + url, contentType='movie' if name == 'film' else 'tvshow', style=not global_search) if 'search' not in args: menuItem(itemlist, filename, config.get_localized_string(70741) % title + '… {submenu bold}', 'search', host + url, contentType='movie' if name == 'film' else 'tvshow', style=not global_search)
# Make EXTRA MENU (on bottom) # Make EXTRA MENU (on bottom)
if not global_search: if not global_search:
@@ -774,7 +774,7 @@ def menu(func):
contentType= var[3] if len(var) > 3 else 'movie',) contentType= var[3] if len(var) > 3 else 'movie',)
if single_search: if single_search:
menuItem(itemlist, filename, config.get_localized_string(70741) % '… bold', 'search', host + dictUrl['search'], style=not global_search) menuItem(itemlist, filename, config.get_localized_string(70741) % '… {bold}', 'search', host + dictUrl['search'], style=not global_search)
if not global_search: if not global_search:
autoplay.init(item.channel, list_servers, list_quality) autoplay.init(item.channel, list_servers, list_quality)
@@ -791,63 +791,58 @@ def menu(func):
def typo(string, typography=''): def typo(string, typography=''):
# string = string.strip()
kod_color = '0xFF65B3DA' #'0xFF0081C2' kod_color = '0xFF65B3DA' #'0xFF0081C2'
# listTypo = ['capitalize', 'uppercase', 'lowercase', '[]', '()', 'submenu', 'bold', 'italic', '_', '']
try: string = str(string) try: string = str(string)
except: string = str(string.encode('utf8')) except: string = str(string.encode('utf8'))
if typography:
string = string + ' ' + typography
if config.get_localized_string(30992) in string: if config.get_localized_string(30992) in string:
string = string + ' >' string = string + ' >'
# If there are no attributes, it applies the default ones
attribute = ['[]','()','submenu','color','bold','italic','_','--','[B]','[I]','[COLOR]']
if int(config.get_setting('view_mode_channel').split(',')[-1]) in [0, 50, 55]: if int(config.get_setting('view_mode_channel').split(',')[-1]) in [0, 50, 55]:
VLT = True VLT = True
else: else:
VLT = False VLT = False
# Otherwise it uses the typographical attributes of the string
# else:
if 'capitalize' in string.lower():
string = string.replace(' capitalize', '').capitalize() if not typography and '{' in string:
if 'uppercase' in string.lower(): typography = string.split('{')[1].strip(' }').lower()
string = string.replace(' uppercase', '').upper() string = string.replace('{' + typography + '}','').strip()
if 'lowercase' in string.lower(): else:
string = string.replace(' lowercase', '').lower() string = string.strip()
if '[]' in string: typography.lower()
string = '[' + string.replace(' []', '').strip() + ']'
if '()' in string:
string = '(' + string.replace(' ()', '').strip() + ')' if 'capitalize' in typography:
if 'submenu' in string: string = string.capitalize()
if VLT: if 'uppercase' in typography:
string = "•• " + string.replace(' submenu', '').strip() string = string.upper()
else: if 'lowercase' in typography:
string = string.replace(' submenu', '') string = string.lower()
if 'color kod' in string: if '[]' in typography:
string = '[COLOR ' + kod_color + ']' + string.replace(' color kod', '') + '[/COLOR]' string = '[' + string + ']'
if 'color' in string: if '()' in typography:
color = scrapertools.find_single_match(string, 'color ([a-z]+)') string = '(' + string + ')'
string = '[COLOR ' + color + ']' + re.sub(r'\scolor\s([a-z]+)','',string) + '[/COLOR]' if 'submenu' in typography:
if 'bold' in string: if VLT: string = "•• " + string
string = '[B]' + string.replace(' bold', '').strip() + '[/B]' else: string = string
if 'italic' in string: if 'color kod' in typography:
string = '[I]' + string.replace(' italic', '').strip() + '[/I]' string = '[COLOR ' + kod_color + ']' + string + '[/COLOR]'
if '_' in string: elif 'color' in typography:
string = ' ' + string.replace(' _', '').strip() color = scrapertools.find_single_match(typography, 'color ([a-zA-Z0-9]+)')
if '--' in string: string = '[COLOR ' + color + ']' + string + '[/COLOR]'
string = ' - ' + string.replace(' --', '').strip() if 'bold' in typography:
if 'bullet' in string: string = '[B]' + string + '[/B]'
if VLT: if 'italic' in typography:
string = '[B]' + "•" + '[/B] ' + string.replace(' bullet', '').strip() string = '[I]' + string + '[/I]'
else: if '_' in typography:
string = string.replace(' bullet', '').strip() string = ' ' + string
if '{}' in string: if '--' in typography:
string = string.replace(' {}', '').strip() string = ' - ' + string
# string = string.strip() if 'bullet' in typography:
if VLT: string = '[B]' + "•" + '[/B] ' + string
else: string = string
return string return string