projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[utils] Work around PyPy stupidity with Windows DLLs (Fixes #4392)"
[youtube-dl]
/
youtube_dl
/
extractor
/
niconico.py
diff --git
a/youtube_dl/extractor/niconico.py
b/youtube_dl/extractor/niconico.py
index 62d5707fee87302b5f69544f768b1a56a5e3976b..1d9c1a096403e7e7b4f3835f31dbee31812594c9 100644
(file)
--- a/
youtube_dl/extractor/niconico.py
+++ b/
youtube_dl/extractor/niconico.py
@@
-12,6
+12,7
@@
from ..utils import (
unified_strdate,
parse_duration,
int_or_none,
unified_strdate,
parse_duration,
int_or_none,
+ ExtractorError,
)
)
@@
-108,6
+109,9
@@
class NiconicoIE(InfoExtractor):
flv_info_request, video_id,
note='Downloading flv info', errnote='Unable to download flv info')
flv_info_request, video_id,
note='Downloading flv info', errnote='Unable to download flv info')
+ if 'deleted=' in flv_info_webpage:
+ raise ExtractorError('The video has been deleted.',
+ expected=True)
video_real_url = compat_urlparse.parse_qs(flv_info_webpage)['url'][0]
# Start extracting information
video_real_url = compat_urlparse.parse_qs(flv_info_webpage)['url'][0]
# Start extracting information
@@
-166,12
+170,13
@@
class NiconicoPlaylistIE(InfoExtractor):
webpage = self._download_webpage(url, list_id)
entries_json = self._search_regex(r'Mylist\.preload\(\d+, (\[.*\])\);',
webpage = self._download_webpage(url, list_id)
entries_json = self._search_regex(r'Mylist\.preload\(\d+, (\[.*\])\);',
- webpage, 'entries')
+
webpage, 'entries')
entries = json.loads(entries_json)
entries = [{
'_type': 'url',
'ie_key': NiconicoIE.ie_key(),
entries = json.loads(entries_json)
entries = [{
'_type': 'url',
'ie_key': NiconicoIE.ie_key(),
- 'url': 'http://www.nicovideo.jp/watch/%s' % entry['item_id'],
+ 'url': ('http://www.nicovideo.jp/watch/%s' %
+ entry['item_data']['video_id']),
} for entry in entries]
return {
} for entry in entries]
return {