Browse Source

[tnaflixnetwork:embed] Fix extraction (closes #18205)

Sergey M․ 6 years ago
parent
commit
9b9b3501c5
1 changed files with 5 additions and 3 deletions
  1. 5 3
      youtube_dl/extractor/tnaflix.py

+ 5 - 3
youtube_dl/extractor/tnaflix.py

@@ -18,8 +18,9 @@ from ..utils import (
 class TNAFlixNetworkBaseIE(InfoExtractor):
 class TNAFlixNetworkBaseIE(InfoExtractor):
     # May be overridden in descendants if necessary
     # May be overridden in descendants if necessary
     _CONFIG_REGEX = [
     _CONFIG_REGEX = [
-        r'flashvars\.config\s*=\s*escape\("([^"]+)"',
-        r'<input[^>]+name="config\d?" value="([^"]+)"',
+        r'flashvars\.config\s*=\s*escape\("(?P<url>[^"]+)"',
+        r'<input[^>]+name="config\d?" value="(?P<url>[^"]+)"',
+        r'config\s*=\s*(["\'])(?P<url>(?:https?:)?//(?:(?!\1).)+)\1',
     ]
     ]
     _HOST = 'tna'
     _HOST = 'tna'
     _VKEY_SUFFIX = ''
     _VKEY_SUFFIX = ''
@@ -85,7 +86,8 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
         webpage = self._download_webpage(url, display_id)
         webpage = self._download_webpage(url, display_id)
 
 
         cfg_url = self._proto_relative_url(self._html_search_regex(
         cfg_url = self._proto_relative_url(self._html_search_regex(
-            self._CONFIG_REGEX, webpage, 'flashvars.config', default=None), 'http:')
+            self._CONFIG_REGEX, webpage, 'flashvars.config', default=None,
+            group='url'), 'http:')
 
 
         if not cfg_url:
         if not cfg_url:
             inputs = self._hidden_inputs(webpage)
             inputs = self._hidden_inputs(webpage)