projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'atomicdryad-pr-crashfix_compat_urllib_unquote'
[youtube-dl]
/
youtube_dl
/
extractor
/
sunporno.py
diff --git
a/youtube_dl/extractor/sunporno.py
b/youtube_dl/extractor/sunporno.py
index 8a333f1d24d6be3bd5160d843c3cd6451ef83178..e527aa97188b1860e054f8af7c7bd7a33301729e 100644
(file)
--- a/
youtube_dl/extractor/sunporno.py
+++ b/
youtube_dl/extractor/sunporno.py
@@
-44,7
+44,7
@@
class SunPornoIE(InfoExtractor):
webpage, 'duration', fatal=False))
view_count = int_or_none(self._html_search_regex(
webpage, 'duration', fatal=False))
view_count = int_or_none(self._html_search_regex(
- r'class="views">\s*(\d+)\s*<',
+ r'class="views">
(?:<noscript>)?
\s*(\d+)\s*<',
webpage, 'view count', fatal=False))
comment_count = int_or_none(self._html_search_regex(
r'(\d+)</b> Comments?',
webpage, 'view count', fatal=False))
comment_count = int_or_none(self._html_search_regex(
r'(\d+)</b> Comments?',
@@
-52,7
+52,7
@@
class SunPornoIE(InfoExtractor):
formats = []
quality = qualities(['mp4', 'flv'])
formats = []
quality = qualities(['mp4', 'flv'])
- for video_url in re.findall(r'<
source
src="([^"]+)"', webpage):
+ for video_url in re.findall(r'<
(?:source|video)
src="([^"]+)"', webpage):
video_ext = determine_ext(video_url)
formats.append({
'url': video_url,
video_ext = determine_ext(video_url)
formats.append({
'url': video_url,