diff options
| author | Tom-Oliver Heidel <github@tom-oliver.eu> | 2020-11-30 02:20:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 02:20:18 +0100 |
| commit | ef5a4db06cb7667dc555f0dc1982de2c5258eb37 (patch) | |
| tree | c947a547303ccf19483e83ea9d3ea77c74b5b7a8 /youtube_dlc/extractor/generic.py | |
| parent | 93201d50aa5e0bce0ecf6941cd6f9ea6c9ef86a5 (diff) | |
| parent | c78b936af4366259605e3e706bdeb5e173bf3d9b (diff) | |
| download | hypervideo-pre-ef5a4db06cb7667dc555f0dc1982de2c5258eb37.tar.lz hypervideo-pre-ef5a4db06cb7667dc555f0dc1982de2c5258eb37.tar.xz hypervideo-pre-ef5a4db06cb7667dc555f0dc1982de2c5258eb37.zip | |
Merge pull request #245 from pukkandan/merge-main
Merge youtube-dl and fix Youtube Feeds
Diffstat (limited to 'youtube_dlc/extractor/generic.py')
| -rw-r--r-- | youtube_dlc/extractor/generic.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/youtube_dlc/extractor/generic.py b/youtube_dlc/extractor/generic.py index aba06b328..db4d3a933 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 @@ -841,7 +842,7 @@ class GenericIE(InfoExtractor): 'skip_download': True, } }, - # MTVSercices embed + # MTVServices embed { 'url': 'http://www.vulture.com/2016/06/new-key-peele-sketches-released.html', 'md5': 'ca1aef97695ef2c1d6973256a57e5252', @@ -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( |