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

moved list-function into seperate class

Browse Source
This commit is contained in:
AndroKev 2018-03-20 20:36:17 +01:00
parent 826b775919
commit 47dc6df583
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
youtube_dl/extractor/tvnow.py
View File

@ -26,24 +26,6 @@ class TVNowBaseIE(InfoExtractor):
'https://api.tvnow.de/v3/' + path, 'https://api.tvnow.de/v3/' + path,
video_id, query=query) video_id, query=query)
def _extend_query(self, show, season, video=None):
fields = []
fields.extend(show)
fields.extend('formatTabs.%s' % field for field in season)
if video:
fields.extend(
'formatTabs.formatTabPages.container.movies.%s' % field
for field in video)
return fields
def _tvnow_list_info(self, list_id, show_id, fields):
return self._call_api(
'formats/seo', list_id, query={
'fields': ','.join(fields),
'name': show_id + '.php'
})
def _extract_video(self, info, display_id): def _extract_video(self, info, display_id):
video_id = compat_str(info['id']) video_id = compat_str(info['id'])
title = info['title'] title = info['title']
@ -151,7 +133,27 @@ class TVNowIE(TVNowBaseIE):
return self._extract_video(info, display_id) return self._extract_video(info, display_id)
class TVNowListIE(TVNowBaseIE): class TVNowListBaseIE(TVNowBaseIE):
def _extend_query(self, show, season, video=None):
fields = []
fields.extend(show)
fields.extend('formatTabs.%s' % field for field in season)
if video:
fields.extend(
'formatTabs.formatTabPages.container.movies.%s' % field
for field in video)
return fields
def _tvnow_list_info(self, list_id, show_id, fields):
return self._call_api(
'formats/seo', list_id, query={
'fields': ','.join(fields),
'name': show_id + '.php'
})
class TVNowListIE(TVNowListBaseIE):
_VALID_URL = r'(?P<base_url>https?://(?:www\.)?tvnow\.(?:de|at|ch)/(?:rtl(?:2|plus)?|nitro|superrtl|ntv|vox)/(?P<show_id>[^/]+)/)list/(?P<id>[^?/#&]+)$' _VALID_URL = r'(?P<base_url>https?://(?:www\.)?tvnow\.(?:de|at|ch)/(?:rtl(?:2|plus)?|nitro|superrtl|ntv|vox)/(?P<show_id>[^/]+)/)list/(?P<id>[^?/#&]+)$'
_SHOW_FIELDS = ('title', ) _SHOW_FIELDS = ('title', )
@ -192,7 +194,7 @@ class TVNowListIE(TVNowBaseIE):
entries, compat_str(season.get('id') or season_id), title) entries, compat_str(season.get('id') or season_id), title)
class TVNowListChannelIE(TVNowBaseIE): class TVNowListChannelIE(TVNowListBaseIE):
_VALID_URL = r'(?P<base_url>https?://(?:www\.)?tvnow\.(?:de|at|ch)/(?:rtl(?:2|plus)?|nitro|superrtl|ntv|vox)/(?P<show_id>[^/]+)$)' _VALID_URL = r'(?P<base_url>https?://(?:www\.)?tvnow\.(?:de|at|ch)/(?:rtl(?:2|plus)?|nitro|superrtl|ntv|vox)/(?P<show_id>[^/]+)$)'
_SHOW_FIELDS = ('id', 'title', ) _SHOW_FIELDS = ('id', 'title', )