projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dbb25af
)
[empflix] Fix extractrion
author
Sergey M․
<dstftw@gmail.com>
Sat, 25 Nov 2017 16:13:17 +0000
(23:13 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 25 Nov 2017 16:42:20 +0000
(23:42 +0700)
youtube_dl/extractor/tnaflix.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tnaflix.py
b/youtube_dl/extractor/tnaflix.py
index 9f47ce2aa2f0392dd7dfc15c4a2fafbbedf22978..c4ead1fcd3bd232dabf009859aed6bbb06924699 100644
(file)
--- 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="([^"]+)"',
]
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="([^"]+)"'
_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)
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',
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'
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 = [{
_UPLOADER_REGEX = r'<span[^>]+class="infoTitle"[^>]*>Uploaded By:</span>(.+?)</li>'
_TESTS = [{