[telebruxelles] extract all formats and add support for emission urls

youtube_dl/extractor/telebruxelles.py

@@ -7,33 +7,30 @@ from .common import InfoExtractor
 
 
 class TeleBruxellesIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:telebruxelles|bx1)\.be/(news|sport|dernier-jt)/?(?P<id>[^/#?]+)'
+    _VALID_URL = r'https?://(?:www\.)?(?:telebruxelles|bx1)\.be/(news|sport|dernier-jt|emission)/?(?P<id>[^/#?]+)'
     _TESTS = [{
-        'url': 'http://www.telebruxelles.be/news/auditions-devant-parlement-francken-galant-tres-attendus/',
+        'url': 'http://bx1.be/news/que-risque-lauteur-dune-fausse-alerte-a-la-bombe/',
-        'md5': '59439e568c9ee42fb77588b2096b214f',
+        'md5': 'a2a67a5b1c3e8c9d33109b902f474fd9',
         'info_dict': {
-            'id': '11942',
+            'id': '158856',
-            'display_id': 'auditions-devant-parlement-francken-galant-tres-attendus',
+            'display_id': 'que-risque-lauteur-dune-fausse-alerte-a-la-bombe',
-            'ext': 'flv',
+            'ext': 'mp4',
-            'title': 'Parlement : Francken et Galant répondent aux interpellations de l’opposition',
+            'title': 'Que risque l’auteur d’une fausse alerte à la bombe ?',
-            'description': 're:Les auditions des ministres se poursuivent*'
+            'description': 'md5:3cf8df235d44ebc5426373050840e466',
-        },
-        'params': {
-            'skip_download': 'requires rtmpdump'
         },
     }, {
-        'url': 'http://www.telebruxelles.be/sport/basket-brussels-bat-mons-80-74/',
+        'url': 'http://bx1.be/sport/futsal-schaerbeek-sincline-5-3-a-thulin/',
-        'md5': '181d3fbdcf20b909309e5aef5c6c6047',
+        'md5': 'dfe07ecc9c153ceba8582ac912687675',
         'info_dict': {
-            'id': '10091',
+            'id': '158433',
-            'display_id': 'basket-brussels-bat-mons-80-74',
+            'display_id': 'futsal-schaerbeek-sincline-5-3-a-thulin',
-            'ext': 'flv',
+            'ext': 'mp4',
-            'title': 'Basket : le Brussels bat Mons 80-74',
+            'title': 'Futsal : Schaerbeek s’incline 5-3 à Thulin',
-            'description': 're:^Ils l\u2019on fait ! En basket, le B*',
+            'description': 'md5:fd013f1488d5e2dceb9cebe39e2d569b',
-        },
-        'params': {
-            'skip_download': 'requires rtmpdump'
         },
+    }, {
+        'url': 'http://bx1.be/emission/bxenf1-gastronomie/',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -50,13 +47,13 @@ class TeleBruxellesIE(InfoExtractor):
             r'file\s*:\s*"(rtmp://[^/]+/vod/mp4:"\s*\+\s*"[^"]+"\s*\+\s*".mp4)"',
             webpage, 'RTMP url')
         rtmp_url = re.sub(r'"\s*\+\s*"', '', rtmp_url)
+        formats = self._extract_wowza_formats(rtmp_url, article_id or display_id)
+        self._sort_formats(formats)
 
         return {
             'id': article_id or display_id,
             'display_id': display_id,
             'title': title,
             'description': description,
-            'url': rtmp_url,
+            'formats': formats,
-            'ext': 'flv',
-            'rtmp_live': True  # if rtmpdump is not called with "--live" argument, the download is blocked and can be completed
         }