From e4fce66a6200281ed70309dd75d44bcc385795d1 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Thu, 13 Aug 2020 20:04:22 +0200 Subject: [PATCH 1/3] Fix AnimeUniverse --- channels/animeuniverse.py | 1 + 1 file changed, 1 insertion(+) diff --git a/channels/animeuniverse.py b/channels/animeuniverse.py index 76778c93..b5639af1 100644 --- a/channels/animeuniverse.py +++ b/channels/animeuniverse.py @@ -63,6 +63,7 @@ def newest(categoria): @support.scrape def peliculas(item): + query = '' if '/mos/' in item.url: item.contentType = 'movie' action='findvideos' From 302a4621a69ce5c8faa42a4f230d7b3cd3db576f Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Thu, 13 Aug 2020 20:32:21 +0200 Subject: [PATCH 2/3] Test YouTube Esterno --- servers/youtube.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/servers/youtube.py b/servers/youtube.py index ca788f87..96620961 100644 --- a/servers/youtube.py +++ b/servers/youtube.py @@ -98,6 +98,7 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): + from xbmcaddon import Addon logger.info("(page_url='%s')" % page_url) if not page_url.startswith("http"): @@ -105,7 +106,13 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= logger.info(" page_url->'%s'" % page_url) video_id = scrapertools.find_single_match(page_url, '(?:v=|embed/)([A-z0-9_-]{11})') - video_urls = extract_videos(video_id) + try: + __settings__ = Addon('plugin.video.youtube') + if not __settings__.getSetting('kodion.video.quality.mpd') and HasAddon(inputstream.adaptive): + __settings__.setSetting('kodion.video.quality.mpd', 'true') + video_urls = [[ 'con YouTube', 'plugin://plugin.video.youtube/play/?video_id=' + video_id ]] + except: + video_urls = extract_videos(video_id) return sorted(video_urls, reverse=True) @@ -209,10 +216,10 @@ def extract_videos(video_id): opt = dict(opt) if "audioQuality" not in opt: continue - if "signatureCipher" in opt and opt['mimeType'].startswith('video'): + if "cipher" in opt: signature = get_signature(youtube_page_data) - cipher = dict(urlparse.parse_qsl(urllib.unquote(opt["signatureCipher"]))) - url = re.search('url=(.*)', opt["signatureCipher"]).group(1) + cipher = dict(urlparse.parse_qsl(urllib.unquote(opt["cipher"]))) + url = re.search('url=(.*)', opt["cipher"]).group(1) s = cipher.get('s') url = "%s&sig=%s" % (urllib.unquote(url), signature([s])) video_urls.append(["%s" % itag_list.get(opt["itag"], "video"), url]) From 1f84c64c08267054ffb503d65768fb0e86694264 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Thu, 13 Aug 2020 20:33:13 +0200 Subject: [PATCH 3/3] ops --- servers/youtube.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/youtube.py b/servers/youtube.py index 96620961..531a2df2 100644 --- a/servers/youtube.py +++ b/servers/youtube.py @@ -108,7 +108,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= video_id = scrapertools.find_single_match(page_url, '(?:v=|embed/)([A-z0-9_-]{11})') try: __settings__ = Addon('plugin.video.youtube') - if not __settings__.getSetting('kodion.video.quality.mpd') and HasAddon(inputstream.adaptive): + if not __settings__.getSetting('kodion.video.quality.mpd'): __settings__.setSetting('kodion.video.quality.mpd', 'true') video_urls = [[ 'con YouTube', 'plugin://plugin.video.youtube/play/?video_id=' + video_id ]] except: