w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Preliminary implementation of configuration files

Browse source
This commit is contained in:
Philipp Hagemeister 2011-11-28 01:29:46 +01:00
parent 31a2ec2d88
commit c379c181e0
2 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
youtube-dl
View file

@ -702,9 +702,9 @@ class FileDownloader(object):
def process_info(self, info_dict): def process_info(self, info_dict):
"""Process a single dictionary returned by an InfoExtractor.""" """Process a single dictionary returned by an InfoExtractor."""
max_downloads = int(self.params.get('max_downloads')) max_downloads = self.params.get('max_downloads')
if max_downloads is not None: if max_downloads is not None:
if self._num_downloads > max_downloads: if self._num_downloads > int(max_downloads):
self.to_screen(u'[download] Maximum number of downloads reached. Skipping ' + info_dict['title']) self.to_screen(u'[download] Maximum number of downloads reached. Skipping ' + info_dict['title'])
return return
@ -3924,6 +3924,20 @@ def parseOpts():
# Deferred imports # Deferred imports
import getpass import getpass
import optparse import optparse
import shlex
def _readOptions(filename):
try:
optionf = open(filename)
except IOError:
return [] # silently skip if file is not present
try:
res = []
for l in optionf:
res += shlex.split(l, comments=True)
finally:
optionf.close()
return res
def _format_option_string(option): def _format_option_string(option):
''' ('-o', '--option') -> -o, --format METAVAR''' ''' ('-o', '--option') -> -o, --format METAVAR'''
@ -4104,7 +4118,8 @@ def parseOpts():
parser.add_option_group(authentication) parser.add_option_group(authentication)
parser.add_option_group(postproc) parser.add_option_group(postproc)
opts, args = parser.parse_args() argv = _readOptions('/etc/youtube-dl.conf') + _readOptions(os.path.expanduser('~/.youtube-dl.conf')) + sys.argv[1:]
opts, args = parser.parse_args(argv)
return parser, opts, args return parser, opts, args
@ -4274,7 +4289,7 @@ def _real_main():
'writeinfojson': opts.writeinfojson, 'writeinfojson': opts.writeinfojson,
'matchtitle': opts.matchtitle, 'matchtitle': opts.matchtitle,
'rejecttitle': opts.rejecttitle, 'rejecttitle': opts.rejecttitle,
'max_downloads': int(opts.max_downloads), 'max_downloads': opts.max_downloads,
}) })
for extractor in extractors: for extractor in extractors:
fd.add_info_extractor(extractor) fd.add_info_extractor(extractor)

23
youtube_dl/__init__.py
View file

@ -702,9 +702,9 @@ class FileDownloader(object):
def process_info(self, info_dict): def process_info(self, info_dict):
"""Process a single dictionary returned by an InfoExtractor.""" """Process a single dictionary returned by an InfoExtractor."""
max_downloads = int(self.params.get('max_downloads')) max_downloads = self.params.get('max_downloads')
if max_downloads is not None: if max_downloads is not None:
if self._num_downloads > max_downloads: if self._num_downloads > int(max_downloads):
self.to_screen(u'[download] Maximum number of downloads reached. Skipping ' + info_dict['title']) self.to_screen(u'[download] Maximum number of downloads reached. Skipping ' + info_dict['title'])
return return
@ -3924,6 +3924,20 @@ def parseOpts():
# Deferred imports # Deferred imports
import getpass import getpass
import optparse import optparse
import shlex
def _readOptions(filename):
try:
optionf = open(filename)
except IOError:
return [] # silently skip if file is not present
try:
res = []
for l in optionf:
res += shlex.split(l, comments=True)
finally:
optionf.close()
return res
def _format_option_string(option): def _format_option_string(option):
''' ('-o', '--option') -> -o, --format METAVAR''' ''' ('-o', '--option') -> -o, --format METAVAR'''
@ -4104,7 +4118,8 @@ def parseOpts():
parser.add_option_group(authentication) parser.add_option_group(authentication)
parser.add_option_group(postproc) parser.add_option_group(postproc)
opts, args = parser.parse_args() argv = _readOptions('/etc/youtube-dl.conf') + _readOptions(os.path.expanduser('~/.youtube-dl.conf')) + sys.argv[1:]
opts, args = parser.parse_args(argv)
return parser, opts, args return parser, opts, args
@ -4274,7 +4289,7 @@ def _real_main():
'writeinfojson': opts.writeinfojson, 'writeinfojson': opts.writeinfojson,
'matchtitle': opts.matchtitle, 'matchtitle': opts.matchtitle,
'rejecttitle': opts.rejecttitle, 'rejecttitle': opts.rejecttitle,
'max_downloads': int(opts.max_downloads), 'max_downloads': opts.max_downloads,
}) })
for extractor in extractors: for extractor in extractors:
fd.add_info_extractor(extractor) fd.add_info_extractor(extractor)