Make -a understand dash means stdin
This commit is contained in:
parent
787f2a5d95
commit
2a7353b87a
1 changed files with 7 additions and 3 deletions
|
@ -2010,7 +2010,7 @@ if __name__ == '__main__':
|
|||
filesystem.add_option('-o', '--output',
|
||||
dest='outtmpl', metavar='TPL', help='output filename template')
|
||||
filesystem.add_option('-a', '--batch-file',
|
||||
dest='batchfile', metavar='F', help='file containing URLs to download')
|
||||
dest='batchfile', metavar='F', help='file containing URLs to download (\'-\' for stdin)')
|
||||
filesystem.add_option('-w', '--no-overwrites',
|
||||
action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
|
||||
filesystem.add_option('-c', '--continue',
|
||||
|
@ -2023,7 +2023,11 @@ if __name__ == '__main__':
|
|||
batchurls = []
|
||||
if opts.batchfile is not None:
|
||||
try:
|
||||
batchurls = open(opts.batchfile, 'r').readlines()
|
||||
if opts.batchfile == '-':
|
||||
batchfd = sys.stdin
|
||||
else:
|
||||
batchfd = open(opts.batchfile, 'r')
|
||||
batchurls = batchfd.readlines()
|
||||
batchurls = [x.strip() for x in batchurls]
|
||||
batchurls = [x for x in batchurls if len(x) > 0]
|
||||
except IOError:
|
||||
|
|
Loading…
Reference in a new issue