summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2014-09-18 20:56:54 +0700
committerSergey M․ <dstftw@gmail.com>2014-09-18 20:56:54 +0700
commit2914e5f00f6ebcc59712b7091a87988408ff3c88 (patch)
treec1dd54aa4ce31520cfbed41b9248ca87671de2b2
parent2f834e938192a61fd4a32fa98bffb5e1b614bc29 (diff)
downloadyoutube-dl-2914e5f00f6ebcc59712b7091a87988408ff3c88.tar.gz
youtube-dl-2914e5f00f6ebcc59712b7091a87988408ff3c88.tar.xz
youtube-dl-2914e5f00f6ebcc59712b7091a87988408ff3c88.zip
[drtuber] Fix categories
-rw-r--r--youtube_dl/extractor/drtuber.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/extractor/drtuber.py b/youtube_dl/extractor/drtuber.py
index d5bfd7f22..ca274dff6 100644
--- a/youtube_dl/extractor/drtuber.py
+++ b/youtube_dl/extractor/drtuber.py
@@ -19,7 +19,7 @@ class DrTuberIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'comment_count': int,
-            'categories': list,  # NSFW
+            'categories': ['Babe', 'Blonde', 'Erotic', 'Outdoor', 'Softcore', 'Solo'],
             'thumbnail': 're:https?://.*\.jpg$',
             'age_limit': 18,
         }
@@ -52,9 +52,9 @@ class DrTuberIE(InfoExtractor):
             r'<span class="comments_count">([\d,\.]+)</span>',
             webpage, 'comment count', fatal=False))
 
-        cats_str = self._html_search_regex(
-            r'<meta name="keywords" content="([^"]+)"', webpage, 'categories', fatal=False)
-        categories = None if cats_str is None else cats_str.split(' ')
+        cats_str = self._search_regex(
+            r'<span>Categories:</span><div>(.+?)</div>', webpage, 'categories', fatal=False)
+        categories = [] if not cats_str else re.findall(r'<a title="([^"]+)"', cats_str)
 
         return {
             'id': video_id,