diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-04-09 20:12:11 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-04-09 20:17:35 +0800 |
| commit | ab481b48e536dd2e03d6022abb7f4d1593294721 (patch) | |
| tree | b57acf8ab883ec19e538fbef129f6d16b0113ff2 | |
| parent | 92c7f3157aad87096aa1fdd1a4daed3bdf262178 (diff) | |
| download | youtube-dl-ab481b48e536dd2e03d6022abb7f4d1593294721.zip youtube-dl-ab481b48e536dd2e03d6022abb7f4d1593294721.tar.gz youtube-dl-ab481b48e536dd2e03d6022abb7f4d1593294721.tar.bz2 | |
[funnyordie] Relax M3U8 URL matching
Also, m3u8_url extraction should be fatal as all formats depends
directly or indirectly on it.
This change fixes test_Generic_26 and TestFunnyOrDieSubtitles
| -rw-r--r-- | youtube_dl/extractor/funnyordie.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index 4c4a87e..8c5ffc9 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -46,8 +46,8 @@ class FunnyOrDieIE(InfoExtractor): links.sort(key=lambda link: 1 if link[1] == 'mp4' else 0) m3u8_url = self._search_regex( - r'<source[^>]+src=(["\'])(?P<url>.+?/master\.m3u8)\1', - webpage, 'm3u8 url', default=None, group='url') + r'<source[^>]+src=(["\'])(?P<url>.+?/master\.m3u8[^"\']*)\1', + webpage, 'm3u8 url', group='url') formats = [] |