[extractor/generic] Add support for tnaflix network embeds (Closes #7505)
authorSergey M․ <dstftw@gmail.com>
Sat, 27 Feb 2016 11:15:49 +0000 (17:15 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 27 Feb 2016 11:15:49 +0000 (17:15 +0600)
youtube_dl/extractor/generic.py

index c6bf8d270f2dc07c3f0e1e3bf8732804393437a1..ca745ae41ecf46dd4b0a6b5dbd80a3e836c5f794 100644 (file)
@@ -47,6 +47,7 @@ from .senateisvp import SenateISVPIE
 from .svt import SVTIE
 from .pornhub import PornHubIE
 from .xhamster import XHamsterEmbedIE
+from .tnaflix import TNAFlixNetworkEmbedIE
 from .vimeo import VimeoIE
 from .dailymotion import DailymotionCloudIE
 from .onionstudios import OnionStudiosIE
@@ -1633,6 +1634,11 @@ class GenericIE(InfoExtractor):
         if xhamster_urls:
             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
         mobj = re.search(
             r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//cloud\.tvigle\.ru/video/.+?)\1', webpage)