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

Modifiche a support.menu

Browse Source
This commit is contained in:
Alhaziel
2019-07-29 18:08:59 +02:00
parent 9c298a80e2
commit 614fa385db
3 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/support.py
+35 -17
View File
@@ -343,7 +343,8 @@ def scrape(func):
if anime: if anime:
from specials import autorenumber from specials import autorenumber
autorenumber.renumber(itemlist) if inspect.stack()[1][3] == 'episodios' or item.action == 'episodios': autorenumber.renumber(itemlist, item, 'bold')
else: autorenumber.renumber(itemlist)
if addVideolibrary and (item.infoLabels["title"] or item.fulltitle): if addVideolibrary and (item.infoLabels["title"] or item.fulltitle):
item.fulltitle = item.infoLabels["title"] item.fulltitle = item.infoLabels["title"]
@@ -359,7 +360,7 @@ def scrape(func):
def checkHost(item, itemlist): def checkHost(item, itemlist):
# nel caso non ci siano risultati puo essere che l'utente abbia cambiato manualmente l'host, pertanto lo riporta # nel caso non ci siano risultati puo essere che l'utente abbia cambiato manualmente l'host, pertanto lo riporta
# al valore di default (fixa anche il problema del cambio di host da parte nostra) # al valore di default (fixa anche il problema del cambio di host da parte nostra)
if len(itemlist) == 0: if len(itemlist) == 0:
# trovo il valore di default # trovo il valore di default
defHost = None defHost = None
@@ -511,7 +512,8 @@ def menuItem(itemlist, filename, title='', action='', url='', contentType='movie
url = url, url = url,
extra = extra, extra = extra,
args = args, args = args,
contentType = contentType contentType = contentType,
folder = False,
)) ))
# Apply auto Thumbnails at the menus # Apply auto Thumbnails at the menus
@@ -532,7 +534,7 @@ def menu(func):
list_quality = func.__globals__['list_quality'] list_quality = func.__globals__['list_quality']
filename = func.__module__.split('.')[1] filename = func.__module__.split('.')[1]
listUrls = ['film', 'filmSub', 'tvshow', 'tvshowSub', 'anime', 'animeSub', 'search'] listUrls = ['film', 'filmSub', 'tvshow', 'tvshowSub', 'anime', 'animeSub', 'search', 'top', 'topSub']
listUrls_extra = [] listUrls_extra = []
dictUrl = {} dictUrl = {}
@@ -548,54 +550,68 @@ def menu(func):
# Main options # Main options
itemlist = [] itemlist = []
# Top Menu
if dictUrl['top'] is not None:
for sub, var in dictUrl['top']:
menuItem(itemlist, filename, sub + ' bold italic', var[1] if len(var) > 0 else 'peliculas',
host + var[0], contentType= var[3] if len(var) > 2 else 'movie',
args=var[2] if len(dictUrl[name]) > 1 else '')
if dictUrl['topSub']:
for sub, var in dictUrl['topSub']:
menuItem(itemlist, filename, sub + ' submenu italic', var[1] if len(var)>1 else 'peliculas',
host + var[0], var[3] if len(var)>3 else 'movie',
args=var[2] if len(var)>2 else '')
# if film menu # if film menu
if dictUrl['film'] is not None: if dictUrl['film'] is not None:
menuItem(itemlist, filename, 'Film bold', 'peliculas', host + dictUrl['film']) menuItem(itemlist, filename, 'Film bold bullet', 'peliculas', host + dictUrl['film'])
if dictUrl['filmSub']: if dictUrl['filmSub']:
for sub, var in dictUrl['filmSub']: for sub, var in dictUrl['filmSub']:
menuItem(itemlist, filename, sub + ' submenu', var[1], menuItem(itemlist, filename, sub + ' submenu', var[1],
host + var[0], host + var[0],
args=var[2] if len(var)>2 else '') args=var[2] if len(var)>2 else '')
if dictUrl['search'] is None: menuItem(itemlist, filename, 'Cerca Film... submenu bold color kod', 'search', host, args='film') if dictUrl['search'] is None: menuItem(itemlist, filename, 'Cerca Film… submenu bold', 'search', host, args='film')
# if tvshow menu # if tvshow menu
if dictUrl['tvshow'] is not None: if dictUrl['tvshow'] is not None:
menuItem(itemlist, filename, 'Serie TV bold', 'peliculas', host + dictUrl['tvshow'], contentType='tvshow') menuItem(itemlist, filename, 'Serie TV bold bullet', 'peliculas', host + dictUrl['tvshow'], contentType='tvshow')
if dictUrl['tvshowSub']: if dictUrl['tvshowSub']:
for sub, var in dictUrl['tvshowSub']: for sub, var in dictUrl['tvshowSub']:
menuItem(itemlist, filename, sub + ' submenu', var[1], menuItem(itemlist, filename, sub + ' submenu', var[1] if len(var)>1 else 'peliculas',
host + var[0], contentType='tvshow', host + var[0], contentType='tvshow',
args=var[2] if len(var)>2 else '') args=var[2] if len(var)>2 else '')
if dictUrl['search'] is None: menuItem(itemlist, filename, 'Cerca Serie TV... submenu bold color kod', 'search', host, args='serie') if dictUrl['search'] is None: menuItem(itemlist, filename, 'Cerca Serie TV… submenu bold', 'search', host, args='serie')
# if anime menu # if anime menu
if dictUrl['anime'] is not None: if dictUrl['anime'] is not None:
menuItem(itemlist, filename, 'Anime bold', 'peliculas', host + dictUrl['anime'], contentType='tvshow', args='anime') menuItem(itemlist, filename, 'Anime bold bullet', 'peliculas', host + dictUrl['anime'], contentType='tvshow', args='anime')
if dictUrl['animeSub']: if dictUrl['animeSub']:
for sub, var in dictUrl['animeSub']: for sub, var in dictUrl['animeSub']:
menuItem(itemlist, filename, sub + ' submenu', var[1], menuItem(itemlist, filename, sub + ' submenu', var[1] if len(var)>1 else 'peliculas',
host + var[0], contentType='tvshow', host + var[0], contentType='tvshow',
args=var[2] if len(var)>2 else '') args=var[2] if len(var)>2 else '')
if dictUrl['search'] is None: menuItem(itemlist, filename, 'Cerca Anime... submenu bold color kod', 'search', host, args='serie') if dictUrl['search'] is None: menuItem(itemlist, filename, 'Cerca Anime… submenu bold', 'search', host, args='serie')
# if menu item not in defaults # if menu item not in defaults
for name in listUrls_extra: for name in listUrls_extra:
if len(name) > 2 and name[-3:] == 'Sub': if len(name) > 2 and name[-3:] == 'Sub':
for sub, var in dictUrl[name]: for sub, var in dictUrl[name]:
menuItem(itemlist, filename, sub + ' submenu', var[1], menuItem(itemlist, filename, sub + ' submenu', var[1] if len(var)>1 else 'peliculas',
host + var[0], var[3] if len(var)>3 else 'movie', host + var[0], var[3] if len(var)>3 else 'movie',
args=var[2] if len(var)>2 else '') args=var[2] if len(var)>2 else '')
else: else:
menuItem(itemlist, filename, dictUrl[name][0], dictUrl[name][1][1] if len(dictUrl[name][1]) > 0 else 'peliculas', for sub, var in dictUrl[name]:
host + dictUrl[name][1][0], contentType= dictUrl[name][1][3] if len(dictUrl[name][1]) > 2 else 'movie', menuItem(itemlist, filename, sub + ' bold bullet', var[1] if len(var) > 0 else 'peliculas',
args=dictUrl[name][1][2] if len(dictUrl[name]) > 1 else '') host + var[0], contentType= var[3] if len(var) > 2 else 'movie',
args=var[2] if len(dictUrl[name]) > 1 else '')
# if search menu # if search menu
if dictUrl['search'] is not None: if dictUrl['search'] is not None:
menuItem(itemlist, filename, 'Cerca... bold color kod', 'search', host + dictUrl['search']) menuItem(itemlist, filename, 'Cerca… bold', 'search', host + dictUrl['search'])
autoplay.show_option(item.channel, itemlist) autoplay.show_option(item.channel, itemlist)
channel_config(item, itemlist) channel_config(item, itemlist)
@@ -653,6 +669,8 @@ def typo(string, typography=''):
string = ' ' + re.sub(r'\s_','',string) string = ' ' + re.sub(r'\s_','',string)
if '--' in string: if '--' in string:
string = ' - ' + re.sub(r'\s--','',string) string = ' - ' + re.sub(r'\s--','',string)
if 'bullet' in string:
string = '[B]' + u"\u2022".encode('utf-8') + '[/B] ' + re.sub(r'\sbullet','',string)
return string return string
specials/autoplay.py
+6 -2
View File
@@ -16,6 +16,8 @@ PLAYED = False
autoplay_node = {} autoplay_node = {}
colorKOD = '0xFF65B3DA'
def context(): def context():
''' '''
@@ -36,7 +38,7 @@ def context():
context = context() context = context()
def show_option(channel, itemlist, text_color='yellow', thumbnail=None, fanart=None): def show_option(channel, itemlist, text_color=colorKOD, thumbnail=None, fanart=None):
''' '''
Agrega la opcion Configurar AutoPlay en la lista recibida Agrega la opcion Configurar AutoPlay en la lista recibida
@@ -63,10 +65,12 @@ def show_option(channel, itemlist, text_color='yellow', thumbnail=None, fanart=N
title=config.get_localized_string(60071), title=config.get_localized_string(60071),
action="autoplay_config", action="autoplay_config",
text_color=text_color, text_color=text_color,
text_bold=True,
thumbnail=thumbnail, thumbnail=thumbnail,
fanart=fanart, fanart=fanart,
plot=plot_autoplay, plot=plot_autoplay,
from_channel=channel from_channel=channel,
folder=False
)) ))
return itemlist return itemlist
specials/autorenumber.py
+1 -1
View File
@@ -259,7 +259,7 @@ def renumeration (itemlist, item, typography, dict_series, ID, SEASON, EPISODE,
return error(itemlist) return error(itemlist)
if len(EpisodeDict) >= len(itemlist): if len(EpisodeDict) >= len(itemlist):
for item in itemlist: for item in itemlist:
number = scrapertoolsV2.find_single_match(item.title, r'\d+') number = scrapertoolsV2.find_single_match(item.title, r'\d+').lstrip("0")
item.title = typo(EpisodeDict[str(number)] + ' - ', typography) + item.title item.title = typo(EpisodeDict[str(number)] + ' - ', typography) + item.title
else: else:
make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE, TITLE) make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE, TITLE)