mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-23 16:36:48 +00:00
YoupornIE: Add support for hd videos and update Test
This commit is contained in:
parent
f3bcebb1d2
commit
97b3656c2e
@ -12,14 +12,16 @@ from ..utils import (
|
|||||||
unescapeHTML,
|
unescapeHTML,
|
||||||
unified_strdate,
|
unified_strdate,
|
||||||
)
|
)
|
||||||
|
from ..aes import (
|
||||||
|
aes_decrypt_text
|
||||||
|
)
|
||||||
|
|
||||||
class YouPornIE(InfoExtractor):
|
class YouPornIE(InfoExtractor):
|
||||||
_VALID_URL = r'^(?:https?://)?(?:\w+\.)?youporn\.com/watch/(?P<videoid>[0-9]+)/(?P<title>[^/]+)'
|
_VALID_URL = r'^(?:https?://)?(?:\w+\.)?youporn\.com/watch/(?P<videoid>[0-9]+)/(?P<title>[^/]+)'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
u'url': u'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
|
u'url': u'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
|
||||||
u'file': u'505835.mp4',
|
u'file': u'505835.mp4',
|
||||||
u'md5': u'c37ddbaaa39058c76a7e86c6813423c1',
|
u'md5': u'71ec5fcfddacf80f495efa8b6a8d9a89',
|
||||||
u'info_dict': {
|
u'info_dict': {
|
||||||
u"upload_date": u"20101221",
|
u"upload_date": u"20101221",
|
||||||
u"description": u"Love & Sex Answers: http://bit.ly/DanAndJenn -- Is It Unhealthy To Masturbate Daily?",
|
u"description": u"Love & Sex Answers: http://bit.ly/DanAndJenn -- Is It Unhealthy To Masturbate Daily?",
|
||||||
@ -75,6 +77,14 @@ class YouPornIE(InfoExtractor):
|
|||||||
# Get all of the links from the page
|
# Get all of the links from the page
|
||||||
LINK_RE = r'(?s)<a href="(?P<url>[^"]+)">'
|
LINK_RE = r'(?s)<a href="(?P<url>[^"]+)">'
|
||||||
links = re.findall(LINK_RE, download_list_html)
|
links = re.findall(LINK_RE, download_list_html)
|
||||||
|
|
||||||
|
# Get link of hd video
|
||||||
|
encrypted_video_url = self._html_search_regex(r'var encryptedURL = \'(?P<encrypted_video_url>[a-zA-Z0-9+/]+={0,2})\';',
|
||||||
|
webpage, u'encrypted_video_url')
|
||||||
|
video_url = unicode( aes_decrypt_text(encrypted_video_url, video_title, 32), 'utf-8')
|
||||||
|
if video_url.split('/')[6].split('_')[0] == u'720p': # only add if 720p to avoid duplicates
|
||||||
|
links = [video_url] + links
|
||||||
|
|
||||||
if(len(links) == 0):
|
if(len(links) == 0):
|
||||||
raise ExtractorError(u'ERROR: no known formats available for video')
|
raise ExtractorError(u'ERROR: no known formats available for video')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user