R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup code, flake8 passed

Browse Source
This commit is contained in:
Pablo Castorino 2019-01-31 19:33:36 -03:00
parent 13d441b1b1
commit 18b5708685
1 changed files with 57 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/contar.py
View File

@ -5,10 +5,10 @@ from .common import InfoExtractor
from ..utils import ( from ..utils import (
int_or_none, int_or_none,
urlencode_postdata, urlencode_postdata,
compat_str,
ExtractorError, ExtractorError,
) )
class ContarBaseIE(InfoExtractor): class ContarBaseIE(InfoExtractor):
_NETRC_MACHINE = 'contar' _NETRC_MACHINE = 'contar'
@ -47,14 +47,12 @@ class ContarBaseIE(InfoExtractor):
self._auth_token = result['token'] self._auth_token = result['token']
def _get_video_info(self, video, video_id, base={}): def _get_video_info(self, video, video_id, base={}):
#print(json.dumps(video, indent=4, sort_keys=True))
#print "id = %s S%sE%s" % (video.get('id'), season.get('name') , video.get('episode'))
formats = self._get_formats(video.get('streams', []), video.get('id')) formats = self._get_formats(video.get('streams', []), video.get('id'))
subtitles = self._get_subtitles(video['subtitles'].get('data', []), video.get('id')) subtitles = self._get_subtitles(video['subtitles'].get('data', []), video.get('id'))
serie_info = base.get('serie_info') or self._get_serie_info(video.get('serie')) serie_info = base.get('serie_info') or self._get_serie_info(video.get('serie'))
season_number = base.get('season_number') or self._get_season_number(serie_info, video.get('id')); season_number = base.get('season_number') or self._get_season_number(serie_info, video.get('id'))
episode_number = video.get('episode') episode_number = video.get('episode')
info = { info = {
@ -83,7 +81,6 @@ class ContarBaseIE(InfoExtractor):
def _get_season_number(self, serie_info, video_id): def _get_season_number(self, serie_info, video_id):
for season in serie_info['seasons'].get('data', []): for season in serie_info['seasons'].get('data', []):
#print(json.dumps(season, indent=4, sort_keys=True))
season_number = season.get('name') season_number = season.get('name')
for episode in season['videos'].get('data', []): for episode in season['videos'].get('data', []):
if episode.get('id') == video_id: if episode.get('id') == video_id:
@ -147,7 +144,7 @@ class ContarIE(ContarBaseIE):
video_id = self._match_id(url) video_id = self._match_id(url)
video = self._call_api('videos/' + video_id, video_id, headers={'Referer': url}) video = self._call_api('videos/' + video_id, video_id, headers={'Referer': url})
info = self._get_video_info(video, video_id); info = self._get_video_info(video, video_id)
return info return info
@ -212,17 +209,15 @@ class ContarSerieIE(ContarBaseIE):
serie_info = self._get_serie_info(serie_id, headers={'Referer': url}) serie_info = self._get_serie_info(serie_id, headers={'Referer': url})
seasons = []
entries = [] entries = []
base = {} base = {}
base['serie_info'] = serie_info base['serie_info'] = serie_info
for season in serie_info['seasons'].get('data', []): for season in serie_info['seasons'].get('data', []):
#print(json.dumps(season, indent=4, sort_keys=True))
base['season_number'] = season.get('name') base['season_number'] = season.get('name')
for episode in season['videos'].get('data', []): for episode in season['videos'].get('data', []):
info = self._get_video_info(episode, serie_id, base); info = self._get_video_info(episode, serie_id, base)
entries.append(info) entries.append(info)
return self.playlist_result( return self.playlist_result(
@ -267,6 +262,7 @@ class ContarChannelIE(ContarBaseIE):
return self.playlist_result( return self.playlist_result(
entries, list_id, channel_info.get('name'), channel_info.get('description')) entries, list_id, channel_info.get('name'), channel_info.get('description'))
class ContarBrowseIE(ContarBaseIE): class ContarBrowseIE(ContarBaseIE):
_UUID_RE = r'[\d]{1,}' _UUID_RE = r'[\d]{1,}'
@ -303,4 +299,3 @@ class ContarBrowseIE(ContarBaseIE):
return self.playlist_result( return self.playlist_result(
entries, list_id, entries, list_id,
list.get('title')) list.get('title'))