fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Call extracted property age_limit everywhere

This commit is contained in:
Philipp Hagemeister 2013-10-06 16:23:06 +02:00
parent 8dbe9899a9
commit cfadd183c4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/YoutubeDL.py
View File

@ -313,7 +313,7 @@ class YoutubeDL(object):
return u'[download] %s upload date is not in range %s' % (date_from_str(date).isoformat(), dateRange) return u'[download] %s upload date is not in range %s' % (date_from_str(date).isoformat(), dateRange)
age_limit = self.params.get('age_limit') age_limit = self.params.get('age_limit')
if age_limit is not None: if age_limit is not None:
if age_limit < info_dict.get('age_restriction', 0): if age_limit < info_dict.get('age_limit', 0):
return u'Skipping "' + title + '" because it is age restricted' return u'Skipping "' + title + '" because it is age restricted'
return None return None

2
youtube_dl/extractor/pornotube.py
View File

@ -47,6 +47,6 @@ class PornotubeIE(InfoExtractor):
'title': video_title, 'title': video_title,
'ext': 'flv', 'ext': 'flv',
'format': 'flv', 'format': 'flv',
'age_restriction': age_limit} 'age_limit': age_limit}
return [info] return [info]

2
youtube_dl/extractor/youporn.py
View File

@ -117,7 +117,7 @@ class YouPornIE(InfoExtractor):
'format': format, 'format': format,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'description': video_description, 'description': video_description,
'age_restriction': age_limit, 'age_limit': age_limit,
}) })
if self._downloader.params.get('listformats', None): if self._downloader.params.get('listformats', None):

2
youtube_dl/extractor/youtube.py
View File

@ -1496,7 +1496,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):
'player_url': player_url, 'player_url': player_url,
'subtitles': video_subtitles, 'subtitles': video_subtitles,
'duration': video_duration, 'duration': video_duration,
'age_restriction': 18 if age_gate else 0, 'age_limit': 18 if age_gate else 0,
}) })
return results return results