projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[pornhub] Simplify (closes #12018)
[youtube-dl]
/
youtube_dl
/
extractor
/
pornhub.py
diff --git
a/youtube_dl/extractor/pornhub.py
b/youtube_dl/extractor/pornhub.py
index 5e930f45e0ac271a3c37e5bffa4a23f791a2ebf0..818d99c1f8f88a64e576910bb3dcb4df8c139a05 100644
(file)
--- a/
youtube_dl/extractor/pornhub.py
+++ b/
youtube_dl/extractor/pornhub.py
@@
-158,22
+158,15
@@
class PornHubIE(InfoExtractor):
video_variables = {}
for video_variablename, quote, video_variable in re.findall(
video_variables = {}
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)
- url = url.replace('+', '')
- url = url.replace(' ', '')
- video_urls.append(url)
+ encoded_video_url = encoded_video_url.replace(varname, varval)
+ video_urls.append(re.sub(r'[\s+]', '', encoded_video_url))
if webpage.find('"encrypted":true') != -1:
password = compat_urllib_parse_unquote_plus(
if webpage.find('"encrypted":true') != -1:
password = compat_urllib_parse_unquote_plus(