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

merge

Browse Source
This commit is contained in:
marco
2020-02-28 18:48:29 +01:00
parent 2625cd446b 08946ebc19
commit cecb520a5e
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/cineblog01.py
+2 -1
View File
@@ -158,7 +158,8 @@ def peliculas(item):
# patronBlock=[r'<div class="?sequex-page-left"?>(?P<block>.*?)<aside class="?sequex-page-right"?>', # patronBlock=[r'<div class="?sequex-page-left"?>(?P<block>.*?)<aside class="?sequex-page-right"?>',
# '<div class="?card-image"?>.*?(?=<div class="?card-image"?>|<div class="?rating"?>)'] # '<div class="?card-image"?>.*?(?=<div class="?card-image"?>|<div class="?rating"?>)']
if 'newest' not in item.args: patronNext = '<a class="?page-link"? href="?([^>]+)"?><i class="fa fa-angle-right">' # if 'newest' not in item.args:
patronNext = '<a class="?page-link"? href="?([^>]+)"?><i class="fa fa-angle-right">'
return locals() return locals()
core/support.py
+1 -1
View File
@@ -420,7 +420,7 @@ def scrape(func):
# next page for pagination # next page for pagination
if pagination and len(matches) > pag * pagination and not search: if pagination and len(matches) > pag * pagination and not search:
if inspect.stack()[1][3] != 'get_newest': if inspect.stack()[1][3] not in ['newest','get_newest']:
itemlist.append( itemlist.append(
Item(channel=item.channel, Item(channel=item.channel,
action = item.action, action = item.action,
core/videolibrarytools.py
+2 -1
View File
@@ -461,13 +461,14 @@ def save_tvshow(item, episodelist):
item.infoLabels['title'] = item.contentSerieName item.infoLabels['title'] = item.contentSerieName
item_tvshow = Item(title=item.contentSerieName, channel="videolibrary", action="get_seasons", item_tvshow = Item(title=item.contentSerieName, channel="videolibrary", action="get_seasons",
fanart=item.infoLabels['fanart'], thumbnail=item.infoLabels['thumbnail'], fanart=item.infoLabels['fanart'], thumbnail=item.infoLabels['thumbnail'],
infoLabels=item.infoLabels, path=path.replace(TVSHOWS_PATH, "")) infoLabels=item.infoLabels, path=path.replace(TVSHOWS_PATH, ""), fulltitle=item.fulltitle)
item_tvshow.library_playcounts = {} item_tvshow.library_playcounts = {}
item_tvshow.library_urls = {item.channel: item.url} item_tvshow.library_urls = {item.channel: item.url}
else: else:
# Si existe tvshow.nfo, pero estamos añadiendo un nuevo canal actualizamos el listado de urls # Si existe tvshow.nfo, pero estamos añadiendo un nuevo canal actualizamos el listado de urls
head_nfo, item_tvshow = read_nfo(tvshow_path) head_nfo, item_tvshow = read_nfo(tvshow_path)
item_tvshow.fulltitle = item.fulltitle
item_tvshow.channel = "videolibrary" item_tvshow.channel = "videolibrary"
item_tvshow.action = "get_seasons" item_tvshow.action = "get_seasons"
item_tvshow.library_urls[item.channel] = item.url item_tvshow.library_urls[item.channel] = item.url