projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
875ddd7
)
[telebruxelles] extract all formats and add support for emission urls
author
Remita Amine
<remitamine@gmail.com>
Tue, 6 Dec 2016 18:01:09 +0000
(19:01 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Tue, 6 Dec 2016 18:01:17 +0000
(19:01 +0100)
youtube_dl/extractor/telebruxelles.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/telebruxelles.py
b/youtube_dl/extractor/telebruxelles.py
index eefecc490c5d13476259497e79f7a3ebe68caee7..5886e9c1bb7e0c4e9b192480ac2cfa48118ffe2a 100644
(file)
--- a/
youtube_dl/extractor/telebruxelles.py
+++ b/
youtube_dl/extractor/telebruxelles.py
@@
-7,33
+7,30
@@
from .common import InfoExtractor
class TeleBruxellesIE(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 = [{
_TESTS = [{
- 'url': 'http://
www.telebruxelles.be/news/auditions-devant-parlement-francken-galant-tres-attendus
/',
- 'md5': '
59439e568c9ee42fb77588b2096b214f
',
+ 'url': 'http://
bx1.be/news/que-risque-lauteur-dune-fausse-alerte-a-la-bombe
/',
+ 'md5': '
a2a67a5b1c3e8c9d33109b902f474fd9
',
'info_dict': {
'info_dict': {
- 'id': '11942',
- 'display_id': 'auditions-devant-parlement-francken-galant-tres-attendus',
- 'ext': 'flv',
- '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'
+ 'id': '158856',
+ 'display_id': 'que-risque-lauteur-dune-fausse-alerte-a-la-bombe',
+ 'ext': 'mp4',
+ 'title': 'Que risque l’auteur d’une fausse alerte à la bombe ?',
+ 'description': 'md5:3cf8df235d44ebc5426373050840e466',
},
}, {
},
}, {
- 'url': 'http://
www.telebruxelles.be/sport/basket-brussels-bat-mons-80-74
/',
- 'md5': '
181d3fbdcf20b909309e5aef5c6c6047
',
+ 'url': 'http://
bx1.be/sport/futsal-schaerbeek-sincline-5-3-a-thulin
/',
+ 'md5': '
dfe07ecc9c153ceba8582ac912687675
',
'info_dict': {
'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*',
- },
- 'params': {
- 'skip_download': 'requires rtmpdump'
+ 'id': '158433',
+ 'display_id': 'futsal-schaerbeek-sincline-5-3-a-thulin',
+ 'ext': 'mp4',
+ 'title': 'Futsal : Schaerbeek s’incline 5-3 à Thulin',
+ 'description': 'md5:fd013f1488d5e2dceb9cebe39e2d569b',
},
},
+ }, {
+ 'url': 'http://bx1.be/emission/bxenf1-gastronomie/',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
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)
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,
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
+ 'formats': formats,
}
}