diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-01-07 07:30:57 +0100 | 
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-01-07 07:30:57 +0100 | 
| commit | e4a8eae701f22395dae607ed000d39f7a57e80a0 (patch) | |
| tree | ff33173e1320f25a6af60140c3cd4ff98346d2c3 /youtube_dl/YoutubeDL.py | |
| parent | 75e51819d010b38d9a3464f8749688c8d53fc123 (diff) | |
| parent | 8ee341500dea885c79316fb8f12adde2028c55a5 (diff) | |
Merge commit '8ee3415'
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 10 | 
1 files changed, 3 insertions, 7 deletions
| diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 806e7b239..36c71f947 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -63,6 +63,7 @@ from .utils import (      YoutubeDLHandler,      prepend_extension,      args_to_str, +    age_restricted,  )  from .cache import Cache  from .extractor import get_info_extractor, gen_extractors @@ -550,13 +551,8 @@ class YoutubeDL(object):              max_views = self.params.get('max_views')              if max_views is not None and view_count > max_views:                  return 'Skipping %s, because it has exceeded the maximum view count (%d/%d)' % (video_title, view_count, max_views) -        age_limit = self.params.get('age_limit') -        if age_limit is not None: -            actual_age_limit = info_dict.get('age_limit') -            if actual_age_limit is None: -                actual_age_limit = 0 -            if age_limit < actual_age_limit: -                return 'Skipping "' + title + '" because it is age restricted' +        if age_restricted(info_dict.get('age_limit'), self.params.get('age_limit')): +            return 'Skipping "%s" because it is age restricted' % title          if self.in_download_archive(info_dict):              return '%s has already been recorded in archive' % video_title          return None | 
