summary refs log tree commit diff
diff options
context:
space:
mode:
authorRogério Brito <rbrito@ime.usp.br>2013-10-19 14:19:25 -0300
committerRogério Brito <rbrito@ime.usp.br>2013-10-19 14:19:25 -0300
commit50a6150ed9a0d5af39c27b5dba1e06deadd767cf (patch)
tree10eb6e811b306f914a4098d455101d76282a9193
parent8ed6b34477367ff2900a0e8b3628056188598fe8 (diff)
downloadyoutube-dl-50a6150ed9a0d5af39c27b5dba1e06deadd767cf.tar.gz
youtube-dl-50a6150ed9a0d5af39c27b5dba1e06deadd767cf.tar.xz
youtube-dl-50a6150ed9a0d5af39c27b5dba1e06deadd767cf.zip
extractor: Set age limit on some adult-related extractors.
More age limit of videos for adult-related sites.

Note that, for redtube, I explicitly left the variable containing the age
limit, since the comment justifying the age limit is a good thing to have.

That being said, I included the age limit field on the test, to better
reflect what the information extractor does (even if it may not break the
automated tests).

Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
-rw-r--r--youtube_dl/extractor/redtube.py3
-rw-r--r--youtube_dl/extractor/xhamster.py9
2 files changed, 8 insertions, 4 deletions
diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py
index 365aade56..994778e16 100644
--- a/youtube_dl/extractor/redtube.py
+++ b/youtube_dl/extractor/redtube.py
@@ -10,7 +10,8 @@ class RedTubeIE(InfoExtractor):
         u'file': u'66418.mp4',
         u'md5': u'7b8c22b5e7098a3e1c09709df1126d2d',
         u'info_dict': {
-            u"title": u"Sucked on a toilet"
+            u"title": u"Sucked on a toilet",
+            u"age_limit": 18,
         }
     }
 
diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index 361619694..f060d9066 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -19,7 +19,8 @@ class XHamsterIE(InfoExtractor):
         u'info_dict': {
             u"upload_date": u"20121014", 
             u"uploader_id": u"Ruseful2011", 
-            u"title": u"FemaleAgent Shy beauty takes the bait"
+            u"title": u"FemaleAgent Shy beauty takes the bait",
+            u"age_limit": 18,
         }
     },
     {
@@ -29,7 +30,8 @@ class XHamsterIE(InfoExtractor):
         u'info_dict': {
             u"upload_date": u"20130914", 
             u"uploader_id": u"jojo747400", 
-            u"title": u"Britney Spears  Sexy Booty"
+            u"title": u"Britney Spears  Sexy Booty",
+            u"age_limit": 18,
         }
     }]
 
@@ -80,5 +82,6 @@ class XHamsterIE(InfoExtractor):
             'description': video_description,
             'upload_date': video_upload_date,
             'uploader_id': video_uploader_id,
-            'thumbnail': video_thumbnail
+            'thumbnail': video_thumbnail,
+            'age_limit': 18,
         }]