X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube-dl;h=496ae036fa7c98ed3166e0dfb16e857f4efad409;hb=2f11508adadc3a2bc5a7c0549071d114ae109a00;hp=8764acda0592df1c628b0a7d4dceeaa59d2b7394;hpb=a825f0ca83e1bdb12fc6c88377defdfa28156f78;p=youtube-dl.git diff --git a/youtube-dl b/youtube-dl index 8764acda0..496ae036f 100755 --- a/youtube-dl +++ b/youtube-dl @@ -919,7 +919,7 @@ class PostProcessor(object): """Run the PostProcessor. The "information" argument is a dictionary like the ones - returned by InfoExtractors. The only difference is that this + composed by InfoExtractors. The only difference is that this one has an extra field called "filepath" that points to the downloaded file. @@ -997,7 +997,9 @@ if __name__ == '__main__': batchurls = [] if opts.batchfile is not None: try: - batchurls = [line.strip() for line in open(opts.batchfile, 'r')] + batchurls = open(opts.batchfile, 'r').readlines() + batchurls = [x.strip() for x in batchurls] + batchurls = [x for x in batchurls if len(x) > 0] except IOError: sys.exit(u'ERROR: batch file could not be read') all_urls = batchurls + args