From c210992a7adbec633f8ce8223b6290e112f0e734 Mon Sep 17 00:00:00 2001 From: Eden Zhang Date: Wed, 15 Jan 2025 21:04:41 +0000 Subject: [PATCH] Linter reformats --- .../clp_package_utils/scripts/archive_manager.py | 10 +++++----- .../scripts/native/archive_manager.py | 14 +++++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py b/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py index a7b802f12..c8cb8e621 100644 --- a/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py +++ b/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py @@ -19,6 +19,7 @@ logger = logging.getLogger(__file__) + def validate_timestamps(begin_ts, end_ts): if begin_ts > end_ts: logger.error("begin-ts must be <= end-ts") @@ -28,14 +29,13 @@ def validate_timestamps(begin_ts, end_ts): return False return True + def main(argv): clp_home = get_clp_home() default_config_file_path = clp_home / CLP_DEFAULT_CONFIG_FILE_RELATIVE_PATH # Top-level parser and options - args_parser = argparse.ArgumentParser( - description="View or delete archives." - ) + args_parser = argparse.ArgumentParser(description="View or delete archives.") args_parser.add_argument( "--config", "-c", @@ -97,7 +97,7 @@ def main(argv): # Delete by ID arguments del_id_parser.add_argument( "ids", - nargs='+', + nargs="+", help="List of archive IDs to delete", ) @@ -143,7 +143,7 @@ def main(argv): return -1 elif "find" == parsed_args.subcommand: - if hasattr(parsed_args, 'end_ts') and parsed_args.end_ts is not None: + if hasattr(parsed_args, "end_ts") and parsed_args.end_ts is not None: # Validate the input timestamp if not validate_timestamps(parsed_args.begin_ts, parsed_args.end_ts): diff --git a/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py b/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py index a9f7055de..a50a34bfd 100644 --- a/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py +++ b/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py @@ -23,9 +23,7 @@ def main(argv): default_config_file_path = clp_home / CLP_DEFAULT_CONFIG_FILE_RELATIVE_PATH # Top-level parser and options - args_parser = argparse.ArgumentParser( - description="View or delete archives." - ) + args_parser = argparse.ArgumentParser(description="View or delete archives.") args_parser.add_argument( "--config", "-c", @@ -87,7 +85,7 @@ def main(argv): # Delete by ID arguments del_id_parser.add_argument( "ids", - nargs='+', + nargs="+", help="List of archive IDs to delete", ) @@ -147,6 +145,7 @@ def main(argv): parsed_args.dry_run, ) + def _find_archives( archives_dir: Path, database_config: Database, @@ -199,6 +198,7 @@ def _find_archives( return 0 + def _delete_archives( archives_dir: Path, database_config: Database, @@ -296,6 +296,7 @@ def _delete_archives( return 0 + def _delete_archives_by_filter( archives_dir: Path, database_config: Database, @@ -323,7 +324,10 @@ def _delete_archives_by_filter( RETURNING id """ - return _delete_archives(archives_dir, database_config, query, [begin_ts, end_ts], "filter", dry_run) + return _delete_archives( + archives_dir, database_config, query, [begin_ts, end_ts], "filter", dry_run + ) + def _delete_archives_by_ids( archives_dir: Path,