From a206b9ddaf7d495c5cfbcc5a4e000280678d6736 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 15:03:21 -0500 Subject: [PATCH] trailertools: fix --- plugin.video.alfa/channels/trailertools.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plugin.video.alfa/channels/trailertools.py b/plugin.video.alfa/channels/trailertools.py index 9f592c78..7168101e 100755 --- a/plugin.video.alfa/channels/trailertools.py +++ b/plugin.video.alfa/channels/trailertools.py @@ -158,14 +158,13 @@ def youtube_search(item): titulo = urllib.quote(titulo) titulo = titulo.replace("%20", "+") data = scrapertools.downloadpage("https://www.youtube.com/results?sp=EgIQAQ%253D%253D&q=" + titulo) - data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - patron = '.*?(?:src="https://i.ytimg.com/|data-thumb="https://i.ytimg.com/)([^"]+)"' \ - '.*?

.*?.*?(\d+:\d+)' + patron = """"thumbnails":\[\{"url":"(https://i.ytimg.com/vi[^"]+).*?""" + patron += """simpleText":"([^"]+).*?""" + patron += """simpleText":"[^"]+.*?simpleText":"([^"]+).*?""" + patron += """url":"([^"]+)""" matches = scrapertools.find_multiple_matches(data, patron) - for scrapedthumbnail, scrapedurl, scrapedtitle, scrapedduration in matches: - scrapedthumbnail = urlparse.urljoin("https://i.ytimg.com/", scrapedthumbnail) + for scrapedthumbnail, scrapedtitle, scrapedduration, scrapedurl in matches: scrapedtitle = scrapedtitle.decode("utf-8") scrapedtitle = scrapedtitle + " (" + scrapedduration + ")" if item.contextual: