From dff32d0be6af0127d99040b5deb6b35f8ad696ad Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Boulay Date: Sat, 10 Sep 2016 19:59:56 -0400 Subject: [PATCH] Added TVA Nouvelles to extractors.py. Also added the regex for TVA Nouvelles and added the attribute to get the video id. --- youtube_dl/extractor/extractors.py | 1 + youtube_dl/extractor/tvanouvelles.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 38dc33674..b41035c23 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -920,6 +920,7 @@ from .tv2 import ( ) from .tv3 import TV3IE from .tv4 import TV4IE +from .tvanouvelles import TVANouvellesIE from .tvc import ( TVCIE, TVCArticleIE, diff --git a/youtube_dl/extractor/tvanouvelles.py b/youtube_dl/extractor/tvanouvelles.py index 55a6f0ef1..50ab815fd 100644 --- a/youtube_dl/extractor/tvanouvelles.py +++ b/youtube_dl/extractor/tvanouvelles.py @@ -1,10 +1,11 @@ from __future__ import unicode_literals from .common import InfoExtractor +from .youtube import YoutubeIE class TVANouvellesIE(InfoExtractor): - _VALID_URL = r'https?://www\.tvanouvelles\.com/.*?' + _VALID_URL = r'https?://(www\.|)tvanouvelles\.(ca|com|qc)/.*.?/(?P[^/]+)' _TEST = { 'url': 'http://www.tvanouvelles.ca/videos/5117035533001', @@ -18,7 +19,7 @@ class TVANouvellesIE(InfoExtractor): 'upload_date': '20140919', }, 'add_ie': ['BrightcoveNew'], - 'skip': 'Not accessible from Travis CI server', + } BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1741764581/default_default/index.html?videoId=%s' @@ -26,5 +27,5 @@ class TVANouvellesIE(InfoExtractor): program_name = self._match_id(url) webpage = self._download_webpage(url, program_name) brightcove_id = self._search_regex( - r'RenderPagesVideo\(\'(.+?)\'', webpage, 'brightcove id') + r'data-video-id\=(.+[0-9]?)', webpage, 'brightcove id') return self.url_result(self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, 'BrightcoveNew', brightcove_id)