diff options
| author | Remita Amine <remitamine@gmail.com> | 2017-04-17 08:48:24 +0100 |
|---|---|---|
| committer | Remita Amine <remitamine@gmail.com> | 2017-04-17 08:48:24 +0100 |
| commit | bf1b87cd919f07b7fef204838be73981e122ee11 (patch) | |
| tree | 844e61c80618c59867163f99ac7037af18bafb87 | |
| parent | 1c35b3da44a087890b7144e5e626a573f2a80bf7 (diff) | |
| download | youtube-dl-bf1b87cd919f07b7fef204838be73981e122ee11.tar.xz | |
[common] Relax JWPlayer regex and remove duplicate urls(#12768)
| -rw-r--r-- | youtube_dl/extractor/common.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index dcc9d628a..12e010a0d 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -2182,7 +2182,7 @@ class InfoExtractor(object): def _find_jwplayer_data(self, webpage, video_id=None, transform_source=js_to_json): mobj = re.search( - r'jwplayer\((?P<quote>[\'"])[^\'" ]+(?P=quote)\)\.setup\s*\((?P<options>[^)]+)\)', + r'(?s)jwplayer\((?P<quote>[\'"])[^\'" ]+(?P=quote)\).*?\.setup\s*\((?P<options>[^)]+)\)', webpage) if mobj: try: @@ -2258,11 +2258,17 @@ 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): + urls = [] formats = [] for source in jwplayer_sources_data: - source_url = self._proto_relative_url(source['file']) + source_url = self._proto_relative_url(source.get('file')) + if not source_url: + continue if base_url: source_url = compat_urlparse.urljoin(base_url, source_url) + if source_url in urls: + continue + urls.append(source_url) source_type = source.get('type') or '' ext = mimetype2ext(source_type) or determine_ext(source_url) if source_type == 'hls' or ext == 'm3u8': |