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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
mac12m99
2019-07-21 17:24:02 +02:00
parent 0ed9913358 320eb3fe20
commit f4bb92fe8c
2 changed files with 58 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
core/support.py
View File

@@ -464,34 +464,71 @@ def menu(func):
list_quality = func.__globals__['list_quality']
filename = func.__module__.split('.')[1]
listUrls = ['film', 'filmSub', 'tvshow', 'tvshowSub']
listUrls = ['film', 'filmSub', 'tvshow', 'tvshowSub', 'anime', 'animeSub', 'search']
listUrls_extra = []
dictUrl = {}
for name in listUrls:
dictUrl[name] = args[name] if name in args else None
for name, var in args.items():
if name not in listUrls and name != 'item':
listUrls_extra.append(name)
for name in listUrls_extra:
dictUrl[name] = args[name] if name in args else None
autoplay.init(item.channel, list_servers, list_quality)
# Main options
itemlist = []
# if film menu
if dictUrl['film'] is not None:
menuItem(itemlist, filename, 'Film bold', 'peliculas', host + dictUrl['film'])
### modificato by greko ########
for sub, var in dictUrl['filmSub']:
menuItem(itemlist, filename, sub + ' submenu', var[1],
host + var[0],
args=var[2] if len(var)>2 else '')
menuItem(itemlist, filename, 'Cerca submenu bold', 'search', host, args='film')
if dictUrl['filmSub']:
for sub, var in dictUrl['filmSub']:
menuItem(itemlist, filename, sub + ' submenu', var[1],
host + var[0],
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 tvshow menu
if dictUrl['tvshow'] is not None:
menuItem(itemlist, filename, 'Serie TV bold', 'peliculas', host + dictUrl['tvshow'], contentType='tvshow')
if dictUrl['tvshowSub']:
for sub, var in dictUrl['tvshowSub']:
menuItem(itemlist, filename, sub + ' submenu', var[1],
host + var[0], contentType='tvshow',
args=var[2] if len(var)>2 else '')
for sub, var in dictUrl['tvshowSub']:
menuItem(itemlist, filename, sub + ' submenu', var[1],
host + var[0], contentType='tvshow',
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 anime menu
if dictUrl['anime'] is not None:
menuItem(itemlist, filename, 'Anime bold', 'peliculas', host + dictUrl['anime'], contentType='tvshow', args='anime')
if dictUrl['animeSub']:
for sub, var in dictUrl['animeSub']:
menuItem(itemlist, filename, sub + ' submenu', var[1],
host + var[0], contentType='tvshow',
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 menu item not in defaults
for name in listUrls_extra:
if len(name) > 2 and name[-3:] == 'Sub':
for sub, var in dictUrl[name]:
menuItem(itemlist, filename, sub + ' submenu', var[1],
host + var[0], var[3] if len(var)>3 else 'movie',
args=var[2] if len(var)>2 else '')
else:
menuItem(itemlist, filename, dictUrl[name][0], dictUrl[name][1][1] if len(dictUrl[name][1]) > 0 else 'peliculas',
host + dictUrl[name][1][0], contentType= dictUrl[name][1][3] if len(dictUrl[name][1]) > 2 else 'movie',
args=dictUrl[name][1][2] if len(dictUrl[name]) > 1 else '')
# if search menu
if dictUrl['search'] is not None:
menuItem(itemlist, filename, 'Cerca... bold color kod', 'search', host + dictUrl['search'])
menuItem(itemlist, filename, 'Cerca submenu bold', 'search', host, args='serie')
### fine by greko ########
autoplay.show_option(item.channel, itemlist)
return itemlist

10
core/videolibrarytools.py
View File

@@ -203,6 +203,7 @@ def save_movie(item):
item_nfo.library_urls[item.channel] = item.url
if filetools.write(nfo_path, head_nfo + item_nfo.tojson()):
#logger.info("FOLDER_MOVIES : %s" % FOLDER_MOVIES)
# actualizamos la videoteca de Kodi con la pelicula
if config.is_xbmc():
from platformcode import xbmc_videolibrary
@@ -397,7 +398,8 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
channel_alt = generictools.verify_channel(serie.channel) #Preparamos para añadir las urls de emergencia
emergency_urls_stat = config.get_setting("emergency_urls", channel_alt) #El canal quiere urls de emergencia?
emergency_urls_succ = False
channel = __import__('channels.%s' % channel_alt, fromlist=["channels.%s" % channel_alt])
#channel = __import__('channels.%s' % channel_alt, fromlist=["channels.%s" % channel_alt])
channel = __import__('specials.%s' % channel_alt, fromlist=["specials.%s" % channel_alt])
if serie.torrent_caching_fail: #Si el proceso de conversión ha fallado, no se cachean
emergency_urls_stat = 0
del serie.torrent_caching_fail
@@ -676,7 +678,8 @@ def add_tvshow(item, channel=None):
if not channel:
try:
channel = __import__('channels.%s' % item.channel, fromlist=["channels.%s" % item.channel])
#channel = __import__('channels.%s' % item.channel, fromlist=["channels.%s" % item.channel])
channel = __import__('specials.%s' % channel_alt, fromlist=["specials.%s" % channel_alt])
except ImportError:
exec "import channels." + item.channel + " as channel"
@@ -740,7 +743,8 @@ def emergency_urls(item, channel=None, path=None):
try:
if channel == None: #Si el llamador no ha aportado la estructura de channel, se crea
channel = generictools.verify_channel(item.channel) #Se verifica si es un clon, que devuelva "newpct1"
channel = __import__('channels.%s' % channel, fromlist=["channels.%s" % channel])
#channel = __import__('channels.%s' % channel, fromlist=["channels.%s" % channel])
channel = __import__('specials.%s' % channel_alt, fromlist=["specials.%s" % channel_alt])
if hasattr(channel, 'findvideos'): #Si el canal tiene "findvideos"...
item.videolibray_emergency_urls = True #... se marca como "lookup"
channel_save = item.channel #... guarda el canal original por si hay fail-over en Newpct1