diff --git a/youtube_dl/extractor/bdsmxtube.py b/youtube_dl/extractor/bdsmxtube.py index cebb57edd..0507e95cd 100644 --- a/youtube_dl/extractor/bdsmxtube.py +++ b/youtube_dl/extractor/bdsmxtube.py @@ -8,7 +8,7 @@ class BdsmxTubeIE(VXXXIE): _VALID_URL = r'https?://bdsmx\.tube/video/(?P\d+)' _TESTS = [{ 'url': 'https://bdsmx.tube/video/127583/latex-puppy-leashed/', - 'md5': '06b6000c19207cb068bc0009f243345d', + 'md5': '79751d4ed75668afe07a660c4bcb2f1b', 'info_dict': { 'id': '127583', 'ext': 'mp4', diff --git a/youtube_dl/extractor/blackporntube.py b/youtube_dl/extractor/blackporntube.py index 48780f310..12168fcb9 100644 --- a/youtube_dl/extractor/blackporntube.py +++ b/youtube_dl/extractor/blackporntube.py @@ -8,7 +8,7 @@ class BlackPornTubeIE(VXXXIE): _VALID_URL = r'https?://blackporn\.tube/video/(?P\d+)' _TESTS = [{ 'url': 'https://blackporn.tube/video/10043813/young-ebony-babe-gets-super-wet/', - 'md5': 'f5c2652f686e66d453f6fede3bdba054', + 'md5': '4a4c126970f2f1453b8b2050947fc870', 'info_dict': { 'id': '10043813', 'ext': 'mp4', diff --git a/youtube_dl/extractor/inporn.py b/youtube_dl/extractor/inporn.py index 5b92d9ddb..ab68c9f02 100644 --- a/youtube_dl/extractor/inporn.py +++ b/youtube_dl/extractor/inporn.py @@ -8,7 +8,7 @@ class InPornIE(VXXXIE): _VALID_URL = r'https?://(?:www\.)?inporn\.com/video/(?P\d+)' _TESTS = [{ 'url': 'https://inporn.com/video/533613/2k-t-2nd-season-parm-151/', - 'md5': '111e5c4680b1fa5995144e101c521a4f', + 'md5': 'c358d1da6b451ebe7cfb00dd89741607', 'info_dict': { 'id': '533613', 'ext': 'mp4', diff --git a/youtube_dl/extractor/mrgay.py b/youtube_dl/extractor/mrgay.py index badc4553e..ad827f422 100644 --- a/youtube_dl/extractor/mrgay.py +++ b/youtube_dl/extractor/mrgay.py @@ -8,7 +8,7 @@ class MrGayIE(VXXXIE): _VALID_URL = r'https?://mrgay\.com/video/(?P\d+)' _TESTS = [{ 'url': 'https://mrgay.com/video/10169199/jpn-crossdresser-6/', - 'md5': 'b2ff401f8a168007702f3f5cbecd7bc2', + 'md5': 'b5780a9437c205b4bc87eb939b23e8ef', 'info_dict': { 'id': '10169199', 'ext': 'mp4', diff --git a/youtube_dl/extractor/vxxx.py b/youtube_dl/extractor/vxxx.py index e53420a66..9dd5cc8d8 100644 --- a/youtube_dl/extractor/vxxx.py +++ b/youtube_dl/extractor/vxxx.py @@ -12,7 +12,7 @@ class VXXXIE(InfoExtractor): _VALID_URL = r'https?://vxxx\.com/video-(?P\d+)' _TESTS = [{ 'url': 'https://vxxx.com/video-80747/', - 'md5': '4736e868b0e008b4ff9dc09585c26c52', + 'md5': '2f4bfd829b682ff9e3da1bda71b81b81', 'info_dict': { 'id': '80747', 'ext': 'mp4', @@ -89,26 +89,16 @@ class VXXXIE(InfoExtractor): 'formats': None } - qualities = { - '_fhd.mp4': -1, # 1080p - '_hd.mp4': -2, # 720p - '_hq.mp4': -2, # 720p - '_sd.mp4': -3, # 480p - '_lq.mp4': -3 # 480p - } - format_object = self._download_format_object(video_id) - formats = list(map(lambda f: { - 'url': "https://{}{}".format( + m3u8_formats = self._extract_m3u8_formats( + "https://{}{}&f=video.m3u8".format( self._get_video_host(), - self._decode_base164(f['video_url']) + self._decode_base164(format_object[0]['video_url']) ), - 'format_id': f['format'], - 'quality': qualities.get(f['format'], -1) - }, format_object)) - self._sort_formats(formats) + video_id, 'mp4') + self._sort_formats(m3u8_formats) + info['formats'] = m3u8_formats - info['formats'] = formats return info def _real_extract(self, url): diff --git a/youtube_dl/extractor/xmilf.py b/youtube_dl/extractor/xmilf.py index 2ee849d14..d3a749402 100644 --- a/youtube_dl/extractor/xmilf.py +++ b/youtube_dl/extractor/xmilf.py @@ -8,7 +8,7 @@ class XMilfIE(VXXXIE): _VALID_URL = r'https?://xmilf\.com/video/(?P\d+)' _TESTS = [{ 'url': 'https://xmilf.com/video/143777/big-boob-brunette-masturbates3/', - 'md5': 'a93d43a83042cb6e42103053d981de81', + 'md5': 'a196fe8daebe194a758754c81e9232ad', 'info_dict': { 'id': '143777', 'ext': 'mp4',