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

Merge branch 'stable' of github.com:kodiondemand/addon into stable

Browse Source
This commit is contained in:
marco
2020-01-20 22:58:21 +01:00
parent 9be1be7f57 e82855ba9a
commit 419d796320
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/support.py
+5 -3
View File
@@ -423,6 +423,9 @@ def scrape(func):
if 'itemlistHook' in args:
itemlist = args['itemlistHook'](itemlist)
if 'fullItemlistHook' in args:
itemlist = args['fullItemlistHook'](itemlist)
if (pagination and len(matches) <= pag * pagination) or not pagination: # next page with pagination
if patronNext and inspect.stack()[1][3] != 'newest':
nextPage(itemlist, item, data, patronNext, function)
@@ -461,8 +464,7 @@ def scrape(func):
if 'patronMenu' in args and itemlist:
itemlist = thumb(itemlist, genre=True)
if 'fullItemlistHook' in args:
itemlist = args['fullItemlistHook'](itemlist)
# itemlist = filterLang(item, itemlist) # causa problemi a newest
@@ -971,7 +973,7 @@ def nextPage(itemlist, item, data='', patron='', function_or_level=1, next_page=
if next_page != "":
if resub: next_page = re.sub(resub[0], resub[1], next_page)
if 'http' not in next_page:
next_page = scrapertools.find_single_match(item.url, 'https?://[a-z0-9.-]+') + next_page
next_page = scrapertools.find_single_match(item.url, 'https?://[a-z0-9.-]+') + (next_page if next_page.startswith('/') else '/' + next_page)
next_page = re.sub('&amp;', '&',next_page)
log('NEXT= ', next_page)
itemlist.append(