projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2599956
)
[atvat] Fix extraction (closes #18041)
author
NeroBurner
<pyro4hell@gmail.com>
Fri, 16 Nov 2018 17:18:50 +0000
(18:18 +0100)
committer
Sergey M
<dstftw@gmail.com>
Fri, 16 Nov 2018 17:18:50 +0000
(
00:18
+0700)
youtube_dl/extractor/atvat.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/atvat.py
b/youtube_dl/extractor/atvat.py
index 1584d53fc3784d3ffe1a89ca2856d30f4b94380c..95e572d70c2473e69ebce18df4ad8c9e51c50c1d 100644
(file)
--- a/
youtube_dl/extractor/atvat.py
+++ b/
youtube_dl/extractor/atvat.py
@@
-28,8
+28,10
@@
class ATVAtIE(InfoExtractor):
display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id)
video_data = self._parse_json(unescapeHTML(self._search_regex(
display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id)
video_data = self._parse_json(unescapeHTML(self._search_regex(
- r'class="[^"]*jsb_video/FlashPlayer[^"]*"[^>]+data-jsb="([^"]+)"',
- webpage, 'player data')), display_id)['config']['initial_video']
+ [r'flashPlayerOptions\s*=\s*(["\'])(?P<json>(?:(?!\1).)+)\1',
+ r'class="[^"]*jsb_video/FlashPlayer[^"]*"[^>]+data-jsb="(?P<json>[^"]+)"'],
+ webpage, 'player data', group='json')),
+ display_id)['config']['initial_video']
video_id = video_data['id']
video_title = video_data['title']
video_id = video_data['id']
video_title = video_data['title']