diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-11-25 23:13:17 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-11-25 23:42:20 +0700 |
| commit | 9105523818270cadb7ad90a3b1ea7e6f18d2dc54 (patch) | |
| tree | f2f86f0bb686eca979b802ea55cf3da15a8346c6 /youtube_dl/extractor | |
| parent | dbb25af657166108e7afcd4e1ff197e2a5644724 (diff) | |
[empflix] Fix extractrion
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/tnaflix.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/youtube_dl/extractor/tnaflix.py b/youtube_dl/extractor/tnaflix.py index 9f47ce2aa..c4ead1fcd 100644 --- a/youtube_dl/extractor/tnaflix.py +++ b/youtube_dl/extractor/tnaflix.py @@ -21,6 +21,8 @@ class TNAFlixNetworkBaseIE(InfoExtractor): r'flashvars\.config\s*=\s*escape\("([^"]+)"', r'<input[^>]+name="config\d?" value="([^"]+)"', ] + _HOST = 'tna' + _VKEY_SUFFIX = '' _TITLE_REGEX = r'<input[^>]+name="title" value="([^"]+)"' _DESCRIPTION_REGEX = r'<input[^>]+name="description" value="([^"]+)"' _UPLOADER_REGEX = r'<input[^>]+name="username" value="([^"]+)"' @@ -81,8 +83,8 @@ class TNAFlixNetworkBaseIE(InfoExtractor): if not cfg_url: inputs = self._hidden_inputs(webpage) - cfg_url = ('https://cdn-fck.tnaflix.com/tnaflix/%s.fid?key=%s&VID=%s&premium=1&vip=1&alpha' - % (inputs['vkey'], inputs['nkey'], video_id)) + cfg_url = ('https://cdn-fck.%sflix.com/%sflix/%s%s.fid?key=%s&VID=%s&premium=1&vip=1&alpha' + % (self._HOST, self._HOST, inputs['vkey'], self._VKEY_SUFFIX, inputs['nkey'], video_id)) cfg_xml = self._download_xml( cfg_url, display_id, 'Downloading metadata', @@ -240,6 +242,8 @@ class TNAFlixIE(TNAFlixNetworkBaseIE): class EMPFlixIE(TNAFlixNetworkBaseIE): _VALID_URL = r'https?://(?:www\.)?empflix\.com/videos/(?P<display_id>.+?)-(?P<id>[0-9]+)\.html' + _HOST = 'emp' + _VKEY_SUFFIX = '-1' _UPLOADER_REGEX = r'<span[^>]+class="infoTitle"[^>]*>Uploaded By:</span>(.+?)</li>' _TESTS = [{ |