projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4eb10f6
)
[youtube] More useful messages for georestricted videos (#5716)
author
Yen Chi Hsuan
<yan12125@gmail.com>
Sat, 27 Jun 2015 05:15:57 +0000
(13:15 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Sat, 27 Jun 2015 05:15:57 +0000
(13:15 +0800)
youtube_dl/extractor/youtube.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/youtube.py
b/youtube_dl/extractor/youtube.py
index a3da56c1413494ffd73d523a042959af16956ff0..d9240ff02b5f6d5ba19350044022ae535443a599 100644
(file)
--- a/
youtube_dl/extractor/youtube.py
+++ b/
youtube_dl/extractor/youtube.py
@@
-32,6
+32,7
@@
from ..utils import (
unescapeHTML,
unified_strdate,
uppercase_escape,
unescapeHTML,
unified_strdate,
uppercase_escape,
+ ISO3166Utils,
)
)
@@
-903,6
+904,12
@@
class YoutubeIE(YoutubeBaseInfoExtractor):
break
if 'token' not in video_info:
if 'reason' in video_info:
break
if 'token' not in video_info:
if 'reason' in video_info:
+ if 'The uploader has not made this video available in your country.' in video_info['reason']:
+ regions_allowed = self._html_search_meta('regionsAllowed', video_webpage, default=None)
+ if regions_allowed is not None:
+ raise ExtractorError('YouTube said: This video is available in %s only' % (
+ ', '.join(map(ISO3166Utils.short2full, regions_allowed.split(',')))),
+ expected=True)
raise ExtractorError(
'YouTube said: %s' % video_info['reason'][0],
expected=True, video_id=video_id)
raise ExtractorError(
'YouTube said: %s' % video_info['reason'][0],
expected=True, video_id=video_id)