diff --git a/example/aitf-clean-temporal b/example/aitf-clean-temporal index 914e0ac9b2b417e0dcd61156e5da08ba845619a4..45cea89a1d3db16c19a9b4935f24d986ad40e422 100755 --- a/example/aitf-clean-temporal +++ b/example/aitf-clean-temporal @@ -21,6 +21,7 @@ import os import sys import logging +import datetime import aitf.ancil import aitf.conlog @@ -58,7 +59,7 @@ def parse_args(): TEMPORAL_INVALID = "not specified filler noise" TEMPORAL_CACHE_ENV = 'CSPP_GEO_AITF_TEMPORAL_CACHE' TEMPORAL_DEFAULT = os.environ.get(TEMPORAL_CACHE_ENV, TEMPORAL_INVALID) - ap.add_argument("temporal-dir", metavar = "DIR", nargs='?', + ap.add_argument("temporal_dir", metavar = "DIR", nargs='?', help = f'temporal directory to clean (default: environment variable {TEMPORAL_CACHE_ENV}', default=TEMPORAL_DEFAULT) @@ -104,19 +105,17 @@ def main(): else: log_download_report = no_cleanup_report - if not args.keep_old: - from datetime import datetime - stats = csppfetch.CleaningStats() - with PIDLockFile(args.temporal_dir+"cleaning-process.pid") as has_lock: - if has_lock: - csppfetch.delete_old_files(args.temporal_dir+"/L1b", args.oldest, stats) - csppfetch.delete_old_files(args.temporal_dir+"/L2", args.oldest, stats) - if args.want_summary: - sys.stdout.write('Expiring Old Data Summary\n') - sys.stdout.write(f' Removed {stats.num_deleted} files totaling {stats.size_deleted} bytes\n') - sys.stdout.write(f' Kept {stats.num_kept} files totaling {stats.size_kept} bytes\n') - else: # No lock - sys.stdout.write("Cleaning skipped; another process is already doing so.") + stats = csppfetch.CleaningStats() + with PIDLockFile(args.temporal_dir+"cleaning-process.pid") as has_lock: + if has_lock: + csppfetch.delete_old_files(args.temporal_dir+"/L1b", args.oldest, stats) + csppfetch.delete_old_files(args.temporal_dir+"/L2", args.oldest, stats) + if args.want_summary: + sys.stdout.write('Expiring Old Temporal Data Summary\n') + sys.stdout.write(f' Removed {stats.num_deleted} files totaling {stats.size_deleted} bytes\n') + sys.stdout.write(f' Kept {stats.num_kept} files totaling {stats.size_kept} bytes\n') + else: # No lock + sys.stdout.write("Cleaning skipped; another process is already doing so.") return 0