projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[__init__] Simplify colon presence check
[youtube-dl]
/
youtube_dl
/
extractor
/
vevo.py
diff --git
a/youtube_dl/extractor/vevo.py
b/youtube_dl/extractor/vevo.py
index 3cb0343e6f0f38c807e5a7ec7e09681242258dd8..c0632cd6af4b725d9a852871351c7915751b927b 100644
(file)
--- a/
youtube_dl/extractor/vevo.py
+++ b/
youtube_dl/extractor/vevo.py
@@
-189,8
+189,8
@@
class VevoIE(VevoBaseIE):
errnote='Unable to retrieve oauth token')
if 'THIS PAGE IS CURRENTLY UNAVAILABLE IN YOUR REGION' in webpage:
errnote='Unable to retrieve oauth token')
if 'THIS PAGE IS CURRENTLY UNAVAILABLE IN YOUR REGION' in webpage:
-
raise ExtractorError
(
- '%s said: This page is currently unavailable in your region
.' % self.IE_NAME, expected=True
)
+
self.raise_geo_restricted
(
+ '%s said: This page is currently unavailable in your region
' % self.IE_NAME
)
auth_info = self._parse_json(webpage, video_id)
self._api_url_template = self.http_scheme() + '//apiv2.vevo.com/%s?token=' + auth_info['access_token']
auth_info = self._parse_json(webpage, video_id)
self._api_url_template = self.http_scheme() + '//apiv2.vevo.com/%s?token=' + auth_info['access_token']
@@
-203,18
+203,17
@@
class VevoIE(VevoBaseIE):
json_url = 'http://api.vevo.com/VideoService/AuthenticateVideo?isrc=%s' % video_id
response = self._download_json(
json_url = 'http://api.vevo.com/VideoService/AuthenticateVideo?isrc=%s' % video_id
response = self._download_json(
- json_url, video_id, 'Downloading video info', 'Unable to download info')
+ json_url, video_id, 'Downloading video info',
+ 'Unable to download info', fatal=False) or {}
video_info = response.get('video') or {}
video_info = response.get('video') or {}
- video_versions = video_info.get('videoVersions')
artist = None
featured_artist = None
uploader = None
view_count = None
artist = None
featured_artist = None
uploader = None
view_count = None
- timestamp = None
formats = []
if not video_info:
formats = []
if not video_info:
- if response.get('statusCode') != 909:
+ if response
and response
.get('statusCode') != 909:
ytid = response.get('errorInfo', {}).get('ytid')
if ytid:
self.report_warning(
ytid = response.get('errorInfo', {}).get('ytid')
if ytid:
self.report_warning(