瀏覽代碼

[extractor/generic] Add support for tnaflix network embeds (Closes #7505)

Sergey M․ 9 年之前
父節點
當前提交
2c9ca78281
共有 1 個文件被更改,包括 6 次插入0 次删除
  1. 6 0
      youtube_dl/extractor/generic.py

+ 6 - 0
youtube_dl/extractor/generic.py

@@ -47,6 +47,7 @@ from .senateisvp import SenateISVPIE
 from .svt import SVTIE
 from .svt import SVTIE
 from .pornhub import PornHubIE
 from .pornhub import PornHubIE
 from .xhamster import XHamsterEmbedIE
 from .xhamster import XHamsterEmbedIE
+from .tnaflix import TNAFlixNetworkEmbedIE
 from .vimeo import VimeoIE
 from .vimeo import VimeoIE
 from .dailymotion import DailymotionCloudIE
 from .dailymotion import DailymotionCloudIE
 from .onionstudios import OnionStudiosIE
 from .onionstudios import OnionStudiosIE
@@ -1633,6 +1634,11 @@ class GenericIE(InfoExtractor):
         if xhamster_urls:
         if xhamster_urls:
             return _playlist_from_matches(xhamster_urls, ie='XHamsterEmbed')
             return _playlist_from_matches(xhamster_urls, ie='XHamsterEmbed')
 
 
+        # Look for embedded TNAFlixNetwork player
+        tnaflix_urls = TNAFlixNetworkEmbedIE._extract_urls(webpage)
+        if tnaflix_urls:
+            return _playlist_from_matches(tnaflix_urls, ie=TNAFlixNetworkEmbedIE.ie_key())
+
         # Look for embedded Tvigle player
         # Look for embedded Tvigle player
         mobj = re.search(
         mobj = re.search(
             r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//cloud\.tvigle\.ru/video/.+?)\1', webpage)
             r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//cloud\.tvigle\.ru/video/.+?)\1', webpage)