From 2d30509fc893f58cac77c25134a246ed9d76e7ed Mon Sep 17 00:00:00 2001 From: pukkandan Date: Thu, 5 Nov 2020 23:13:21 +0530 Subject: [PATCH] Add --force-download-archive by by h-h-h-h Authored-by: h-h-h-h --- README.md | 4 ++++ test/parameters.json | 1 + youtube_dlc/YoutubeDL.py | 12 ++++++++++-- youtube_dlc/__init__.py | 1 + youtube_dlc/options.py | 9 +++++++-- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f46c65dff..04ad40f1a 100644 --- a/README.md +++ b/README.md @@ -353,6 +353,10 @@ ## Verbosity / Simulation Options: playlist information in a single line. --print-json Be quiet and print the video information as JSON (video is still being downloaded). + --force-write-archive Force download archive entries to be written + as far as no errors occur, even if -s or + another simulation switch is used. + (Same as --force-download-archive) --newline Output progress bar as new lines --no-progress Do not print progress bar --console-title Display progress in console titlebar diff --git a/test/parameters.json b/test/parameters.json index 76c2a9ae7..f8abed2dd 100644 --- a/test/parameters.json +++ b/test/parameters.json @@ -7,6 +7,7 @@ "forcethumbnail": false, "forcetitle": false, "forceurl": false, + "force_write_download_archive": false, "format": "best", "ignoreerrors": false, "listformats": null, diff --git a/youtube_dlc/YoutubeDL.py b/youtube_dlc/YoutubeDL.py index 97e4f451f..8fe608fc9 100644 --- a/youtube_dlc/YoutubeDL.py +++ b/youtube_dlc/YoutubeDL.py @@ -166,6 +166,8 @@ class YoutubeDL(object): forcejson: Force printing info_dict as JSON. dump_single_json: Force printing the info_dict of the whole playlist (or video) as a single JSON line. + force_write_download_archive: Force writing download archive regardless of + 'skip_download' or 'simulate'. simulate: Do not download the video files. format: Video format code. see "FORMAT SELECTION" for more details. format_sort: How to sort the video formats. see "Sorting Formats" for more details. @@ -1856,8 +1858,11 @@ def process_info(self, info_dict): # Forced printings self.__forced_printings(info_dict, filename, incomplete=False) - # Do nothing else if in simulate mode if self.params.get('simulate', False): + if self.params.get('force_write_download_archive', False): + self.record_download_archive(info_dict) + + # Do nothing else if in simulate mode return if filename is None: @@ -2188,7 +2193,10 @@ def compatible_formats(formats): except (PostProcessingError) as err: self.report_error('postprocessing: %s' % str(err)) return - self.record_download_archive(info_dict) + must_record_download_archive = True + + if must_record_download_archive or self.params.get('force_write_download_archive', False): + self.record_download_archive(info_dict) def download(self, url_list): """Download a given list of URLs.""" diff --git a/youtube_dlc/__init__.py b/youtube_dlc/__init__.py index d183016b6..4f57ac6a8 100644 --- a/youtube_dlc/__init__.py +++ b/youtube_dlc/__init__.py @@ -349,6 +349,7 @@ def parse_retries(retries): 'forceformat': opts.getformat, 'forcejson': opts.dumpjson or opts.print_json, 'dump_single_json': opts.dump_single_json, + 'force_write_download_archive': opts.force_write_download_archive, 'simulate': opts.simulate or any_getting, 'skip_download': opts.skip_download, 'format': opts.format, diff --git a/youtube_dlc/options.py b/youtube_dlc/options.py index bd85abd3a..e85006a87 100644 --- a/youtube_dlc/options.py +++ b/youtube_dlc/options.py @@ -682,8 +682,13 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser): verbosity.add_option( '--print-json', action='store_true', dest='print_json', default=False, - help='Be quiet and print the video information as JSON (video is still being downloaded).', - ) + help='Be quiet and print the video information as JSON (video is still being downloaded).') + verbosity.add_option( + '--force-write-download-archive', '--force-write-archive', '--force-download-archive', + action='store_true', dest='force_write_download_archive', default=False, + help=( + 'Force download archive entries to be written as far as no errors occur,' + 'even if -s or another simulation switch is used.')) verbosity.add_option( '--newline', action='store_true', dest='progress_with_newline', default=False,