From 3c4fbfeca2431b120537b9eaedf5977dd0ab13b1 Mon Sep 17 00:00:00 2001 From: Remita Amine Date: Wed, 6 Dec 2017 10:54:20 +0100 Subject: [dailymotion] remove dailymotion cloud extractor(closes #6794) https://web.archive.org/web/20160312110217/https://www.dmcloud.net/ --- youtube_dl/extractor/francetv.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'youtube_dl/extractor/francetv.py') diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py index 5a3abeaff..80c597015 100644 --- a/youtube_dl/extractor/francetv.py +++ b/youtube_dl/extractor/francetv.py @@ -13,10 +13,7 @@ from ..utils import ( parse_duration, determine_ext, ) -from .dailymotion import ( - DailymotionIE, - DailymotionCloudIE, -) +from .dailymotion import DailymotionIE class FranceTVBaseInfoExtractor(InfoExtractor): @@ -290,10 +287,6 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor): page_title = mobj.group('title') webpage = self._download_webpage(url, page_title) - dmcloud_url = DailymotionCloudIE._extract_dmcloud_url(webpage) - if dmcloud_url: - return self.url_result(dmcloud_url, DailymotionCloudIE.ie_key()) - dailymotion_urls = DailymotionIE._extract_urls(webpage) if dailymotion_urls: return self.playlist_result([ -- cgit v1.2.3 From c38970ca10fc8c8e3ba05019d5f73ff235de9fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sun, 10 Dec 2017 22:46:21 +0700 Subject: [culturebox] Improve video id extraction (closes #14947) --- youtube_dl/extractor/francetv.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'youtube_dl/extractor/francetv.py') diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py index 80c597015..095bb3954 100644 --- a/youtube_dl/extractor/francetv.py +++ b/youtube_dl/extractor/francetv.py @@ -356,6 +356,7 @@ class CultureboxIE(FranceTVBaseInfoExtractor): raise ExtractorError('Video %s is not available' % name, expected=True) video_id, catalogue = self._search_regex( - r'"https?://videos\.francetv\.fr/video/([^@]+@[^"]+)"', webpage, 'video id').split('@') + r'["\'>]https?://videos\.francetv\.fr/video/([^@]+@.+?)["\'<]', + webpage, 'video id').split('@') return self._extract_video(video_id, catalogue) -- cgit v1.2.3