diff options
| author | Sergey M․ <dstftw@gmail.com> | 2020-11-19 05:02:04 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2020-11-19 05:02:04 +0700 |
| commit | 91e954587f5b2b4760b73275ad0720933c0136a7 (patch) | |
| tree | 6caf1c9ca28de7cb8618b70629a8aa732338450e /youtube_dl/extractor/generic.py | |
| parent | 9b505185da1f7148e02174fce693583af68976d9 (diff) | |
| download | youtube-dl-91e954587f5b2b4760b73275ad0720933c0136a7.tar.gz youtube-dl-91e954587f5b2b4760b73275ad0720933c0136a7.tar.xz youtube-dl-91e954587f5b2b4760b73275ad0720933c0136a7.zip | |
[arte] Rework extractors
* Reimplement embed and playlist extractors to delegate to the single entrypoint artetv extractor Beware reluctant download archive extractor keys breakage. * Improve embeds detection (closes #27057) - Remove obsolete code
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 355067a50..d08a8cca5 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/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( |