diff options
| author | Sergey M․ <dstftw@gmail.com> | 2018-06-24 23:57:22 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2018-06-24 23:57:22 +0700 |
| commit | a0949fec081d0badd6a584526cd66e8f170625c2 (patch) | |
| tree | 52a8e8c6c107f6d78137b15a3b92971c85b69d58 /youtube_dl/extractor/joj.py | |
| parent | 74caf528bc822738dffe231df86ed399fc97a38a (diff) | |
| download | youtube-dl-a0949fec081d0badd6a584526cd66e8f170625c2.tar.xz | |
[joj] Relax _VALID_URL (closes #16771)
Diffstat (limited to 'youtube_dl/extractor/joj.py')
| -rw-r--r-- | youtube_dl/extractor/joj.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/youtube_dl/extractor/joj.py b/youtube_dl/extractor/joj.py index a764023e9..d9f8dbfd2 100644 --- a/youtube_dl/extractor/joj.py +++ b/youtube_dl/extractor/joj.py @@ -18,7 +18,7 @@ class JojIE(InfoExtractor): joj:|
https?://media\.joj\.sk/embed/
)
- (?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})
+ (?P<id>[^/?#^]+)
'''
_TESTS = [{
'url': 'https://media.joj.sk/embed/a388ec4c-6019-4a4a-9312-b1bee194e932',
@@ -30,15 +30,23 @@ class JojIE(InfoExtractor): 'duration': 3118,
}
}, {
+ 'url': 'https://media.joj.sk/embed/9i1cxv',
+ 'only_matching': True,
+ }, {
'url': 'joj:a388ec4c-6019-4a4a-9312-b1bee194e932',
'only_matching': True,
+ }, {
+ 'url': 'joj:9i1cxv',
+ 'only_matching': True,
}]
@staticmethod
def _extract_urls(webpage):
- return re.findall(
- r'<iframe\b[^>]+\bsrc=["\'](?P<url>(?:https?:)?//media\.joj\.sk/embed/[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})',
- webpage)
+ return [
+ mobj.group('url')
+ for mobj in re.finditer(
+ r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//media\.joj\.sk/embed/(?:(?!\1).)+)\1',
+ webpage)]
def _real_extract(self, url):
video_id = self._match_id(url)
|