projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Pass arguments to _parse_jwplayer_formats and PEP8
[youtube-dl]
/
youtube_dl
/
extractor
/
common.py
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 2887db0c31276ed8ac03c36ab7d8eece226d1132..78dc5be24834ec036a8782ff2715027b349de542 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-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)
subtitles = {}
self._sort_formats(formats)
subtitles = {}
@@
-2232,7
+2234,7
@@
class InfoExtractor(object):
def _parse_jwplayer_formats(self, jwplayer_sources_data, video_id=None,
m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
formats = []
def _parse_jwplayer_formats(self, jwplayer_sources_data, video_id=None,
m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
formats = []
- for source in jwplayer_sources_data
:
+ for source in jwplayer_sources_data:
source_url = self._proto_relative_url(source['file'])
if base_url:
source_url = compat_urlparse.urljoin(base_url, source_url)
source_url = self._proto_relative_url(source['file'])
if base_url:
source_url = compat_urlparse.urljoin(base_url, source_url)
@@
-2285,7
+2287,6
@@
class InfoExtractor(object):
formats.append(a_format)
return formats
formats.append(a_format)
return formats
-
def _live_title(self, name):
""" Generate the title for a live video """
now = datetime.datetime.now()
def _live_title(self, name):
""" Generate the title for a live video """
now = datetime.datetime.now()