projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9cf26b6
)
[9now] Fix extraction (closes #22361)
author
Sergey M․
<dstftw@gmail.com>
Wed, 18 Sep 2019 19:31:39 +0000
(
02:31
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 18 Sep 2019 19:31:39 +0000
(
02:31
+0700)
youtube_dl/extractor/ninenow.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ninenow.py
b/youtube_dl/extractor/ninenow.py
index f32f530f75b16bec0040ce581b4122bd1166c795..6157dc7c16e785ca7f570a45c36cd8e90bbd05e1 100644
(file)
--- a/
youtube_dl/extractor/ninenow.py
+++ b/
youtube_dl/extractor/ninenow.py
@@
-45,7
+45,11
@@
class NineNowIE(InfoExtractor):
webpage = self._download_webpage(url, display_id)
page_data = self._parse_json(self._search_regex(
r'window\.__data\s*=\s*({.*?});', webpage,
webpage = self._download_webpage(url, display_id)
page_data = self._parse_json(self._search_regex(
r'window\.__data\s*=\s*({.*?});', webpage,
- 'page data'), display_id)
+ 'page data', default='{}'), display_id, fatal=False)
+ if not page_data:
+ page_data = self._parse_json(self._parse_json(self._search_regex(
+ r'window\.__data\s*=\s*JSON\.parse\s*\(\s*(".+?")\s*\)\s*;',
+ webpage, 'page data'), display_id), display_id)
for kind in ('episode', 'clip'):
current_key = page_data.get(kind, {}).get(
for kind in ('episode', 'clip'):
current_key = page_data.get(kind, {}).get(