aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/threeqsdn.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-07-15 03:36:50 +0700
committerSergey M․ <dstftw@gmail.com>2016-07-15 03:36:50 +0700
commitad27649be307a55b04fa497d244ccca33b4260b0 (patch)
tree3ce2398786a49227db142418cfd401085e6d9512 /youtube_dl/extractor/threeqsdn.py
parent84571be64592e11ec25a4b073ac74153c261441d (diff)
[3qsdn] Restrict src JS regex
Diffstat (limited to 'youtube_dl/extractor/threeqsdn.py')
-rw-r--r--youtube_dl/extractor/threeqsdn.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/threeqsdn.py b/youtube_dl/extractor/threeqsdn.py
index 33588424d..f26937da1 100644
--- a/youtube_dl/extractor/threeqsdn.py
+++ b/youtube_dl/extractor/threeqsdn.py
@@ -24,7 +24,7 @@ class ThreeQSDNIE(InfoExtractor):
'title': '0280d6b9-1215-11e6-b427-0cc47a188158',
'is_live': False,
},
- 'expected_warnings': ['Failed to download MPD manifest'],
+ 'expected_warnings': ['Failed to download MPD manifest', 'Failed to parse JSON'],
}, {
# live video stream
'url': 'https://playout.3qsdn.com/d755d94b-4ab9-11e3-9162-0025907ad44f?js=true',
@@ -118,7 +118,7 @@ class ThreeQSDNIE(InfoExtractor):
'vcodec': 'none' if stream_type == 'audio' else None,
})
- for item_js in re.findall(r'({.*?\b(?:src|source)\s*:\s*["\'].+?})', js):
+ for item_js in re.findall(r'({[^{]*?\b(?:src|source)\s*:\s*["\'].+?})', js):
f = self._parse_json(
item_js, video_id, transform_source=js_to_json, fatal=False)
if not f: