projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c07068
)
[drtuber] Make dislike count optional (Closes #10297)
author
Sergey M․
<dstftw@gmail.com>
Thu, 11 Aug 2016 16:47:27 +0000
(23:47 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 11 Aug 2016 16:47:27 +0000
(23:47 +0700)
youtube_dl/extractor/drtuber.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/drtuber.py
b/youtube_dl/extractor/drtuber.py
index 639f9182c5484a22f0056e25fc6aa7e56f193df5..4e55577038e8c0e8ae30ba8a8a7139498cbcb326 100644
(file)
--- a/
youtube_dl/extractor/drtuber.py
+++ b/
youtube_dl/extractor/drtuber.py
@@
-3,7
+3,10
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..utils import str_to_int
+from ..utils import (
+ NO_DEFAULT,
+ str_to_int,
+)
class DrTuberIE(InfoExtractor):
class DrTuberIE(InfoExtractor):
@@
-17,7
+20,6
@@
class DrTuberIE(InfoExtractor):
'ext': 'mp4',
'title': 'hot perky blonde naked golf',
'like_count': int,
'ext': 'mp4',
'title': 'hot perky blonde naked golf',
'like_count': int,
- 'dislike_count': int,
'comment_count': int,
'categories': ['Babe', 'Blonde', 'Erotic', 'Outdoor', 'Softcore', 'Solo'],
'thumbnail': 're:https?://.*\.jpg$',
'comment_count': int,
'categories': ['Babe', 'Blonde', 'Erotic', 'Outdoor', 'Softcore', 'Solo'],
'thumbnail': 're:https?://.*\.jpg$',
@@
-43,18
+45,20
@@
class DrTuberIE(InfoExtractor):
r'poster="([^"]+)"',
webpage, 'thumbnail', fatal=False)
r'poster="([^"]+)"',
webpage, 'thumbnail', fatal=False)
- def extract_count(id_, name):
+ def extract_count(id_, name
, default=NO_DEFAULT
):
return str_to_int(self._html_search_regex(
r'<span[^>]+(?:class|id)="%s"[^>]*>([\d,\.]+)</span>' % id_,
return str_to_int(self._html_search_regex(
r'<span[^>]+(?:class|id)="%s"[^>]*>([\d,\.]+)</span>' % id_,
- webpage, '%s count' % name, fatal=False))
+ webpage, '%s count' % name,
default=default,
fatal=False))
like_count = extract_count('rate_likes', 'like')
like_count = extract_count('rate_likes', 'like')
- dislike_count = extract_count('rate_dislikes', 'dislike')
+ dislike_count = extract_count('rate_dislikes', 'dislike'
, default=None
)
comment_count = extract_count('comments_count', 'comment')
cats_str = self._search_regex(
comment_count = extract_count('comments_count', 'comment')
cats_str = self._search_regex(
- r'<div[^>]+class="categories_list">(.+?)</div>', webpage, 'categories', fatal=False)
- categories = [] if not cats_str else re.findall(r'<a title="([^"]+)"', cats_str)
+ r'<div[^>]+class="categories_list">(.+?)</div>',
+ webpage, 'categories', fatal=False)
+ categories = [] if not cats_str else re.findall(
+ r'<a title="([^"]+)"', cats_str)
return {
'id': video_id,
return {
'id': video_id,