From 559925300959669a08456475650a42f395385372 Mon Sep 17 00:00:00 2001 From: gritstub Date: Thu, 27 Apr 2017 11:00:02 -0700 Subject: [vevo] Fix extraction (config.token.key) --- youtube_dl/extractor/vevo.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'youtube_dl/extractor/vevo.py') diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py index 9aa38bc5a..9434cd585 100644 --- a/youtube_dl/extractor/vevo.py +++ b/youtube_dl/extractor/vevo.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals import re +import json from .common import InfoExtractor from ..compat import ( @@ -154,8 +155,15 @@ class VevoIE(VevoBaseIE): } def _initialize_api(self, video_id): + post_data = json.dumps({ + 'client_id': 'SPupX1tvqFEopQ1YS6SS', + 'grant_type': 'urn:vevo:params:oauth:grant-type:anonymous', + }).encode('utf-8') + headers = { + 'Content-Type': 'application/json', + } req = sanitized_Request( - 'http://www.vevo.com/auth', data=b'') + 'https://accounts.vevo.com/token', post_data, headers) webpage = self._download_webpage( req, None, note='Retrieving oauth token', @@ -166,7 +174,7 @@ class VevoIE(VevoBaseIE): '%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'] + self._api_url_template = self.http_scheme() + '//apiv2.vevo.com/%s?token=' + auth_info['legacy_token'] def _call_api(self, path, *args, **kwargs): try: -- cgit v1.2.3 From b07ea5eaecd6e3ab3a31c996ec815682efaf8edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sun, 30 Apr 2017 17:58:22 +0700 Subject: [vevo] Modernize --- youtube_dl/extractor/vevo.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'youtube_dl/extractor/vevo.py') diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py index 9434cd585..890a149ea 100644 --- a/youtube_dl/extractor/vevo.py +++ b/youtube_dl/extractor/vevo.py @@ -12,7 +12,6 @@ from ..compat import ( from ..utils import ( ExtractorError, int_or_none, - sanitized_Request, parse_iso8601, ) @@ -155,19 +154,17 @@ class VevoIE(VevoBaseIE): } def _initialize_api(self, video_id): - post_data = json.dumps({ - 'client_id': 'SPupX1tvqFEopQ1YS6SS', - 'grant_type': 'urn:vevo:params:oauth:grant-type:anonymous', - }).encode('utf-8') - headers = { - 'Content-Type': 'application/json', - } - req = sanitized_Request( - 'https://accounts.vevo.com/token', post_data, headers) webpage = self._download_webpage( - req, None, + 'https://accounts.vevo.com/token', None, note='Retrieving oauth token', - errnote='Unable to retrieve oauth token') + errnote='Unable to retrieve oauth token', + data=json.dumps({ + 'client_id': 'SPupX1tvqFEopQ1YS6SS', + 'grant_type': 'urn:vevo:params:oauth:grant-type:anonymous', + }).encode('utf-8'), + headers={ + 'Content-Type': 'application/json', + }) if re.search(r'(?i)THIS PAGE IS CURRENTLY UNAVAILABLE IN YOUR REGION', webpage): self.raise_geo_restricted( -- cgit v1.2.3