diff --git a/channels/vvvvid.py b/channels/vvvvid.py index cf8e05d3..af5c7ec6 100644 --- a/channels/vvvvid.py +++ b/channels/vvvvid.py @@ -119,7 +119,7 @@ def episodios(item): itemlist.append( Item( channel = item.channel, - title = 'Episodio ' + str(key['number']) + ' - ' + key['title'], + title = 'Episodio ' + key['number'].encode('ascii', 'replace') + ' - ' + key['title'], fulltitle= item.fulltitle, show= item.show, url= host + show_id + '/season/' + str(key['season_id']) + '/', @@ -128,7 +128,8 @@ def episodios(item): contentType = item.contentType )) autorenumber.renumber(itemlist, item, 'bold') - support.videolibrary(itemlist,item) + if autorenumber.check(item) == True: + support.videolibrary(itemlist,item) return itemlist def findvideos(item): @@ -154,7 +155,7 @@ def findvideos(item): url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url, server= 'directo') ) - return support.server(item, itemlist=itemlist) + return support.server(item, itemlist=itemlist, download=False) def make_itemlist(itemlist, item, data): search = item.search if item.search else '' diff --git a/core/support.py b/core/support.py index d0e8a16d..e77e0d95 100644 --- a/core/support.py +++ b/core/support.py @@ -878,7 +878,7 @@ def pagination(itemlist, item, page, perpage, function_level=1): thumbnail=thumb())) return itemlist -def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True): +def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True, download=True): if not data: data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data @@ -929,7 +929,7 @@ def controls(itemlist, item, AutoPlay=True, CheckLinks=True): autoplay.start(itemlist, item) if item.contentChannel != 'videolibrary': videolibrary(itemlist, item, function_level=3) - if get_setting('downloadenabled'): download(itemlist, item, function_level=3) + if get_setting('downloadenabled') and download == True: download(itemlist, item, function_level=3) return itemlist def filterLang(item, itemlist): diff --git a/specials/autorenumber.py b/specials/autorenumber.py index e04a69b9..62482c12 100644 --- a/specials/autorenumber.py +++ b/specials/autorenumber.py @@ -262,7 +262,8 @@ def renumeration (itemlist, item, typography, dict_series, ID, SEASON, EPISODE, if len(EpisodeDict) >= len(itemlist): for item in itemlist: number = scrapertoolsV2.find_single_match(item.title, r'\d+') - if number != '0': number.lstrip("0") + log('TIPO NUMBER= ', type(number)) + number = int(number) item.title = typo(EpisodeDict[str(number)] + ' - ', typography) + item.title else: make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE, TITLE)