projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[picarto] Extract more metadata (closes #16518)
[youtube-dl]
/
youtube_dl
/
extractor
/
youporn.py
diff --git
a/youtube_dl/extractor/youporn.py
b/youtube_dl/extractor/youporn.py
index 547adefeba00ffb58a7e4dbd4205fc935c7ff2be..ea0bce784c5fbe91d904428670377d3e92414453 100644
(file)
--- a/
youtube_dl/extractor/youporn.py
+++ b/
youtube_dl/extractor/youporn.py
@@
-3,13
+3,13
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..compat import compat_str
from ..utils import (
int_or_none,
sanitized_Request,
str_to_int,
unescapeHTML,
unified_strdate,
from ..utils import (
int_or_none,
sanitized_Request,
str_to_int,
unescapeHTML,
unified_strdate,
+ url_or_none,
)
from ..aes import aes_decrypt_text
)
from ..aes import aes_decrypt_text
@@
-88,8
+88,8
@@
class YouPornIE(InfoExtractor):
for definition in definitions:
if not isinstance(definition, dict):
continue
for definition in definitions:
if not isinstance(definition, dict):
continue
- video_url =
definition.get('videoUrl'
)
- if
isinstance(video_url, compat_str) and
video_url:
+ video_url =
url_or_none(definition.get('videoUrl')
)
+ if video_url:
links.append(video_url)
# Fallback #1, this also contains extra low quality 180p format
links.append(video_url)
# Fallback #1, this also contains extra low quality 180p format