From a6cbd81dbbd84d6ea792748e72a145fd76cb4262 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Fri, 2 Dec 2022 12:45:51 +0100 Subject: [PATCH] Fix VOE --- servers/voe.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/servers/voe.py b/servers/voe.py index 0e17e14a..c6aa19ab 100644 --- a/servers/voe.py +++ b/servers/voe.py @@ -25,15 +25,17 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) - # from core import support + from core import support + # support.dbg() video_urls = [] + video_srcs = support.match(data, patron=r"src: '([^']+)'") video_srcs = scrapertools.find_multiple_matches(data, r"src: '([^']+)'") if not video_srcs: - bloque = scrapertools.find_single_match(data, "sources.*?\}") + # bloque = scrapertools.find_single_match(data, "sources.*?\}") # video_srcs = support.match(bloque, patron=': "([^"]+)', debug=True) - video_srcs = scrapertools.find_multiple_matches(bloque, ''': ['"]([^'"]+)''') - for url in video_srcs: - video_urls.append([url.split('.')[-1] + " [Voe]", url]) + video_srcs = support.match(data, patronBlock=r'sources [^\{]+{([^}]+)', patron=r'''['"]([^'"]+)[^:]+: ['"]([^'"]+)['"]''').matches + for ext, url in video_srcs: + video_urls.append([ext + " [Voe]", url]) return video_urls