projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
774ce35
)
Merge pull request #7942 from ausbin/comcarcoff-json-fix
author
Sergey M
<dstftw@gmail.com>
Tue, 22 Dec 2015 19:05:54 +0000
(
01:05
+0600)
committer
Sergey M
<dstftw@gmail.com>
Tue, 22 Dec 2015 19:05:54 +0000
(
01:05
+0600)
[comcarcoff] adjust for json updates
youtube_dl/extractor/comcarcoff.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/comcarcoff.py
b/youtube_dl/extractor/comcarcoff.py
index 81f3d7697b843d3d9abb23fbc047b8230a69b351..4391b7ce4ce50973b05ed1dcb255fc819e0e113d 100644
(file)
--- a/
youtube_dl/extractor/comcarcoff.py
+++ b/
youtube_dl/extractor/comcarcoff.py
@@
-32,8
+32,8
@@
class ComCarCoffIE(InfoExtractor):
webpage = self._download_webpage(url, display_id)
full_data = json.loads(self._search_regex(
- r'
<script type="application/json" id="videoData">(?P<json>.+?)</script>
',
- webpage, 'full data json'))
+ r'
\nwindow.app = (?P<json>.+?);\n
',
+ webpage, 'full data json'))
['videoData']
video_id = full_data['activeVideo']['video']
video_data = full_data.get('videos', {}).get(video_id) or full_data['singleshots'][video_id]