projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[test/test_socks] Add tests for SOCKS proxies
[youtube-dl]
/
youtube_dl
/
__init__.py
diff --git
a/youtube_dl/__init__.py
b/youtube_dl/__init__.py
index 737f6545d4136401dd3d8ddd691ad52e86894bb0..cbd84c3af329b51a72eb235a40e102bdd83bde6d 100644
(file)
--- a/
youtube_dl/__init__.py
+++ b/
youtube_dl/__init__.py
@@
-86,7
+86,9
@@
def _real_main(argv=None):
if opts.batchfile == '-':
batchfd = sys.stdin
else:
if opts.batchfile == '-':
batchfd = sys.stdin
else:
- batchfd = io.open(opts.batchfile, 'r', encoding='utf-8', errors='ignore')
+ batchfd = io.open(
+ compat_expanduser(opts.batchfile),
+ 'r', encoding='utf-8', errors='ignore')
batch_urls = read_batch_urls(batchfd)
if opts.verbose:
write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n')
batch_urls = read_batch_urls(batchfd)
if opts.verbose:
write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n')
@@
-404,7
+406,7
@@
def _real_main(argv=None):
try:
if opts.load_info_filename is not None:
try:
if opts.load_info_filename is not None:
- retcode = ydl.download_with_info_file(
opts.load_info_filename
)
+ retcode = ydl.download_with_info_file(
compat_expanduser(opts.load_info_filename)
)
else:
retcode = ydl.download(all_urls)
except MaxDownloadsReached:
else:
retcode = ydl.download(all_urls)
except MaxDownloadsReached: