]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[spankwire] Add support for generic embeds (refs #24633)
authorSergey M․ <dstftw@gmail.com>
Sun, 5 Apr 2020 13:42:10 +0000 (20:42 +0700)
committerSergey M․ <dstftw@gmail.com>
Sun, 5 Apr 2020 13:42:56 +0000 (20:42 +0700)
youtube_dl/extractor/generic.py
youtube_dl/extractor/spankwire.py

index a495ee15aaedc2a64fad86bde03e0be4cab64e85..63b52306a3c4d3fb2857758ddb9670bca057507f 100644 (file)
@@ -60,6 +60,7 @@ from .tnaflix import TNAFlixNetworkEmbedIE
 from .drtuber import DrTuberIE
 from .redtube import RedTubeIE
 from .tube8 import Tube8IE
+from .spankwire import SpankwireIE
 from .vimeo import VimeoIE
 from .dailymotion import DailymotionIE
 from .dailymail import DailyMailIE
@@ -2715,6 +2716,11 @@ class GenericIE(InfoExtractor):
         if tube8_urls:
             return self.playlist_from_matches(tube8_urls, video_id, video_title, ie=Tube8IE.ie_key())
 
+        # Look for embedded Spankwire player
+        spankwire_urls = SpankwireIE._extract_urls(webpage)
+        if spankwire_urls:
+            return self.playlist_from_matches(spankwire_urls, video_id, video_title, ie=SpankwireIE.ie_key())
+
         # Look for embedded Tvigle player
         mobj = re.search(
             r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//cloud\.tvigle\.ru/video/.+?)\1', webpage)
index 8f67463edbc6572331c12aa1433f3772f848087b..35ab9ec375989d412d94f7d40d2babadf93c44c4 100644 (file)
@@ -67,6 +67,12 @@ class SpankwireIE(InfoExtractor):
         'only_matching': True,
     }]
 
+    @staticmethod
+    def _extract_urls(webpage):
+        return re.findall(
+            r'<iframe[^>]+\bsrc=["\']((?:https?:)?//(?:www\.)?spankwire\.com/EmbedPlayer\.aspx/?\?.*?\bArticleId=\d+)',
+            webpage)
+
     def _real_extract(self, url):
         video_id = self._match_id(url)