From 8ef6979b10519d62aa5b3ab527eab26f1890e9a3 Mon Sep 17 00:00:00 2001 From: tetra-eder Date: Fri, 11 Aug 2017 12:13:14 +0200 Subject: [PATCH] add requested changes --- youtube_dl/extractor/generic.py | 1 + youtube_dl/extractor/vzaar.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 176e35b38..51acead66 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -100,6 +100,7 @@ from .joj import JojIE from .megaphone import MegaphoneIE from .vzaar import VzaarIE + class GenericIE(InfoExtractor): IE_DESC = 'Generic downloader that works on some sites' _VALID_URL = r'.*' diff --git a/youtube_dl/extractor/vzaar.py b/youtube_dl/extractor/vzaar.py index b4d7903ed..02fcd52c7 100644 --- a/youtube_dl/extractor/vzaar.py +++ b/youtube_dl/extractor/vzaar.py @@ -11,7 +11,7 @@ from ..utils import ( class VzaarIE(InfoExtractor): - _VALID_URL = r'(https?://)?(?:(?:www|view)\.)?vzaar\.com/(?:videos/)?(?P\d+)' + _VALID_URL = r'https?://(?:(?:www|view)\.)?vzaar\.com/(?:videos/)?(?P\d+)' _TESTS = [{ 'url': 'https://vzaar.com/videos/1152805', 'md5': 'bde5ddfeb104a6c56a93a06b04901dbf', @@ -33,7 +33,7 @@ class VzaarIE(InfoExtractor): @staticmethod def _extract_urls(webpage): return re.findall( - r']+src=["\']//((?:view.vzaar\.com)/[0-9]+)', + r']+src=["\']((?:https?:)?//(?:view\.vzaar\.com)/[0-9]+)', webpage) def _real_extract(self, url):