X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Ftube8.py;h=1853a1104c2b8957793ede25c6296598eb0babc9;hb=6c52477f595176d16f063407bcf44439b9c26022;hp=4053f6c2150ff536cce19a7fede105f0fee5d8d8;hpb=8804f10e6b580db38df7301a174cb48ea374f9eb;p=youtube-dl
diff --git a/youtube_dl/extractor/tube8.py b/youtube_dl/extractor/tube8.py
index 4053f6c21..1853a1104 100644
--- a/youtube_dl/extractor/tube8.py
+++ b/youtube_dl/extractor/tube8.py
@@ -1,5 +1,7 @@
from __future__ import unicode_literals
+import re
+
from ..utils import (
int_or_none,
str_to_int,
@@ -21,7 +23,9 @@ class Tube8IE(KeezMoviesIE):
'title': 'Kasia music video',
'age_limit': 18,
'duration': 230,
- }
+ 'categories': ['Teen'],
+ 'tags': ['dancing'],
+ },
}, {
'url': 'http://www.tube8.com/shemale/teen/blonde-cd-gets-kidnapped-by-two-blacks-and-punished-for-being-a-slutty-girl/19569151/',
'only_matching': True,
@@ -51,6 +55,17 @@ class Tube8IE(KeezMoviesIE):
r'',
webpage, 'comment count', fatal=False))
+ category = self._search_regex(
+ r'Category:\s*\s*]+href=[^>]+>([^<]+)',
+ webpage, 'category', fatal=False)
+ categories = [category] if category else None
+
+ tags_str = self._search_regex(
+ r'(?s)Tags:\s*(.+?)(?!a)',
+ webpage, 'tags', fatal=False)
+ tags = [t for t in re.findall(
+ r']+href=[^>]+>([^<]+)', tags_str)] if tags_str else None
+
info.update({
'description': description,
'uploader': uploader,
@@ -58,6 +73,8 @@ class Tube8IE(KeezMoviesIE):
'like_count': like_count,
'dislike_count': dislike_count,
'comment_count': comment_count,
+ 'categories': categories,
+ 'tags': tags,
})
return info