From 8297acceb01f43e07ae5ddf4d376583d03b49d58 Mon Sep 17 00:00:00 2001 From: cantandwont <52587695+cantandwont@users.noreply.github.com> Date: Sun, 28 Jul 2019 15:27:24 +1000 Subject: [PATCH 1/3] Clarify batch file ERROR: message Adding the name of the file which couldn't be read & a brief description of the option. Just "ERROR: batch file could not be read" can be confusing for users who are inexperienced (and likely using Windows). eg. https://www.reddit.com/r/Piracy/comments/cfl0ap/youtubedl_error_batch_file_could_not_be_read_how/ (The user specified option -audio-file, instead of --audio-file) --- youtube_dl/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 165c975dd..541d999f4 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -94,7 +94,7 @@ def _real_main(argv=None): if opts.verbose: write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n') except IOError: - sys.exit('ERROR: batch file could not be read') + sys.exit('ERROR: Batch URL file %r could not be read\t(-a, --batch-file FILE) [File containing URLs to download]' % opts.batchfile) all_urls = batch_urls + [url.strip() for url in args] # batch_urls are already striped in read_batch_urls _enc = preferredencoding() all_urls = [url.decode(_enc, 'ignore') if isinstance(url, bytes) else url for url in all_urls] From db039452dc1ec5abdb73a1bfb0b2c725b6b03311 Mon Sep 17 00:00:00 2001 From: cantandwont <52587695+cantandwont@users.noreply.github.com> Date: Thu, 1 Aug 2019 00:42:42 +1000 Subject: [PATCH 2/3] Update __init__.py Removed mess --- youtube_dl/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 541d999f4..a5aef43dc 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -94,7 +94,7 @@ def _real_main(argv=None): if opts.verbose: write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n') except IOError: - sys.exit('ERROR: Batch URL file %r could not be read\t(-a, --batch-file FILE) [File containing URLs to download]' % opts.batchfile) + sys.exit('ERROR: Batch file %r could not be read' % opts.batchfile) all_urls = batch_urls + [url.strip() for url in args] # batch_urls are already striped in read_batch_urls _enc = preferredencoding() all_urls = [url.decode(_enc, 'ignore') if isinstance(url, bytes) else url for url in all_urls] From 1f3a4556d2c8adbb721508d8d64152b9b53bf0a3 Mon Sep 17 00:00:00 2001 From: Sergey M Date: Thu, 1 Aug 2019 03:53:27 +0700 Subject: [PATCH 3/3] Update __init__.py --- youtube_dl/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index a5aef43dc..9a659fc65 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -94,7 +94,7 @@ def _real_main(argv=None): if opts.verbose: write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n') except IOError: - sys.exit('ERROR: Batch file %r could not be read' % opts.batchfile) + sys.exit('ERROR: batch file %s could not be read' % opts.batchfile) all_urls = batch_urls + [url.strip() for url in args] # batch_urls are already striped in read_batch_urls _enc = preferredencoding() all_urls = [url.decode(_enc, 'ignore') if isinstance(url, bytes) else url for url in all_urls]