X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftnaflix.py;h=0c2f8f119fbc3d3535d571f430865a071f98e10f;hb=54fc90aabfb71968f28af68dfe3f7a3544cc2f0b;hp=7ddf77767d804faff4097d85d796760bc4473b77;hpb=a1aadd09a4721ffd4d782aae4ddeae2699ca17fa;p=youtube-dl
diff --git a/youtube_dl/extractor/tnaflix.py b/youtube_dl/extractor/tnaflix.py
index 7ddf77767..0c2f8f119 100644
--- a/youtube_dl/extractor/tnaflix.py
+++ b/youtube_dl/extractor/tnaflix.py
@@ -10,6 +10,7 @@ from ..utils import (
int_or_none,
parse_duration,
str_to_int,
+ unescapeHTML,
xpath_text,
)
@@ -20,6 +21,8 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
r'flashvars\.config\s*=\s*escape\("([^"]+)"',
r']+name="config\d?" value="([^"]+)"',
]
+ _HOST = 'tna'
+ _VKEY_SUFFIX = ''
_TITLE_REGEX = r']+name="title" value="([^"]+)"'
_DESCRIPTION_REGEX = r']+name="description" value="([^"]+)"'
_UPLOADER_REGEX = r']+name="username" value="([^"]+)"'
@@ -71,7 +74,13 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
- display_id = mobj.group('display_id') if 'display_id' in mobj.groupdict() else video_id
+ for display_id_key in ('display_id', 'display_id_2'):
+ if display_id_key in mobj.groupdict():
+ display_id = mobj.group(display_id_key)
+ if display_id:
+ break
+ else:
+ display_id = video_id
webpage = self._download_webpage(url, display_id)
@@ -80,7 +89,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' % (inputs['vkey'], inputs['nkey'])
+ 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',
@@ -89,7 +99,8 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
formats = []
def extract_video_url(vl):
- return re.sub('speed=\d+', 'speed=', vl.text)
+ # Any URL modification now results in HTTP Error 403: Forbidden
+ return unescapeHTML(vl.text)
video_link = cfg_xml.find('./videoLink')
if video_link is not None:
@@ -172,7 +183,7 @@ class TNAFlixNetworkEmbedIE(TNAFlixNetworkBaseIE):
'display_id': '6538',
'ext': 'mp4',
'title': 'Educational xxx video',
- 'thumbnail': 're:https?://.*\.jpg$',
+ 'thumbnail': r're:https?://.*\.jpg$',
'age_limit': 18,
},
'params': {
@@ -190,13 +201,16 @@ class TNAFlixNetworkEmbedIE(TNAFlixNetworkBaseIE):
webpage)]
-class TNAFlixIE(TNAFlixNetworkBaseIE):
+class TNAEMPFlixBaseIE(TNAFlixNetworkBaseIE):
+ _DESCRIPTION_REGEX = r'(?s)>Description:[^>]+>(.+?)<'
+ _UPLOADER_REGEX = r'by\s*]+\bhref=["\']/profile/[^>]+>([^<]+)<'
+ _CATEGORIES_REGEX = r'(?s)]*>Categories:(.+?)'
+
+
+class TNAFlixIE(TNAEMPFlixBaseIE):
_VALID_URL = r'https?://(?:www\.)?tnaflix\.com/[^/]+/(?P[^/]+)/video(?P\d+)'
_TITLE_REGEX = r'(.+?) - (?:TNAFlix Porn Videos|TNAFlix\.com)'
- _DESCRIPTION_REGEX = r'(?s)>Description:[^>]+>(.+?)<'
- _UPLOADER_REGEX = r'\s*Verified Member\s*\s*(.+?)<'
- _CATEGORIES_REGEX = r'(?s)]*>Categories:(.+?)'
_TESTS = [{
# anonymous uploader, no categories
@@ -207,7 +221,7 @@ class TNAFlixIE(TNAFlixNetworkBaseIE):
'display_id': 'Carmella-Decesare-striptease',
'ext': 'mp4',
'title': 'Carmella Decesare - striptease',
- 'thumbnail': 're:https?://.*\.jpg$',
+ 'thumbnail': r're:https?://.*\.jpg$',
'duration': 91,
'age_limit': 18,
'categories': ['Porn Stars'],
@@ -215,18 +229,18 @@ class TNAFlixIE(TNAFlixNetworkBaseIE):
}, {
# non-anonymous uploader, categories
'url': 'https://www.tnaflix.com/teen-porn/Educational-xxx-video/video6538',
- 'md5': 'fcba2636572895aba116171a899a5658',
+ 'md5': '0f5d4d490dbfd117b8607054248a07c0',
'info_dict': {
'id': '6538',
'display_id': 'Educational-xxx-video',
- 'ext': 'flv',
+ 'ext': 'mp4',
'title': 'Educational xxx video',
'description': 'md5:b4fab8f88a8621c8fabd361a173fe5b8',
- 'thumbnail': 're:https?://.*\.jpg$',
+ 'thumbnail': r're:https?://.*\.jpg$',
'duration': 164,
'age_limit': 18,
'uploader': 'bobwhite39',
- 'categories': ['Amateur Porn', 'Squirting Videos', 'Teen Girls 18+'],
+ 'categories': list,
}
}, {
'url': 'https://www.tnaflix.com/amateur-porn/bunzHD-Ms.Donk/video358632',
@@ -234,21 +248,22 @@ class TNAFlixIE(TNAFlixNetworkBaseIE):
}]
-class EMPFlixIE(TNAFlixNetworkBaseIE):
- _VALID_URL = r'https?://(?:www\.)?empflix\.com/videos/(?P.+?)-(?P[0-9]+)\.html'
+class EMPFlixIE(TNAEMPFlixBaseIE):
+ _VALID_URL = r'https?://(?:www\.)?empflix\.com/(?:videos/(?P.+?)-|[^/]+/(?P[^/]+)/video)(?P[0-9]+)'
- _UPLOADER_REGEX = r']+class="infoTitle"[^>]*>Uploaded By:(.+?)'
+ _HOST = 'emp'
+ _VKEY_SUFFIX = '-1'
_TESTS = [{
'url': 'http://www.empflix.com/videos/Amateur-Finger-Fuck-33051.html',
- 'md5': 'b1bc15b6412d33902d6e5952035fcabc',
+ 'md5': 'bc30d48b91a7179448a0bda465114676',
'info_dict': {
'id': '33051',
'display_id': 'Amateur-Finger-Fuck',
'ext': 'mp4',
'title': 'Amateur Finger Fuck',
'description': 'Amateur solo finger fucking.',
- 'thumbnail': 're:https?://.*\.jpg$',
+ 'thumbnail': r're:https?://.*\.jpg$',
'duration': 83,
'age_limit': 18,
'uploader': 'cwbike',
@@ -257,6 +272,9 @@ class EMPFlixIE(TNAFlixNetworkBaseIE):
}, {
'url': 'http://www.empflix.com/videos/[AROMA][ARMD-718]-Aoi-Yoshino-Sawa-25826.html',
'only_matching': True,
+ }, {
+ 'url': 'https://www.empflix.com/amateur-porn/Amateur-Finger-Fuck/video33051',
+ 'only_matching': True,
}]
@@ -278,7 +296,7 @@ class MovieFapIE(TNAFlixNetworkBaseIE):
'ext': 'mp4',
'title': 'Experienced MILF Amazing Handjob',
'description': 'Experienced MILF giving an Amazing Handjob',
- 'thumbnail': 're:https?://.*\.jpg$',
+ 'thumbnail': r're:https?://.*\.jpg$',
'age_limit': 18,
'uploader': 'darvinfred06',
'view_count': int,
@@ -296,7 +314,7 @@ class MovieFapIE(TNAFlixNetworkBaseIE):
'ext': 'flv',
'title': 'Jeune Couple Russe',
'description': 'Amateur',
- 'thumbnail': 're:https?://.*\.jpg$',
+ 'thumbnail': r're:https?://.*\.jpg$',
'age_limit': 18,
'uploader': 'whiskeyjar',
'view_count': int,