projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f0d3669
)
[sunporno] Fix metadata extraction (Closes #10316)
author
Sergey M․
<dstftw@gmail.com>
Sat, 13 Aug 2016 07:09:35 +0000
(14:09 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 13 Aug 2016 07:09:35 +0000
(14:09 +0700)
youtube_dl/extractor/sunporno.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/sunporno.py
b/youtube_dl/extractor/sunporno.py
index e527aa97188b1860e054f8af7c7bd7a33301729e..4269f2a30409a2a6536457def53b39369c522ef0 100644
(file)
--- a/
youtube_dl/extractor/sunporno.py
+++ b/
youtube_dl/extractor/sunporno.py
@@
-15,10
+15,10
@@
class SunPornoIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?sunporno\.com/videos/(?P<id>\d+)'
_TEST = {
'url': 'http://www.sunporno.com/videos/807778/',
_VALID_URL = r'https?://(?:www\.)?sunporno\.com/videos/(?P<id>\d+)'
_TEST = {
'url': 'http://www.sunporno.com/videos/807778/',
- 'md5': '
6457d3c165fd6de062b99ef6c2ff4c86
',
+ 'md5': '
507887e29033502f29dba69affeebfc9
',
'info_dict': {
'id': '807778',
'info_dict': {
'id': '807778',
- 'ext': '
flv
',
+ 'ext': '
mp4
',
'title': 'md5:0a400058e8105d39e35c35e7c5184164',
'description': 'md5:a31241990e1bd3a64e72ae99afb325fb',
'thumbnail': 're:^https?://.*\.jpg$',
'title': 'md5:0a400058e8105d39e35c35e7c5184164',
'description': 'md5:a31241990e1bd3a64e72ae99afb325fb',
'thumbnail': 're:^https?://.*\.jpg$',
@@
-40,7
+40,8
@@
class SunPornoIE(InfoExtractor):
r'poster="([^"]+)"', webpage, 'thumbnail', fatal=False)
duration = parse_duration(self._search_regex(
r'poster="([^"]+)"', webpage, 'thumbnail', fatal=False)
duration = parse_duration(self._search_regex(
- r'itemprop="duration">\s*(\d+:\d+)\s*<',
+ (r'itemprop="duration"[^>]*>\s*(\d+:\d+)\s*<',
+ r'>Duration:\s*<span[^>]+>\s*(\d+:\d+)\s*<'),
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(
@@
-48,7
+49,7
@@
class SunPornoIE(InfoExtractor):
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?',
- webpage, 'comment count', fatal=False))
+ webpage, 'comment count', fatal=False
, default=None
))
formats = []
quality = qualities(['mp4', 'flv'])
formats = []
quality = qualities(['mp4', 'flv'])