Start preparing new release.

[youtubedl] / youtube_dl / extractor / drbonanza.py

diff --git a/youtube_dl/extractor/drbonanza.py b/youtube_dl/extractor/drbonanza.py
index 7626219baf33522958960bca0d8babe67b8a332e..79ec212c890471bd72a0e88eaf7bec0da70af124 100644 (file)
--- a/youtube_dl/extractor/drbonanza.py
+++ b/youtube_dl/extractor/drbonanza.py
@@ -15,17 +15,19 @@ class DRBonanzaIE(InfoExtractor):
 
     _TESTS = [{
         'url': 'http://www.dr.dk/bonanza/serie/portraetter/Talkshowet.htm?assetId=65517',
 
     _TESTS = [{
         'url': 'http://www.dr.dk/bonanza/serie/portraetter/Talkshowet.htm?assetId=65517',

-        'md5': 'fe330252ddea607635cf2eb2c99a0af3',

         'info_dict': {
             'id': '65517',
             'ext': 'mp4',
             'title': 'Talkshowet - Leonard Cohen',
             'description': 'md5:8f34194fb30cd8c8a30ad8b27b70c0ca',
         'info_dict': {
             'id': '65517',
             'ext': 'mp4',
             'title': 'Talkshowet - Leonard Cohen',
             'description': 'md5:8f34194fb30cd8c8a30ad8b27b70c0ca',

-            'thumbnail': 're:^https?://.*\.(?:gif|jpg)$',
+            'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',

             'timestamp': 1295537932,
             'upload_date': '20110120',
             'duration': 3664,
         },
             'timestamp': 1295537932,
             'upload_date': '20110120',
             'duration': 3664,
         },

+        'params': {
+            'skip_download': True,  # requires rtmp
+        },

     }, {
         'url': 'http://www.dr.dk/bonanza/radio/serie/sport/fodbold.htm?assetId=59410',
         'md5': '6dfe039417e76795fb783c52da3de11d',
     }, {
         'url': 'http://www.dr.dk/bonanza/radio/serie/sport/fodbold.htm?assetId=59410',
         'md5': '6dfe039417e76795fb783c52da3de11d',


@@ -34,7 +36,7 @@ class DRBonanzaIE(InfoExtractor):
             'ext': 'mp3',
             'title': 'EM fodbold 1992 Danmark - Tyskland finale Transmission',
             'description': 'md5:501e5a195749480552e214fbbed16c4e',
             'ext': 'mp3',
             'title': 'EM fodbold 1992 Danmark - Tyskland finale Transmission',
             'description': 'md5:501e5a195749480552e214fbbed16c4e',

-            'thumbnail': 're:^https?://.*\.(?:gif|jpg)$',
+            'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',

             'timestamp': 1223274900,
             'upload_date': '20081006',
             'duration': 7369,
             'timestamp': 1223274900,
             'upload_date': '20081006',
             'duration': 7369,


@@ -85,7 +87,7 @@ class DRBonanzaIE(InfoExtractor):
 
         formats = []
         for file in info['Files']:
 
         formats = []
         for file in info['Files']:

-            if info['Type'] == "Video":
+            if info['Type'] == 'Video':

                 if file['Type'] in video_types:
                     format = parse_filename_info(file['Location'])
                     format.update({
                 if file['Type'] in video_types:
                     format = parse_filename_info(file['Location'])
                     format.update({


@@ -93,11 +95,16 @@ class DRBonanzaIE(InfoExtractor):
                         'format_id': file['Type'].replace('Video', ''),
                         'preference': preferencemap.get(file['Type'], -10),
                     })
                         'format_id': file['Type'].replace('Video', ''),
                         'preference': preferencemap.get(file['Type'], -10),
                     })

+                    if format['url'].startswith('rtmp'):
+                        rtmp_url = format['url']
+                        format['rtmp_live'] = True  # --resume does not work
+                        if '/bonanza/' in rtmp_url:
+                            format['play_path'] = rtmp_url.split('/bonanza/')[1]

                     formats.append(format)
                     formats.append(format)

-                elif file['Type'] == "Thumb":
+                elif file['Type'] == 'Thumb':

                     thumbnail = file['Location']
                     thumbnail = file['Location']

-            elif info['Type'] == "Audio":
-                if file['Type'] == "Audio":
+            elif info['Type'] == 'Audio':
+                if file['Type'] == 'Audio':

                     format = parse_filename_info(file['Location'])
                     format.update({
                         'url': file['Location'],
                     format = parse_filename_info(file['Location'])
                     format.update({
                         'url': file['Location'],


@@ -105,15 +112,12 @@ class DRBonanzaIE(InfoExtractor):
                         'vcodec': 'none',
                     })
                     formats.append(format)
                         'vcodec': 'none',
                     })
                     formats.append(format)

-                elif file['Type'] == "Thumb":
+                elif file['Type'] == 'Thumb':

                     thumbnail = file['Location']
 
         description = '%s\n%s\n%s\n' % (
             info['Description'], info['Actors'], info['Colophon'])
 
                     thumbnail = file['Location']
 
         description = '%s\n%s\n%s\n' % (
             info['Description'], info['Actors'], info['Colophon'])
 

-        for f in formats:
-            f['url'] = f['url'].replace('rtmp://vod-bonanza.gss.dr.dk/bonanza/', 'http://vodfiles.dr.dk/')
-            f['url'] = f['url'].replace('mp4:bonanza', 'bonanza')

         self._sort_formats(formats)
 
         display_id = re.sub(r'[^\w\d-]', '', re.sub(r' ', '-', title.lower())) + '-' + asset_id
         self._sort_formats(formats)
 
         display_id = re.sub(r'[^\w\d-]', '', re.sub(r' ', '-', title.lower())) + '-' + asset_id