Merge tag 'upstream/2016.06.25'

[youtubedl] / youtube_dl / extractor / funnyordie.py

diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py
index dd87257c465983dcda30a6faf5dbd7bc0950560c..8c5ffc9e84cec305e9fc813a6366b360b7e36230 100644 (file)
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -45,15 +45,22 @@ class FunnyOrDieIE(InfoExtractor):
 
         links.sort(key=lambda link: 1 if link[1] == 'mp4' else 0)
 
 
         links.sort(key=lambda link: 1 if link[1] == 'mp4' else 0)
 

-        bitrates = self._html_search_regex(r'<source src="[^"]+/v,((?:\d+,)+)\.mp4\.csmil', webpage, 'video bitrates')
-        bitrates = [int(b) for b in bitrates.rstrip(',').split(',')]
-        bitrates.sort()
+        m3u8_url = self._search_regex(
+            r'<source[^>]+src=(["\'])(?P<url>.+?/master\.m3u8[^"\']*)\1',
+            webpage, 'm3u8 url', group='url')

 
         formats = []
 
         formats = []

+
+        formats.extend(self._extract_m3u8_formats(
+            m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
+
+        bitrates = [int(bitrate) for bitrate in re.findall(r'[,/]v(\d+)[,/]', m3u8_url)]
+        bitrates.sort()
+

         for bitrate in bitrates:
             for link in links:
                 formats.append({
         for bitrate in bitrates:
             for link in links:
                 formats.append({

-                    'url': '%s%d.%s' % (link[0], bitrate, link[1]),
+                    'url': self._proto_relative_url('%s%d.%s' % (link[0], bitrate, link[1])),

                     'format_id': '%s-%d' % (link[1], bitrate),
                     'vbr': bitrate,
                 })
                     'format_id': '%s-%d' % (link[1], bitrate),
                     'vbr': bitrate,
                 })