X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftnaflix.py;h=6798ef4c3f32da387e17b2381bf2b1815bfdd119;hb=5f47a60c5d66d65b505131a672a3bad67ddaa00f;hp=0c2f8f119fbc3d3535d571f430865a071f98e10f;hpb=8cfbcfab9a94d363dbc8e1b026648c3ccf0d399e;p=youtube-dl
diff --git a/youtube_dl/extractor/tnaflix.py b/youtube_dl/extractor/tnaflix.py
index 0c2f8f119..6798ef4c3 100644
--- a/youtube_dl/extractor/tnaflix.py
+++ b/youtube_dl/extractor/tnaflix.py
@@ -18,8 +18,9 @@ from ..utils import (
class TNAFlixNetworkBaseIE(InfoExtractor):
# May be overridden in descendants if necessary
_CONFIG_REGEX = [
- r'flashvars\.config\s*=\s*escape\("([^"]+)"',
- r']+name="config\d?" value="([^"]+)"',
+ r'flashvars\.config\s*=\s*escape\("(?P[^"]+)"',
+ r']+name="config\d?" value="(?P[^"]+)"',
+ r'config\s*=\s*(["\'])(?P(?:https?:)?//(?:(?!\1).)+)\1',
]
_HOST = 'tna'
_VKEY_SUFFIX = ''
@@ -85,7 +86,8 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
webpage = self._download_webpage(url, display_id)
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:
inputs = self._hidden_inputs(webpage)