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

Merge branch 'master' of github.com:kodiondemand/addon

Browse Source
This commit is contained in:
mac12m99
2019-08-01 18:08:48 +02:00
parent 9ea939469f 9a9fea87b1
commit 58359146cf
7 changed files with 80 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/support.py
+12 -12
View File
@@ -306,17 +306,18 @@ def scrape(func):
it = Item(
channel=item.channel,
action=action,
contentType= 'episode' if item.action == 'episodios' else item.contentType,
contentType= 'episode' if (action == 'findvideos' and item.contentType == 'tvshow') else item.contentType,
title=longtitle,
fulltitle=title,
show=item.show if item.action == 'episodios' else title,
fulltitle=item.fulltitle if (action == 'findvideos' and item.contentType != 'movie') else title,
show=item.show if (action == 'findvideos' and item.contentType != 'movie') else title,
quality=scraped["quality"],
url=scraped["url"],
infoLabels=infolabels,
thumbnail=scraped["thumb"],
args=item.args
args=item.args,
contentSerieName = title if (action == 'episodios' and item.contentType != 'movie') else ''
)
for lg in list(set(listGroups).difference(known_keys)):
it.__setattr__(lg, match[listGroups.index(lg)])
@@ -325,13 +326,13 @@ def scrape(func):
itemlist.append(it)
checkHost(item, itemlist)
if ('patronMenu' not in args and item.contentType == "tvshow" and (action == "findvideos" and action != "play")) \
if (item.contentType == "tvshow" and (action != "findvideos" and action != "play")) \
or (item.contentType == "episode" and action != "play") \
or (item.contentType == "movie" and action != "play") :
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
else:
for it in itemlist:
it.infoLabels = item.infoLabels
# else: # Si perde item show :(
# for it in itemlist:
# it.infoLabels = item.infoLabels
if 'itemlistHook' in args:
itemlist = args['itemlistHook'](itemlist)
@@ -361,7 +362,7 @@ def scrape(func):
videolibrary(itemlist, item)
if 'patronMenu' in args:
itemlist = thumb(itemlist)
itemlist = thumb(itemlist, genre=True)
if 'fullItemlistHook' in args:
itemlist = args['fullItemlistHook'](itemlist)
@@ -531,7 +532,6 @@ def menuItem(itemlist, filename, title='', action='', url='', contentType='movie
# Apply auto Thumbnails at the menus
from channelselector import thumb
thumb(itemlist)
return itemlist
@@ -588,7 +588,7 @@ def menu(func):
if dictUrl[name] is not None and type(dictUrl[name]) is not str:
for sub, var in dictUrl[name]:
menuItem(itemlist, filename,
title = sub + ' submenu',
title = sub + ' submenu' + typo(title,'_ {}'),
url = host + var[0] if len(var) > 0 else '',
action = var[1] if len(var) > 1 else 'peliculas',
args=var[2] if len(dictUrl[name]) > 2 else '',
core/videolibrarytools.py
+3 -3
View File
@@ -340,7 +340,7 @@ def save_tvshow(item, episodelist):
'''msg = "Insertados: %d | Sobreescritos: %d | Fallidos: %d | Tiempo: %2.2f segundos" % \
(insertados, sobreescritos, fallidos, time.time() - start_time)
logger.debug(msg)'''
return insertados, sobreescritos, fallidos, path
@@ -398,8 +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__('specials.%s' % channel_alt, fromlist=["specials.%s" % channel_alt])
try: channel = __import__('specials.%s' % channel_alt, fromlist=["specials.%s" % channel_alt])
except: channel = __import__('channels.%s' % channel_alt, fromlist=["channels.%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