better coding conventions
This commit is contained in:
parent
3491b08454
commit
fa9edae4ff
@ -31,7 +31,7 @@ class ContarBaseIE(InfoExtractor):
|
|||||||
self._API_BASE + path, video_id, headers=headers, note=note)
|
self._API_BASE + path, video_id, headers=headers, note=note)
|
||||||
|
|
||||||
self._handle_errors(result)
|
self._handle_errors(result)
|
||||||
return result['data']
|
return result.get('data', [])
|
||||||
|
|
||||||
def _real_initialize(self):
|
def _real_initialize(self):
|
||||||
email, password = self._get_login_info()
|
email, password = self._get_login_info()
|
||||||
@ -45,12 +45,12 @@ class ContarBaseIE(InfoExtractor):
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
self._handle_errors(result)
|
self._handle_errors(result)
|
||||||
self._auth_token = result['token']
|
self._auth_token = result.get('token')
|
||||||
|
|
||||||
def _get_video_info(self, video, video_id, base={}):
|
def _get_video_info(self, video, video_id, base={}):
|
||||||
|
|
||||||
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.get('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'))
|
||||||
@ -81,9 +81,9 @@ class ContarBaseIE(InfoExtractor):
|
|||||||
return serie
|
return serie
|
||||||
|
|
||||||
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.get('seasons', []).get('data', []):
|
||||||
season_number = season.get('name')
|
season_number = season.get('name')
|
||||||
for episode in season['videos'].get('data', []):
|
for episode in season.get('videos',[]).get('data', []):
|
||||||
if episode.get('id') == video_id:
|
if episode.get('id') == video_id:
|
||||||
return season_number
|
return season_number
|
||||||
return None
|
return None
|
||||||
@ -205,9 +205,9 @@ class ContarSerieIE(ContarBaseIE):
|
|||||||
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.get('seasons', []).get('data', []):
|
||||||
base['season_number'] = season.get('name')
|
base['season_number'] = season.get('name')
|
||||||
for episode in season['videos'].get('data', []):
|
for episode in season.get('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)
|
||||||
|
|
||||||
@ -272,7 +272,7 @@ class ContarBrowseIE(ContarBaseIE):
|
|||||||
list = self._call_api('full/section/' + list_id, list_id, headers={'Referer': url})
|
list = self._call_api('full/section/' + list_id, list_id, headers={'Referer': url})
|
||||||
entries = []
|
entries = []
|
||||||
|
|
||||||
for video in list['videos'].get('data', []):
|
for video in list.get('videos', []).get('data', []):
|
||||||
if (video.get('type') == 'SERIE'):
|
if (video.get('type') == 'SERIE'):
|
||||||
url = 'www.cont.ar/serie/%s' % video.get('uuid')
|
url = 'www.cont.ar/serie/%s' % video.get('uuid')
|
||||||
entries.append(self.url_result(url, video_id=video.get('uuid'), video_title=video.get('name')))
|
entries.append(self.url_result(url, video_id=video.get('uuid'), video_title=video.get('name')))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user