projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b63005f
)
[xhamster] Fix duration extraction (closes #11549)
author
Sergey M․
<dstftw@gmail.com>
Wed, 28 Dec 2016 16:01:52 +0000
(23:01 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 28 Dec 2016 16:04:46 +0000
(23:04 +0700)
youtube_dl/extractor/xhamster.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/xhamster.py
b/youtube_dl/extractor/xhamster.py
index bd8e1af2e0f6c25fc44aea36c23b813b092b4438..36a8c98407bcaf8466660279f2e444df48083a3a 100644
(file)
--- a/
youtube_dl/extractor/xhamster.py
+++ b/
youtube_dl/extractor/xhamster.py
@@
-5,8
+5,8
@@
import re
from .common import InfoExtractor
from ..utils import (
dict_get,
from .common import InfoExtractor
from ..utils import (
dict_get,
- float_or_none,
int_or_none,
int_or_none,
+ parse_duration,
unified_strdate,
)
unified_strdate,
)
@@
-22,7
+22,7
@@
class XHamsterIE(InfoExtractor):
'title': 'FemaleAgent Shy beauty takes the bait',
'upload_date': '20121014',
'uploader': 'Ruseful2011',
'title': 'FemaleAgent Shy beauty takes the bait',
'upload_date': '20121014',
'uploader': 'Ruseful2011',
- 'duration': 893
.52
,
+ 'duration': 893,
'age_limit': 18,
},
}, {
'age_limit': 18,
},
}, {
@@
-33,7
+33,7
@@
class XHamsterIE(InfoExtractor):
'title': 'Britney Spears Sexy Booty',
'upload_date': '20130914',
'uploader': 'jojo747400',
'title': 'Britney Spears Sexy Booty',
'upload_date': '20130914',
'uploader': 'jojo747400',
- 'duration': 200
.48
,
+ 'duration': 200,
'age_limit': 18,
},
'params': {
'age_limit': 18,
},
'params': {
@@
-48,7
+48,7
@@
class XHamsterIE(InfoExtractor):
'title': '....',
'upload_date': '20160208',
'uploader': 'parejafree',
'title': '....',
'upload_date': '20160208',
'uploader': 'parejafree',
- 'duration': 72
.0
,
+ 'duration': 72,
'age_limit': 18,
},
'params': {
'age_limit': 18,
},
'params': {
@@
-101,9
+101,9
@@
class XHamsterIE(InfoExtractor):
r'''<video[^>]+poster=(?P<q>["'])(?P<thumbnail>.+?)(?P=q)[^>]*>'''],
webpage, 'thumbnail', fatal=False, group='thumbnail')
r'''<video[^>]+poster=(?P<q>["'])(?P<thumbnail>.+?)(?P=q)[^>]*>'''],
webpage, 'thumbnail', fatal=False, group='thumbnail')
- duration =
float_or_none
(self._search_regex(
- r'
(["\'])duration\1\s*:\s*(["\'])(?P<duration>.+?)\2'
,
-
webpage, 'duration', fatal=False, group='duration'
))
+ duration =
parse_duration
(self._search_regex(
+ r'
Runtime:\s*</span>\s*([\d:]+)', webpage
,
+
'duration', fatal=False
))
view_count = int_or_none(self._search_regex(
r'content=["\']User(?:View|Play)s:(\d+)',
view_count = int_or_none(self._search_regex(
r'content=["\']User(?:View|Play)s:(\d+)',