瀏覽代碼

[tnaflixnetwork:embed] Add extractor

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

+ 1 - 0
youtube_dl/extractor/__init__.py

@@ -737,6 +737,7 @@ from .tmz import (
     TMZArticleIE,
     TMZArticleIE,
 )
 )
 from .tnaflix import (
 from .tnaflix import (
+    TNAFlixNetworkEmbedIE,
     TNAFlixIE,
     TNAFlixIE,
     EMPFlixIE,
     EMPFlixIE,
     MovieFapIE,
     MovieFapIE,

+ 25 - 1
youtube_dl/extractor/tnaflix.py

@@ -71,7 +71,7 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
     def _real_extract(self, url):
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')
         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)
         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):
 class TNAFlixIE(TNAFlixNetworkBaseIE):
     _VALID_URL = r'https?://(?:www\.)?tnaflix\.com/[^/]+/(?P<display_id>[^/]+)/video(?P<id>\d+)'
     _VALID_URL = r'https?://(?:www\.)?tnaflix\.com/[^/]+/(?P<display_id>[^/]+)/video(?P<id>\d+)'