diff options
| author | pukkandan <pukkandan@gmail.com> | 2020-11-20 00:52:59 +0530 |
|---|---|---|
| committer | pukkandan <pukkandan@gmail.com> | 2020-11-20 13:03:32 +0530 |
| commit | 8bdd16b4993b8d546b4cbbdbe4710db0bc2f971b (patch) | |
| tree | c5ba0d26e17bb3102c0b24886853d9a818e875c6 /youtube_dlc/extractor/generic.py | |
| parent | 228385340e9a976f52735078218a9b8ecfe7ae7a (diff) | |
| download | hypervideo-pre-8bdd16b4993b8d546b4cbbdbe4710db0bc2f971b.tar.lz hypervideo-pre-8bdd16b4993b8d546b4cbbdbe4710db0bc2f971b.tar.xz hypervideo-pre-8bdd16b4993b8d546b4cbbdbe4710db0bc2f971b.zip | |
Merge 'ytdl-org/youtube-dl/master' release 2020.11.19
Old Extractors left behind:
VLivePlaylistIE
YoutubeSearchURLIE
YoutubeShowIE
YoutubeFavouritesIE
If removing old extractors, make corresponding changes in
docs/supportedsites.md
youtube_dlc/extractor/extractors.py
Not merged:
.github/ISSUE_TEMPLATE/1_broken_site.md
.github/ISSUE_TEMPLATE/2_site_support_request.md
.github/ISSUE_TEMPLATE/3_site_feature_request.md
.github/ISSUE_TEMPLATE/4_bug_report.md
.github/ISSUE_TEMPLATE/5_feature_request.md
test/test_all_urls.py
youtube_dlc/version.py
Changelog
Diffstat (limited to 'youtube_dlc/extractor/generic.py')
| -rw-r--r-- | youtube_dlc/extractor/generic.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/youtube_dlc/extractor/generic.py b/youtube_dlc/extractor/generic.py index aba06b328..ce8cac5c1 100644 --- a/youtube_dlc/extractor/generic.py +++ b/youtube_dlc/extractor/generic.py @@ -91,6 +91,7 @@ from .piksel import PikselIE from .videa import VideaIE from .twentymin import TwentyMinutenIE from .ustream import UstreamIE +from .arte import ArteTVEmbedIE from .videopress import VideoPressIE from .rutube import RutubeIE from .limelight import LimelightBaseIE @@ -2760,11 +2761,9 @@ class GenericIE(InfoExtractor): return self.url_result(ustream_url, UstreamIE.ie_key()) # Look for embedded arte.tv player - mobj = re.search( - r'<(?:script|iframe) [^>]*?src="(?P<url>http://www\.arte\.tv/(?:playerv2/embed|arte_vp/index)[^"]+)"', - webpage) - if mobj is not None: - return self.url_result(mobj.group('url'), 'ArteTVEmbed') + arte_urls = ArteTVEmbedIE._extract_urls(webpage) + if arte_urls: + return self.playlist_from_matches(arte_urls, video_id, video_title) # Look for embedded francetv player mobj = re.search( |