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

Fix autorenumber e support

Browse Source
This commit is contained in:
Alhaziel
2019-08-08 19:48:34 +02:00
parent fb88a5379a
commit a9a1043e5d
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/support.py
+9 -9
View File
@@ -247,7 +247,7 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
if scraped['type'] in variants: if scraped['type'] in variants:
action = name action = name
if ((scraped["title"] not in blacklist) or longtitle) and search.lower() in longtitle.lower(): if (scraped["title"] not in blacklist) and (search.lower() in longtitle.lower()):
it = Item( it = Item(
channel=item.channel, channel=item.channel,
action=action, action=action,
@@ -271,7 +271,7 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
if 'itemHook' in args: if 'itemHook' in args:
it = args['itemHook'](it) it = args['itemHook'](it)
itemlist.append(it) itemlist.append(it)
return itemlist, matches return itemlist, matches
@@ -354,13 +354,13 @@ def scrape(func):
elif patron: elif patron:
itemlist, matches = scrapeBlock(item, args, data, patron, headers, action, pagination, debug, typeContentDict, itemlist, matches = scrapeBlock(item, args, data, patron, headers, action, pagination, debug, typeContentDict,
typeActionDict, blacklist, search, pag, function) typeActionDict, blacklist, search, pag, function)
checkHost(item, itemlist) checkHost(item, itemlist)
if (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 == "episode" and action != "play") \
or (item.contentType == "movie" and action != "play") : # or (item.contentType == "movie" and action != "play") :
# if action != 'play' or (item.contentType == "tvshow" and action != "findvideos"): if action != 'play':
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
# else: # Si perde item show :( # else: # Si perde item show :(
# for it in itemlist: # for it in itemlist:
@@ -560,7 +560,7 @@ def menuItem(itemlist, filename, title='', action='', url='', contentType='movie
args = args, args = args,
contentType = contentType contentType = contentType
)) ))
# Apply auto Thumbnails at the menus # Apply auto Thumbnails at the menus
from channelselector import thumb from channelselector import thumb
thumb(itemlist) thumb(itemlist)
@@ -627,7 +627,7 @@ def menu(func):
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, 'Cerca ' + title + '… submenu bold', 'search', host + url, args=name) if 'search' not in args: menuItem(itemlist, filename, 'Cerca ' + title + '… submenu bold', 'search', host + url, args=name)
# Make EXTRA MENU (on bottom) # Make EXTRA MENU (on bottom)
for name, var in args.items(): for name, var in args.items():
if name not in listUrls and name != 'item': if name not in listUrls and name != 'item':
specials/autorenumber.py
+4
View File
@@ -323,6 +323,10 @@ def make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE
addiction = 0 addiction = 0
for item in itemlist: for item in itemlist:
# Otiene Numerazione Episodi # Otiene Numerazione Episodi
if scrapertoolsV2.find_single_match(item.title, r'\d+'):
continue
else:
break
episode = int(scrapertoolsV2.find_single_match(item.title, r'\d+')) episode = int(scrapertoolsV2.find_single_match(item.title, r'\d+'))
number = episode + FirstOfSeason - addiction number = episode + FirstOfSeason - addiction
count = number + addiction count = number + addiction