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

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

Browse Source
This commit is contained in:
marco
2020-10-05 17:30:18 +02:00
parent c65598710a 73008d958d
commit aec033163e
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/cb01anime.py
+3
View File
@@ -70,12 +70,15 @@ def peliculas(item):
return locals() return locals()
def check(item): def check(item):
# support.dbg()
item.url = support.match(item, patron=r'(?:<p>|/>)(.*?)(?:<br|</td>|</p>)', patronBlock=r'Streaming:(.*?)</tr>').matches item.url = support.match(item, patron=r'(?:<p>|/>)(.*?)(?:<br|</td>|</p>)', patronBlock=r'Streaming:(.*?)</tr>').matches
if 'Episodio' in str(item.url): if 'Episodio' in str(item.url):
item.contentType = 'tvshow' item.contentType = 'tvshow'
item.action ='episodios'
return episodios(item) return episodios(item)
else: else:
item.contentType = 'movie' item.contentType = 'movie'
item.action = 'findvideos'
return findvideos(item) return findvideos(item)
@support.scrape @support.scrape
channels/dreamsub.py
+1 -1
View File
@@ -132,7 +132,7 @@ def findvideos(item):
if 'sub' in lang.lower(): if 'sub' in lang.lower():
language = 'Sub-' + language language = 'Sub-' + language
quality = url.split('/')[-1].split('?')[0] 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',)) itemlist.append(item.clone(action="play", title=language, url=url, contentLanguage = language, quality = quality, order = quality.replace('p','').zfill(4), server='directo',))
specials/community.py
+18 -16
View File
@@ -94,22 +94,23 @@ def show_menu(item):
item.sort = True item.sort = True
for key in json: for key in json:
if key == 'menu': if key != 'sort':
get_menu(item, json, key, itemlist) if key == 'menu':
if item.filterkey and not item.filter: get_menu(item, json, key, itemlist)
itemlist += submenu(item, json, key) if item.filterkey and not item.filter:
elif key in ['movies_list', 'tvshows_list', 'generic_list']: itemlist += submenu(item, json, key)
itemlist += peliculas(item, json, key) elif key in ['movies_list', 'tvshows_list', 'generic_list']:
elif key in ['seasons_list']: itemlist += peliculas(item, json, key)
item.url = json elif key in ['seasons_list']:
itemlist += get_seasons(item) item.url = json
elif key in ['episodes_list']: itemlist += get_seasons(item)
itemlist += episodios(item, json, key) elif key in ['episodes_list']:
elif key in ['links']: itemlist += episodios(item, json, key)
itemlist += findvideos(item) elif key in ['links']:
elif key in ['search'] and 'url' in json['search']: itemlist += findvideos(item)
search_json = json['search'] elif key in ['search'] and 'url' in json['search']:
itemlist += get_search_menu(item, search_json) 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, path=item.path,
filterkey=item.filterkey, filterkey=item.filterkey,
filter=filter, filter=filter,
sort=item.sort,
key=key) key=key)
if item.filterkey in ['genre']: if item.filterkey in ['genre']: