about summary refs log tree commit diff
path: root/youtube_dl/extractor/tnaflix.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-02-27 16:58:11 +0600
committerSergey M․ <dstftw@gmail.com>2016-02-27 16:58:11 +0600
commitd6e9c2706fd803b5963fba47b168b6bccc063667 (patch)
treef9f72b953e2970abc8dcc07e9a4bf7686d552355 /youtube_dl/extractor/tnaflix.py
parentf7f2e53a0a25e8c99f6f1a50cb3843d8e6f5be6f (diff)
downloadyoutube-dl-d6e9c2706fd803b5963fba47b168b6bccc063667.tar.gz
youtube-dl-d6e9c2706fd803b5963fba47b168b6bccc063667.tar.xz
youtube-dl-d6e9c2706fd803b5963fba47b168b6bccc063667.zip
[tnaflixnetwork:embed] Add extractor
Diffstat (limited to 'youtube_dl/extractor/tnaflix.py')
-rw-r--r--youtube_dl/extractor/tnaflix.py26
1 files changed, 25 insertions, 1 deletions
diff --git a/youtube_dl/extractor/tnaflix.py b/youtube_dl/extractor/tnaflix.py
index 49516abca..547d83d09 100644
--- a/youtube_dl/extractor/tnaflix.py
+++ b/youtube_dl/extractor/tnaflix.py
@@ -71,7 +71,7 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')
-        display_id = mobj.group('display_id')
+        display_id = mobj.group('display_id') if 'display_id' in mobj.groupdict() else video_id
 
         webpage = self._download_webpage(url, display_id)
 
@@ -152,6 +152,30 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
         }
 
 
+class TNAFlixNetworkEmbedIE(TNAFlixNetworkBaseIE):
+    _VALID_URL = r'https?://player\.(?:tna|emp)flix\.com/video/(?P<id>\d+)'
+
+    _TITLE_REGEX = r'<title>([^<]+)</title>'
+
+    _TESTS = [{
+        'url': 'https://player.tnaflix.com/video/6538',
+        'info_dict': {
+            'id': '6538',
+            'display_id': '6538',
+            'ext': 'mp4',
+            'title': 'Educational xxx video',
+            'thumbnail': 're:https?://.*\.jpg$',
+            'age_limit': 18,
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        'url': 'https://player.empflix.com/video/33051',
+        'only_matching': True,
+    }]
+
+
 class TNAFlixIE(TNAFlixNetworkBaseIE):
     _VALID_URL = r'https?://(?:www\.)?tnaflix\.com/[^/]+/(?P<display_id>[^/]+)/video(?P<id>\d+)'