[orf:radio] Clean description and improve extraction

youtube_dl/extractor/orf.py

@@ -6,12 +6,14 @@ import re
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
+    clean_html,
     determine_ext,
     float_or_none,
     HEADRequest,
     int_or_none,
     orderedSet,
     remove_end,
+    str_or_none,
     strip_jsonp,
     unescapeHTML,
     unified_strdate,
@@ -162,30 +164,37 @@ class ORFRadioIE(InfoExtractor):
         show_id = mobj.group('show')
 
         data = self._download_json(
-            'http://audioapi.orf.at/%s/api/json/current/broadcast/%s/%s' % (station, show_id, show_date),
+            'http://audioapi.orf.at/%s/api/json/current/broadcast/%s/%s'
-            show_id
+            % (station, show_id, show_date), show_id)
-        )
 
-        def extract_entry_dict(info, title, subtitle):
+        entries = []
-            return {
+        for info in data['streams']:
-                'id': info['loopStreamId'].replace('.mp3', ''),
+            loop_stream_id = str_or_none(info.get('loopStreamId'))
-                'url': 'http://loopstream01.apa.at/?channel=%s&id=%s' % (station, info['loopStreamId']),
+            if not loop_stream_id:
+                continue
+            title = str_or_none(data.get('title'))
+            if not title:
+                continue
+            start = int_or_none(info.get('start'), scale=1000)
+            end = int_or_none(info.get('end'), scale=1000)
+            duration = end - start if end and start else None
+            entries.append({
+                'id': loop_stream_id.replace('.mp3', ''),
+                'url': 'http://loopstream01.apa.at/?channel=%s&id=%s' % (station, loop_stream_id),
                 'title': title,
-                'description': subtitle,
+                'description': clean_html(data.get('subtitle')),
-                'duration': (info['end'] - info['start']) / 1000,
+                'duration': duration,
-                'timestamp': info['start'] / 1000,
+                'timestamp': start,
                 'ext': 'mp3',
-                'series': data.get('programTitle')
+                'series': data.get('programTitle'),
-            }
+            })
-
-        entries = [extract_entry_dict(t, data['title'], data['subtitle']) for t in data['streams']]
 
         return {
             '_type': 'playlist',
             'id': show_id,
-            'title': data['title'],
+            'title': data.get('title'),
-            'description': data['subtitle'],
+            'description': clean_html(data.get('subtitle')),
-            'entries': entries
+            'entries': entries,
         }
 
 
@@ -206,7 +215,8 @@ class ORFFM4IE(ORFRadioIE):
             'timestamp': 1483819257,
             'upload_date': '20170107',
         },
-        'skip': 'Shows from ORF radios are only available for 7 days.'
+        'skip': 'Shows from ORF radios are only available for 7 days.',
+        'only_matching': True,
     }