Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[extractor/common] Pass arguments to _parse_jwplayer_formats and PEP8

pull/12387/head
Sergey M․ 2017-03-05 23:28:32 +07:00
parent 0236cd0dfd
commit 1a2192cb90
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/extractor/common.py
View File

@ -2198,7 +2198,9 @@ class InfoExtractor(object):
this_video_id = video_id or video_data['mediaid'] this_video_id = video_id or video_data['mediaid']
formats = self._parse_jwplayer_formats(video_data['sources'], this_video_id) formats = self._parse_jwplayer_formats(
video_data['sources'], video_id=this_video_id, m3u8_id=m3u8_id,
mpd_id=mpd_id, rtmp_params=rtmp_params, base_url=base_url)
self._sort_formats(formats) self._sort_formats(formats)
subtitles = {} subtitles = {}
@ -2232,7 +2234,7 @@ class InfoExtractor(object):
def _parse_jwplayer_formats(self, jwplayer_sources_data, video_id=None, def _parse_jwplayer_formats(self, jwplayer_sources_data, video_id=None,
m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None): m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
formats = [] formats = []
for source in jwplayer_sources_data : for source in jwplayer_sources_data:
source_url = self._proto_relative_url(source['file']) source_url = self._proto_relative_url(source['file'])
if base_url: if base_url:
source_url = compat_urlparse.urljoin(base_url, source_url) source_url = compat_urlparse.urljoin(base_url, source_url)
@ -2285,7 +2287,6 @@ class InfoExtractor(object):
formats.append(a_format) formats.append(a_format)
return formats return formats
def _live_title(self, name): def _live_title(self, name):
""" Generate the title for a live video """ """ Generate the title for a live video """
now = datetime.datetime.now() now = datetime.datetime.now()