X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftelebruxelles.py;h=eefecc490c5d13476259497e79f7a3ebe68caee7;hb=2c347352677f023678ffd488a51b19f54b97fa36;hp=39852dd0ed9e95cb2ba4a61d96b8f681b6f29bf8;hpb=119b3caa4630ad89d2805c10d84ef6347a7374f1;p=youtube-dl

diff --git a/youtube_dl/extractor/telebruxelles.py b/youtube_dl/extractor/telebruxelles.py
index 39852dd0e..eefecc490 100644
--- a/youtube_dl/extractor/telebruxelles.py
+++ b/youtube_dl/extractor/telebruxelles.py
@@ -2,51 +2,61 @@
 from __future__ import unicode_literals
 
 import re
-import json
 
 from .common import InfoExtractor
 
 
 class TeleBruxellesIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?telebruxelles\.be/(news|sport|dernier-jt)/?(?P<title>[^\?]+)'
+    _VALID_URL = r'https?://(?:www\.)?(?:telebruxelles|bx1)\.be/(news|sport|dernier-jt)/?(?P<id>[^/#?]+)'
     _TESTS = [{
-        'url': r'http://www.telebruxelles.be/news/auditions-devant-parlement-francken-galant-tres-attendus/',
-        'md5': '59439e568c9ee42fb77588b2096b214f', 
+        'url': 'http://www.telebruxelles.be/news/auditions-devant-parlement-francken-galant-tres-attendus/',
+        'md5': '59439e568c9ee42fb77588b2096b214f',
         'info_dict': {
             'id': '11942',
+            'display_id': 'auditions-devant-parlement-francken-galant-tres-attendus',
             'ext': 'flv',
-            'title': 're:Parlement : Francken et Galant répondent aux interpellations*',
-			'description': 're:Les auditions des ministres se poursuivent*'
-        }
+            'title': 'Parlement : Francken et Galant répondent aux interpellations de l’opposition',
+            'description': 're:Les auditions des ministres se poursuivent*'
+        },
+        'params': {
+            'skip_download': 'requires rtmpdump'
+        },
     }, {
-        'url': r'http://www.telebruxelles.be/sport/basket-brussels-bat-mons-80-74/',
-        'md5': '181d3fbdcf20b909309e5aef5c6c6047', 
+        'url': 'http://www.telebruxelles.be/sport/basket-brussels-bat-mons-80-74/',
+        'md5': '181d3fbdcf20b909309e5aef5c6c6047',
         'info_dict': {
             'id': '10091',
+            'display_id': 'basket-brussels-bat-mons-80-74',
             'ext': 'flv',
             'title': 'Basket : le Brussels bat Mons 80-74',
-			'description': 're:Ils l\u2019on fait ! En basket, le B*'
-        }
-	}]
+            'description': 're:^Ils l\u2019on fait ! En basket, le B*',
+        },
+        'params': {
+            'skip_download': 'requires rtmpdump'
+        },
+    }]
 
     def _real_extract(self, url):
-		mobj = re.match(self._VALID_URL, url)
-		title = mobj.group('title')
-
-		webpage = self._download_webpage(url, title)
-		
-		article_id = self._html_search_regex(r"<article id=\"post-(\d+)\"", webpage, '0')
-		title = self._html_search_regex(r'<h1 class=\"entry-title\">(.*?)</h1>', webpage, 'title')
-		description = self._html_search_regex(r"property=\"og:description\" content=\"(.*?)\"", webpage, 'description', fatal=False)
-		
-		rtmp_url = self._html_search_regex(r"file: \"(rtmp://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}/vod/mp4:\" \+ \"\w+\" \+ \".mp4)\"", webpage, 'url')
-		rtmp_url = rtmp_url.replace("\" + \"", "")
-
-		return {
-			'id': article_id,
-			'title': title,
-			'description': description,
-			'url': rtmp_url,
-			'ext': 'flv',
-			'rtmp_live': True              # if rtmpdump is not called with "--live" argument, the download is blocked and can be completed
-		}
\ No newline at end of file
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+
+        article_id = self._html_search_regex(
+            r"<article id=\"post-(\d+)\"", webpage, 'article ID', default=None)
+        title = self._html_search_regex(
+            r'<h1 class=\"entry-title\">(.*?)</h1>', webpage, 'title')
+        description = self._og_search_description(webpage, default=None)
+
+        rtmp_url = self._html_search_regex(
+            r'file\s*:\s*"(rtmp://[^/]+/vod/mp4:"\s*\+\s*"[^"]+"\s*\+\s*".mp4)"',
+            webpage, 'RTMP url')
+        rtmp_url = re.sub(r'"\s*\+\s*"', '', rtmp_url)
+
+        return {
+            'id': article_id or display_id,
+            'display_id': display_id,
+            'title': title,
+            'description': description,
+            'url': rtmp_url,
+            'ext': 'flv',
+            'rtmp_live': True  # if rtmpdump is not called with "--live" argument, the download is blocked and can be completed
+        }