Browse Source

[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
totalwebcasting
Yen Chi Hsuan 9 years ago
parent
commit
ab481b48e5
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      youtube_dl/extractor/funnyordie.py

+ 2
- 2
youtube_dl/extractor/funnyordie.py View File

@ -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 = []


Loading…
Cancel
Save