midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[pornhub] Simplify (closes #12018)

Browse source
This commit is contained in:
Sergey M․ 2017-02-10 00:57:44 +07:00
parent e64b0fca14
commit b7f9843bec
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
youtube_dl/extractor/pornhub.py
View file

@ -158,22 +158,15 @@ class PornHubIE(InfoExtractor):
video_variables = {} video_variables = {}
for video_variablename, quote, video_variable in re.findall( for video_variablename, quote, video_variable in re.findall(
r'(player_quality_[0-9]{3,4}p[0-9a-z]+?)=\s*(["\'])(.*?)\2;', webpage): r'(player_quality_[0-9]{3,4}p\w+)\s*=\s*(["\'])(.+?)\2;', webpage):
video_variables[video_variablename] = video_variable video_variables[video_variablename] = video_variable
encoded_video_urls = []
for encoded_video_url in re.findall(
r'player_quality_[0-9]{3,4}p\s*=(.*?);', webpage):
encoded_video_urls.append(encoded_video_url)
# Decode the URLs
video_urls = [] video_urls = []
for url in encoded_video_urls: for encoded_video_url in re.findall(
r'player_quality_[0-9]{3,4}p\s*=(.+?);', webpage):
for varname, varval in video_variables.items(): for varname, varval in video_variables.items():
url = url.replace(varname, varval) encoded_video_url = encoded_video_url.replace(varname, varval)
url = url.replace('+', '') video_urls.append(re.sub(r'[\s+]', '', encoded_video_url))
url = url.replace(' ', '')
video_urls.append(url)
if webpage.find('"encrypted":true') != -1: if webpage.find('"encrypted":true') != -1:
password = compat_urllib_parse_unquote_plus( password = compat_urllib_parse_unquote_plus(