Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
marco
2020-10-05 17:30:18 +02:00
3 changed files with 22 additions and 17 deletions

View File

@@ -70,12 +70,15 @@ def peliculas(item):
return locals()
def check(item):
# support.dbg()
item.url = support.match(item, patron=r'(?:<p>|/>)(.*?)(?:<br|</td>|</p>)', patronBlock=r'Streaming:(.*?)</tr>').matches
if 'Episodio' in str(item.url):
item.contentType = 'tvshow'
item.action ='episodios'
return episodios(item)
else:
item.contentType = 'movie'
item.action = 'findvideos'
return findvideos(item)
@support.scrape

View File

@@ -132,7 +132,7 @@ def findvideos(item):
if 'sub' in lang.lower():
language = 'Sub-' + language
quality = url.split('/')[-1].split('?')[0]
url += "|User-Agent=" + support.httptools.get_user_agent()
url += "|User-Agent=" + support.httptools.get_user_agent() + '&Referer=' + item.url
itemlist.append(item.clone(action="play", title=language, url=url, contentLanguage = language, quality = quality, order = quality.replace('p','').zfill(4), server='directo',))

View File

@@ -94,22 +94,23 @@ def show_menu(item):
item.sort = True
for key in json:
if key == 'menu':
get_menu(item, json, key, itemlist)
if item.filterkey and not item.filter:
itemlist += submenu(item, json, key)
elif key in ['movies_list', 'tvshows_list', 'generic_list']:
itemlist += peliculas(item, json, key)
elif key in ['seasons_list']:
item.url = json
itemlist += get_seasons(item)
elif key in ['episodes_list']:
itemlist += episodios(item, json, key)
elif key in ['links']:
itemlist += findvideos(item)
elif key in ['search'] and 'url' in json['search']:
search_json = json['search']
itemlist += get_search_menu(item, search_json)
if key != 'sort':
if key == 'menu':
get_menu(item, json, key, itemlist)
if item.filterkey and not item.filter:
itemlist += submenu(item, json, key)
elif key in ['movies_list', 'tvshows_list', 'generic_list']:
itemlist += peliculas(item, json, key)
elif key in ['seasons_list']:
item.url = json
itemlist += get_seasons(item)
elif key in ['episodes_list']:
itemlist += episodios(item, json, key)
elif key in ['links']:
itemlist += findvideos(item)
elif key in ['search'] and 'url' in json['search']:
search_json = json['search']
itemlist += get_search_menu(item, search_json)
@@ -600,6 +601,7 @@ def filter_thread(filter, key, item, description):
path=item.path,
filterkey=item.filterkey,
filter=filter,
sort=item.sort,
key=key)
if item.filterkey in ['genre']: