projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[xhamster] Fix thumbnail extraction
[youtube-dl]
/
youtube_dl
/
extractor
/
youporn.py
diff --git
a/youtube_dl/extractor/youporn.py
b/youtube_dl/extractor/youporn.py
index d9c06a2ee6d934391560b6ca7db4ebecf40ff1d0..4ba7c36db78fb457b63e05fe161a75b00383c78c 100644
(file)
--- a/
youtube_dl/extractor/youporn.py
+++ b/
youtube_dl/extractor/youporn.py
@@
-6,10
+6,11
@@
import re
import sys
from .common import InfoExtractor
import sys
from .common import InfoExtractor
-from ..
utils
import (
+from ..
compat
import (
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_parse_urlparse,
compat_urllib_request,
-
+)
+from ..utils import (
ExtractorError,
unescapeHTML,
unified_strdate,
ExtractorError,
unescapeHTML,
unified_strdate,
@@
-46,11
+47,12
@@
class YouPornIE(InfoExtractor):
# Get JSON parameters
json_params = self._search_regex(
# Get JSON parameters
json_params = self._search_regex(
- r'var currentVideo = new Video\((.*)\)[,;]',
+ [r'videoJa?son\s*=\s*({.+})',
+ r'var\s+currentVideo\s*=\s*new\s+Video\((.+?)\)[,;]'],
webpage, 'JSON parameters')
try:
params = json.loads(json_params)
webpage, 'JSON parameters')
try:
params = json.loads(json_params)
- except:
+ except
ValueError
:
raise ExtractorError('Invalid JSON')
self.report_extraction(video_id)
raise ExtractorError('Invalid JSON')
self.report_extraction(video_id)