mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-01-07 17:16:08 +00:00
[spankwire] Support new cdn video url format
This commit is contained in:
parent
9990c960f2
commit
59e6acc757
|
@ -17,7 +17,7 @@ from ..aes import aes_decrypt_text
|
|||
|
||||
class SpankwireIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://(?:www\.)?(?P<url>spankwire\.com/[^/]*/video(?P<videoid>[0-9]+)/?)'
|
||||
_TEST = {
|
||||
_TESTS = [{
|
||||
'url': 'http://www.spankwire.com/Buckcherry-s-X-Rated-Music-Video-Crazy-Bitch/video103545/',
|
||||
'md5': '8bbfde12b101204b39e4b9fe7eb67095',
|
||||
'info_dict': {
|
||||
|
@ -30,7 +30,21 @@ class SpankwireIE(InfoExtractor):
|
|||
'upload_date': '20070507',
|
||||
'age_limit': 18,
|
||||
}
|
||||
},
|
||||
{
|
||||
'url': 'http://www.spankwire.com/Titcums-Compiloation-I/video1921551/',
|
||||
'md5': '09b3c20833308b736ae8902db2f8d7e6',
|
||||
'info_dict': {
|
||||
'id': '1921551',
|
||||
'ext': 'mp4',
|
||||
'title': 'Titcums Compiloation I',
|
||||
'description': 'cum on tits',
|
||||
'uploader': 'dannyh78999',
|
||||
'uploader_id': '3056053',
|
||||
'upload_date': '20150822',
|
||||
'age_limit': 18,
|
||||
}
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
mobj = re.match(self._VALID_URL, url)
|
||||
|
@ -82,6 +96,24 @@ class SpankwireIE(InfoExtractor):
|
|||
for video_url in video_urls:
|
||||
path = compat_urllib_parse_urlparse(video_url).path
|
||||
format = path.split('/')[4].split('_')[:2]
|
||||
if format[0] == 'mp4':
|
||||
format_id, quality = format
|
||||
format = "-".join(format)
|
||||
if quality == 'normal':
|
||||
height = 180
|
||||
elif quality == 'high':
|
||||
height = 240
|
||||
elif quality == 'ultra':
|
||||
height = 480
|
||||
elif quality == '720p':
|
||||
height = 720
|
||||
formats.append({
|
||||
'url': video_url,
|
||||
'format': format,
|
||||
'height': height,
|
||||
'format_id': format,
|
||||
})
|
||||
else:
|
||||
resolution, bitrate_str = format
|
||||
format = "-".join(format)
|
||||
height = int(resolution.rstrip('Pp'))
|
||||
|
|
Loading…
Reference in a new issue