Files
cura-te-ipsum/curateipsum/cli.py
T
fd613edad0 Correct retention before enabling automatic deletion (#8)
* Correct retention before enabling automatic deletion

- Compute each retention tier's kept set independently from its own
  name range and union them, instead of carrying a single 'previous
  backup' comparison across tier boundaries - that carry-over was the
  actual cause of bug #32 (a coarser tier could evict a backup a finer
  tier, or the always-keep-latest rule, had already decided to retain)
- Group weekly retention by (ISO year, ISO week) instead of ISO week
  number alone, fixing bug #33 (same week number in different years,
  or late-December dates that belong to next year's ISO week 1, were
  treated as duplicates/collisions)
- Validate the computed retention plan (latest snapshot present, no
  phantom entries) before deleting anything
- Fix cli.py to run initiate_backup before cleanup_old_backups, and
  skip cleanup entirely if the backup raised - retention must only run
  once a new snapshot is durable and complete, and a failed backup must
  never trigger deletion of history
- Quarantine (rename) a deletion candidate before recursively removing
  it, reusing the already-hardened stale-staging-dir cleanup to finish
  the job if the process crashes mid-delete
- Remove both retention xfail markers (bugs #32, #33) now that the
  tests they guarded pass; update pre-existing tests whose expectations
  encoded the old bug (deleting the latest snapshot when it collided
  with the next-newest one in a coarser bucket)

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* Address Copilot review: replace asserts with runtime checks, don't swallow quarantine-delete failures

- Retention-plan validation now raises BackupFailedError instead of
  using assert, which python -O would silently strip ahead of a
  destructive operation
- _quarantine_and_delete no longer passes ignore_errors=True to
  rmtree; a removal failure is now logged with the quarantine path so
  operators can find and retry it, instead of silently leaving a
  hidden directory consuming space

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

---------

Co-authored-by: Maxim Shulga <maxim.shulga@alludo.com>
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-03 22:47:43 +00:00

137 lines
4.8 KiB
Python
Executable File

#!/usr/bin/env python
import argparse
import logging
import os.path
import shutil
import sys
import time
from datetime import timedelta
from curateipsum import backup
from curateipsum._version import version
_lg = logging.getLogger("curateipsum")
SUPPORTED_PLATFORMS = ("linux", "darwin")
def main():
formatter = logging.Formatter("{asctime}|{levelname}|{message}", style="{")
console_handler = logging.StreamHandler()
console_handler.setFormatter(formatter)
parser = argparse.ArgumentParser(
prog="cura-te-ipsum",
description="cura-te-ipsum, my personal backup software.",
)
parser.add_argument("-V", "--version",
action="version",
version=f"%(prog)s v{version}")
parser.add_argument("-v", "--verbose",
action="store_true",
default=False,
help="print verbose information")
parser.add_argument("-b",
dest="backups_dir",
metavar="BACKUPS_DIR",
type=str,
required=True,
help="directory, where all backups will be stored")
parser.add_argument("-n", "--dry-run",
action="store_true",
default=False,
help="Do not do create backup")
parser.add_argument("-f", "--force",
action="store_true",
default=False,
help="Wait for previous backup to finish instead of "
"exiting immediately if one is still running")
parser.add_argument("--external-rsync",
action="store_true",
default=False,
help="Use external rsync for copying")
parser.add_argument("--external-hardlink",
action="store_true",
default=False,
help="Use cp command for creating hardlink copies")
parser.add_argument("sources",
nargs="+",
metavar="SOURCE",
type=str,
help="backup source (file/dir/smth else)")
args = parser.parse_args()
loglevel = logging.DEBUG if args.verbose else logging.INFO
logging.basicConfig(level=loglevel, handlers=[console_handler])
_lg.info("Starting %s: %s", parser.prog, args)
if sys.platform not in SUPPORTED_PLATFORMS:
_lg.error("Not supported platform: %s. Supported platforms: %s",
sys.platform, SUPPORTED_PLATFORMS)
return 1
if args.external_rsync and not shutil.which("rsync"):
_lg.error("rsync should be installed to use --external-rsync option.")
return 1
cp_program = "gcp" if sys.platform == "darwin" else "cp"
if args.external_hardlink and not shutil.which(cp_program):
_lg.error("%s should be installed to use --external-hardlink option.",
cp_program)
return 1
backups_dir_abs = os.path.abspath(args.backups_dir)
if not os.path.isdir(backups_dir_abs):
_lg.error("Backup directory %s does not exist, exiting",
args.backups_dir)
return 1
for src_dir in args.sources:
if not os.path.isdir(src_dir):
_lg.error("Source directory %s does not exist", src_dir)
return 1
try:
backup.validate_topology(args.sources, backups_dir_abs)
except backup.BackupFailedError as err:
_lg.error("Unsafe source/backups layout: %s", err)
return 1
start_time = time.time()
if not backup.set_backups_lock(backups_dir_abs, args.force):
return 1
exit_code = 0
try:
# Retention deletes old snapshots, so it must only run once the
# new snapshot is durable and complete - never before, and never
# if the backup below raised. Running it first (or unconditionally
# after a failure) would let a failed backup destroy history
# that a successful one would have covered.
backup.initiate_backup(
sources=args.sources,
backups_dir=backups_dir_abs,
dry_run=args.dry_run,
external_rsync=args.external_rsync,
external_hardlink=args.external_hardlink,
)
backup.cleanup_old_backups(backups_dir=backups_dir_abs,
dry_run=args.dry_run)
except backup.BackupFailedError as err:
_lg.error("Backup failed: %s", err)
exit_code = 1
finally:
backup.release_backups_lock(backups_dir_abs)
end_time = time.time()
spent_time = end_time - start_time
_lg.info("Finished, time spent: %s", str(timedelta(seconds=spent_time)))
return exit_code
if __name__ == "__main__":
sys.exit(main())