Fix tunein

youtube_dlc/extractor/extractors.py

@@ -1190,7 +1190,6 @@
 from .tubitv import TubiTvIE
 from .tumblr import TumblrIE
 from .tunein import (
-    TuneInClipIE,
     TuneInStationIE,
     TuneInProgramIE,
     TuneInTopicIE,

youtube_dlc/extractor/generic.py

@@ -1023,8 +1023,8 @@ class GenericIE(InfoExtractor):
             'info_dict': {
                 'id': '204146',
                 'ext': 'mp3',
-                'title': 'CNRV',
-                'location': 'Paris, France',
+                'title': 're:CNRV',
+                'description': 'md5:298ece12650f386bebdf3c3499a4f846',
                 'is_live': True,
             },
             'params': {

youtube_dlc/extractor/tunein.py

@@ -4,12 +4,18 @@
 import re
 
 from .common import InfoExtractor
-from ..utils import ExtractorError
-from ..compat import compat_urlparse
+from ..compat import compat_str
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    try_get,
+    unified_timestamp,
+)
 
 
 class TuneInBaseIE(InfoExtractor):
-    _API_BASE_URL = 'http://tunein.com/tuner/tune/'
+    _METADATA_API_BASE_URL = 'https://api.tunein.com/profiles/%s%s/contents?partnerId=RadioTime&version=3.1002'
+    _STREAM_API_BASE_URL = 'https://opml.radiotime.com/Tune.ashx?id=%s%s&render=json&formats=mp3,aac,ogg,flash,html,hls'
 
     @staticmethod
     def _extract_urls(webpage):
@@ -20,88 +26,78 @@ def _extract_urls(webpage):
     def _real_extract(self, url):
         content_id = self._match_id(url)
 
-        content_info = self._download_json(
-            self._API_BASE_URL + self._API_URL_QUERY % content_id,
+        metadata = self._download_json(
+            self._METADATA_API_BASE_URL % (self._CONTENT_TYPE, content_id),
             content_id, note='Downloading JSON metadata')
 
-        title = content_info['Title']
-        thumbnail = content_info.get('Logo')
-        location = content_info.get('Location')
-        streams_url = content_info.get('StreamUrl')
-        if not streams_url:
-            raise ExtractorError('No downloadable streams found', expected=True)
-        if not streams_url.startswith('http://'):
-            streams_url = compat_urlparse.urljoin(url, streams_url)
+        station_info = metadata['Items'][0]['Children'][0]
+        title = compat_str(station_info['Title'])
 
-        streams = self._download_json(
-            streams_url, content_id, note='Downloading stream data',
-            transform_source=lambda s: re.sub(r'^\s*\((.*)\);\s*$', r'\1', s))['Streams']
+        play_info = try_get(station_info, lambda x: x['Actions']['Play']) or {}
+        stream_url = play_info.get('PlayUrl')
 
-        is_live = None
         formats = []
-        for stream in streams:
-            if stream.get('Type') == 'Live':
-                is_live = True
-            reliability = stream.get('Reliability')
-            format_note = (
-                'Reliability: %d%%' % reliability
-                if reliability is not None else None)
-            formats.append({
-                'preference': (
-                    0 if reliability is None or reliability > 90
-                    else 1),
-                'abr': stream.get('Bandwidth'),
-                'ext': stream.get('MediaType').lower(),
-                'acodec': stream.get('MediaType'),
-                'vcodec': 'none',
-                'url': stream.get('Url'),
-                'source_preference': reliability,
-                'format_note': format_note,
-            })
-        self._sort_formats(formats)
-
-        return {
+        if not stream_url:
+            streams = self._download_json(
+                self._STREAM_API_BASE_URL % (self._CONTENT_TYPE, content_id),
+                content_id, note='Downloading stream data')['body']
+
+            streams = list(
+                filter(lambda s: s.get('media_type') != 'html', streams))
+            if not streams:
+                raise ExtractorError(
+                    'No downloadable streams found', expected=True)
+
+            for stream in streams:
+                media_type = try_get(stream, lambda x: x['media_type'], compat_str)
+                reliability = int_or_none(stream.get('reliability'))
+                format_note = (
+                    'Reliability: %d%%' % reliability
+                    if reliability is not None else None)
+                formats.append({
+                    'abr': int_or_none(stream.get('bitrate')),
+                    'ext': media_type.lower() if media_type else None,
+                    'acodec': media_type,
+                    'vcodec': 'none',
+                    'url': stream.get('url'),
+                    'source_preference': reliability,
+                    'format_note': format_note,
+                })
+
+            self._sort_formats(formats)
+
+        s = station_info
+        is_live = play_info.get('IsLive') is True
+        res = {
             'id': content_id,
             'title': self._live_title(title) if is_live else title,
-            'formats': formats,
-            'thumbnail': thumbnail,
-            'location': location,
+            'description': s.get('Description') or s.get('Subtitle'),
+            'thumbnail': s.get('Image'),
             'is_live': is_live,
+            'duration': int_or_none(play_info.get('Duration')),
+            'timestamp': unified_timestamp(play_info.get('PublishTime'))
         }
 
+        if stream_url:
+            res['url'] = stream_url
+        else:
+            res['formats'] = formats
 
-class TuneInClipIE(TuneInBaseIE):
-    IE_NAME = 'tunein:clip'
-    _VALID_URL = r'https?://(?:www\.)?tunein\.com/station/.*?audioClipId\=(?P<id>\d+)'
-    _API_URL_QUERY = '?tuneType=AudioClip&audioclipId=%s'
-
-    _TESTS = [{
-        'url': 'http://tunein.com/station/?stationId=246119&audioClipId=816',
-        'md5': '99f00d772db70efc804385c6b47f4e77',
-        'info_dict': {
-            'id': '816',
-            'title': '32m',
-            'ext': 'mp3',
-        },
-    }]
+        return res
 
 
 class TuneInStationIE(TuneInBaseIE):
     IE_NAME = 'tunein:station'
-    _VALID_URL = r'https?://(?:www\.)?tunein\.com/(?:radio/.*?-s|station/.*?StationId=|embed/player/s)(?P<id>\d+)'
-    _API_URL_QUERY = '?tuneType=Station&stationId=%s'
-
-    @classmethod
-    def suitable(cls, url):
-        return False if TuneInClipIE.suitable(url) else super(TuneInStationIE, cls).suitable(url)
+    _VALID_URL = r'https?://(?:www\.)?tunein\.com(:443)?/(?:radio/.*?-s|station/.*?StationId=|embed/player/s)(?P<id>\d+)'
+    _CONTENT_TYPE = 's'  # station
 
     _TESTS = [{
         'url': 'http://tunein.com/radio/Jazz24-885-s34682/',
         'info_dict': {
             'id': '34682',
-            'title': 'Jazz 24 on 88.5 Jazz24 - KPLU-HD2',
-            'ext': 'mp3',
-            'location': 'Tacoma, WA',
+            'title': 're:Jazz24',
+            'description': 'md5:c94dad268809130da5c91b0760f366a1',
+            'ext': 'mp3'
         },
         'params': {
             'skip_download': True,  # live stream
@@ -114,42 +110,84 @@ def suitable(cls, url):
 
 class TuneInProgramIE(TuneInBaseIE):
     IE_NAME = 'tunein:program'
-    _VALID_URL = r'https?://(?:www\.)?tunein\.com/(?:radio/.*?-p|program/.*?ProgramId=|embed/player/p)(?P<id>\d+)'
-    _API_URL_QUERY = '?tuneType=Program&programId=%s'
+    _VALID_URL = r'https?://(?:www\.)?tunein\.com(:443)?/(?:(?:radio|podcasts)/.*?-p|program/.*?ProgramId=|embed/player/p)(?P<id>\d+)'
+    _CONTENT_TYPE = 'p'  # program
 
     _TESTS = [{
-        'url': 'http://tunein.com/radio/Jazz-24-p2506/',
+        'url': 'https://tunein.com/podcasts/Business--Economics-Podcasts/Planet-Money-p164680/',
         'info_dict': {
-            'id': '2506',
-            'title': 'Jazz 24 on 91.3 WUKY-HD3',
-            'ext': 'mp3',
-            'location': 'Lexington, KY',
-        },
-        'params': {
-            'skip_download': True,  # live stream
+            'id': '164680'
         },
+        'playlist_mincount': 190
+    }, {
+        'url': 'https://tunein.com/radio/Planet-Money-p164680/',
+        'only_matching': True,
     }, {
         'url': 'http://tunein.com/embed/player/p191660/',
         'only_matching': True,
     }]
 
+    @classmethod
+    def suitable(cls, url):
+        return False if TuneInTopicIE.suitable(url) else super(TuneInProgramIE, cls).suitable(url)
+
+    def _process_page(self, page):
+        if not page.get('Items'):
+            raise ExtractorError(
+                'No downloadable episodes found', expected=True)
+
+        for item in page.get('Items'):
+            video_id = compat_str(item['GuideId'][1:])
+            url = 'http://tunein.com/topic/?TopicId=%s' % video_id
+            title = item.get('Title')
+            yield self.url_result(url, TuneInTopicIE.ie_key(), video_id, title)
+
+    def _entries(self, program_id):
+        offset = 0
+        limit = 100
+        has_more = True
+        while has_more:
+            page = self._download_json(
+                self._METADATA_API_BASE_URL % (self._CONTENT_TYPE, program_id),
+                program_id,
+                note='Downloading program data from offset %s' % offset,
+                query={'filter': 't:free', 'offset': offset, 'limit': limit})
+
+            for entry in self._process_page(page):
+                yield entry
+
+            has_more = try_get(
+                page,
+                lambda p: p['Paging']['Next'], compat_str) is not None
+
+            if has_more:
+                offset += page['Paging']['ItemCount']
+
+    def _real_extract(self, url):
+        program_id = self._match_id(url)
+        return self.playlist_result(self._entries(program_id), program_id)
+
 
 class TuneInTopicIE(TuneInBaseIE):
     IE_NAME = 'tunein:topic'
-    _VALID_URL = r'https?://(?:www\.)?tunein\.com/(?:topic/.*?TopicId=|embed/player/t)(?P<id>\d+)'
-    _API_URL_QUERY = '?tuneType=Topic&topicId=%s'
+    _VALID_URL = r'https?://(?:www\.)?tunein\.com(:443)?/(?:(?:topic|podcasts)/.*?(?:T|t)opicId=|embed/player/t)(?P<id>\d+)'
+    _CONTENT_TYPE = 't'  # topic
 
     _TESTS = [{
-        'url': 'http://tunein.com/topic/?TopicId=101830576',
-        'md5': 'c31a39e6f988d188252eae7af0ef09c9',
+        'url': 'https://tunein.com/podcasts/Business--Economics-Podcasts/Planet-Money-p164680/?topicId=129983955',
         'info_dict': {
-            'id': '101830576',
-            'title': 'Votez pour moi du 29 octobre 2015 (29/10/15)',
+            'id': '129983955',
+            'title': '#901: Bad Cops Are Expensive',
             'ext': 'mp3',
-            'location': 'Belgium',
+            'description': 'md5:0e702acc52914c55219b1b06a6026a87',
+            'upload_date': '20190322',
+            'timestamp': 1553292060,
         },
     }, {
-        'url': 'http://tunein.com/embed/player/t101830576/',
+        'url': 'http://tunein.com/topic/?TopicId=129983955',
+        'only_matching': True,
+    }, {
+        'url': 'http://tunein.com/embed/player/t129983955/',
         'only_matching': True,
     }]
 
@@ -164,9 +202,9 @@ class TuneInShortenerIE(InfoExtractor):
         'url': 'http://tun.in/ser7s',
         'info_dict': {
             'id': '34682',
-            'title': 'Jazz 24 on 88.5 Jazz24 - KPLU-HD2',
-            'ext': 'mp3',
-            'location': 'Tacoma, WA',
+            'title': 're:Jazz24',
+            'description': 'md5:c94dad268809130da5c91b0760f366a1',
+            'ext': 'mp3'
         },
         'params': {
             'skip_download': True,  # live stream