New upstream version 2018.09.10

[youtubedl] / youtube_dl / extractor / acast.py

diff --git a/youtube_dl/extractor/acast.py b/youtube_dl/extractor/acast.py
index 5871e72dca61cc64dd57833d891bd77e854e93df..6d846ea7a18829d9af03278b5da3996782bb26ab 100644 (file)
--- a/youtube_dl/extractor/acast.py
+++ b/youtube_dl/extractor/acast.py
@@ -7,7 +7,9 @@ import functools
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (

+    float_or_none,

     int_or_none,
     int_or_none,

+    try_get,

     unified_timestamp,
     OnDemandPagedList,
 )
     unified_timestamp,
     OnDemandPagedList,
 )


@@ -24,40 +26,58 @@ class ACastIE(InfoExtractor):
             'id': '57de3baa-4bb0-487e-9418-2692c1277a34',
             'ext': 'mp3',
             'title': '"Where Are You?": Taipei 101, Taiwan',
             'id': '57de3baa-4bb0-487e-9418-2692c1277a34',
             'ext': 'mp3',
             'title': '"Where Are You?": Taipei 101, Taiwan',

+            'description': 'md5:a0b4ef3634e63866b542e5b1199a1a0e',

             'timestamp': 1196172000,
             'upload_date': '20071127',
             'timestamp': 1196172000,
             'upload_date': '20071127',

-            'description': 'md5:a0b4ef3634e63866b542e5b1199a1a0e',

             'duration': 211,
             'duration': 211,

+            'creator': 'Concierge',
+            'series': 'Condé Nast Traveler Podcast',
+            'episode': '"Where Are You?": Taipei 101, Taiwan',

         }
     }, {
         # test with multiple blings
         'url': 'https://www.acast.com/sparpodcast/2.raggarmordet-rosterurdetforflutna',
         }
     }, {
         # test with multiple blings
         'url': 'https://www.acast.com/sparpodcast/2.raggarmordet-rosterurdetforflutna',

-        'md5': 'e87d5b8516cd04c0d81b6ee1caca28d0',
+        'md5': 'a02393c74f3bdb1801c3ec2695577ce0',

         'info_dict': {
             'id': '2a92b283-1a75-4ad8-8396-499c641de0d9',
             'ext': 'mp3',
             'title': '2. Raggarmordet - Röster ur det förflutna',
         'info_dict': {
             'id': '2a92b283-1a75-4ad8-8396-499c641de0d9',
             'ext': 'mp3',
             'title': '2. Raggarmordet - Röster ur det förflutna',

+            'description': 'md5:4f81f6d8cf2e12ee21a321d8bca32db4',

             'timestamp': 1477346700,
             'upload_date': '20161024',
             'timestamp': 1477346700,
             'upload_date': '20161024',

-            'description': 'md5:4f81f6d8cf2e12ee21a321d8bca32db4',
-            'duration': 2766,
+            'duration': 2766.602563,
+            'creator': 'Anton Berg & Martin Johnson',
+            'series': 'Spår',
+            'episode': '2. Raggarmordet - Röster ur det förflutna',

         }
     }]
 
     def _real_extract(self, url):
         channel, display_id = re.match(self._VALID_URL, url).groups()
         }
     }]
 
     def _real_extract(self, url):
         channel, display_id = re.match(self._VALID_URL, url).groups()

+        s = self._download_json(
+            'https://play-api.acast.com/stitch/%s/%s' % (channel, display_id),
+            display_id)['result']
+        media_url = s['url']

         cast_data = self._download_json(
         cast_data = self._download_json(

-            'https://play-api.acast.com/splash/%s/%s' % (channel, display_id), display_id)
-        e = cast_data['result']['episode']
+            'https://play-api.acast.com/splash/%s/%s' % (channel, display_id),
+            display_id)['result']
+        e = cast_data['episode']
+        title = e['name']

         return {
             'id': compat_str(e['id']),
             'display_id': display_id,
         return {
             'id': compat_str(e['id']),
             'display_id': display_id,

-            'url': e['mediaUrl'],
-            'title': e['name'],
-            'description': e.get('description'),
+            'url': media_url,
+            'title': title,
+            'description': e.get('description') or e.get('summary'),

             'thumbnail': e.get('image'),
             'timestamp': unified_timestamp(e.get('publishingDate')),
             'thumbnail': e.get('image'),
             'timestamp': unified_timestamp(e.get('publishingDate')),

-            'duration': int_or_none(e.get('duration')),
+            'duration': float_or_none(s.get('duration') or e.get('duration')),
+            'filesize': int_or_none(e.get('contentLength')),
+            'creator': try_get(cast_data, lambda x: x['show']['author'], compat_str),
+            'series': try_get(cast_data, lambda x: x['show']['name'], compat_str),
+            'season_number': int_or_none(e.get('seasonNumber')),
+            'episode': title,
+            'episode_number': int_or_none(e.get('episodeNumber')),

         }
 
 
         }