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

Fix VVVVID

Browse Source
This commit is contained in:
Alhaziel01
2021-03-27 09:19:59 +01:00
parent 3e83618baa
commit 3f8466d83c
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
channels/vvvvid.py
View File

@@ -29,6 +29,7 @@ main_host = host + '/vvvvid/ondemand/'
@support.menu @support.menu
def mainlist(item): def mainlist(item):
if conn_id: if conn_id:
host = main_host
anime = ['anime/', anime = ['anime/',
('Popolari',['anime/', 'peliculas', 'channel/10002/last/']), ('Popolari',['anime/', 'peliculas', 'channel/10002/last/']),
('Nuove Uscite',['anime/', 'peliculas', 'channel/10007/last/']), ('Nuove Uscite',['anime/', 'peliculas', 'channel/10007/last/']),

16
core/support.py
View File

@@ -138,7 +138,7 @@ def scrapeLang(scraped, lang, longtitle):
# e credo sia utile per filtertools # e credo sia utile per filtertools
language = '' language = ''
if scraped['lang']: if scraped.get('lang'):
if 'ita' in scraped['lang'].lower(): language = 'ITA' if 'ita' in scraped['lang'].lower(): language = 'ITA'
if 'sub' in scraped['lang'].lower(): language = 'Sub-' + language if 'sub' in scraped['lang'].lower(): language = 'Sub-' + language
@@ -709,10 +709,12 @@ def menu(func):
item = args['item'] item = args['item']
logger.debug(item.channel + ' menu start') logger.debug(item.channel + ' menu start')
host = func.__globals__['host'] host = func.__globals__['host']
menuHost = args.get('host','')
if menuHost: host = menuHost
filename = func.__module__.split('.')[1] filename = func.__module__.split('.')[1]
single_search = False single_search = False
# listUrls = ['film', 'filmSub', 'tvshow', 'tvshowSub', 'anime', 'animeSub', 'search', 'top', 'topSub'] # listUrls = ['film', 'filmSub', 'tvshow', 'tvshowSub', 'anime', 'animeSub', 'search', 'top', 'topSub']
listUrls = ['top', 'film', 'tvshow', 'anime', 'search'] listUrls = ['top', 'film', 'tvshow', 'anime', 'search', 'host']
listUrls_extra = [] listUrls_extra = []
dictUrl = {} dictUrl = {}
@@ -895,12 +897,13 @@ def match(item_url_string, **args):
matches: all the matches matches: all the matches
''' '''
matches = blocks = [] matches = []
blocks = []
url = None url = None
# arguments allowed for scrape # arguments allowed for scrape
patron = args.get('patron', None) patron = args.get('patron', None)
patronBlock = args.get('patronBlock', None) patronBlock = args.get('patronBlock', None)
patronBlocks = args.get('patronBlock', None) patronBlocks = args.get('patronBlocks', None)
debug = args.get('debug', False) debug = args.get('debug', False)
debugBlock = args.get('debugBlock', False) debugBlock = args.get('debugBlock', False)
string = args.get('string', False) string = args.get('string', False)
@@ -934,8 +937,9 @@ def match(item_url_string, **args):
if patronBlock: if patronBlock:
blocks = [scrapertools.find_single_match(data, patronBlock)] blocks = [scrapertools.find_single_match(data, patronBlock)]
elif patronBlocks: elif patronBlocks:
if type(patronBlock) == str: patron = [patronBlock] if type(patronBlocks) == str:
for p in patronBlock: patronBlocks = [patronBlocks]
for p in patronBlocks:
blocks += scrapertools.find_multiple_matches(data, p) blocks += scrapertools.find_multiple_matches(data, p)
else: else:
blocks = [data] blocks = [data]