From: remitamine Date: Sat, 5 Sep 2015 20:03:13 +0000 (+0100) Subject: [nowness] more api abstraction X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=673bf566fc1aa1351a40c7378893aff6cb0fc91b;p=youtube-dl [nowness] more api abstraction --- diff --git a/youtube_dl/extractor/nowness.py b/youtube_dl/extractor/nowness.py index a8ee4fe68..3371145c1 100644 --- a/youtube_dl/extractor/nowness.py +++ b/youtube_dl/extractor/nowness.py @@ -30,11 +30,11 @@ class NownessBaseIE(InfoExtractor): elif source == 'cinematique': return self.url_result('http://cinematique.com/embed/%s' % video_id, 'Cinematique') - def api_request(self, url, request_url): + def api_request(self, url, request_path): display_id = self._match_id(url) lang = 'zh-cn' if 'cn.nowness.com' in url else 'en-us' - request = compat_urllib_request.Request(request_url % display_id, headers={ + request = compat_urllib_request.Request('http://api.nowness.com/api/' + request_path % display_id, headers={ 'X-Nowness-Language': lang, }) json_data = self._download_json(request, display_id) @@ -72,7 +72,7 @@ class NownessIE(NownessBaseIE): ] def _real_extract(self, url): - display_id, post = self.api_request(url, 'http://api.nowness.com/api/post/getBySlug/%s') + display_id, post = self.api_request(url, 'post/getBySlug/%s') return self.extract_url_result(post) @@ -89,7 +89,7 @@ class NownessPlaylistIE(NownessBaseIE): } def _real_extract(self, url): - playlist_id, playlist = self.api_request(url, 'http://api.nowness.com/api/post?PlaylistId=%s') + playlist_id, playlist = self.api_request(url, 'post?PlaylistId=%s') entries = [self.extract_url_result(item) for item in playlist['items']] return self.playlist_result(entries, playlist_id) @@ -107,7 +107,7 @@ class NownessSerieIE(NownessBaseIE): } def _real_extract(self, url): - display_id, serie = self.api_request(url, 'http://api.nowness.com/api/series/getBySlug/%s') + display_id, serie = self.api_request(url, 'series/getBySlug/%s') serie_id = str(serie['id']) entries = [self.extract_url_result(post) for post in serie['posts']] return self.playlist_result(entries, serie_id)