external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix display of backups that are past due to be reaped

This commit is contained in:
Joshua Tauberer 2014-10-12 21:31:44 +00:00
parent fb3045f456
commit 048e35a80f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
management/backup.py
View File

@ -25,7 +25,8 @@ def backup_status(env):
# see how large the storage is. # see how large the storage is.
now = datetime.datetime.now(dateutil.tz.tzlocal()) now = datetime.datetime.now(dateutil.tz.tzlocal())
def reldate(date, ref): def reldate(date, ref, clip):
if ref < date: return clip
rd = dateutil.relativedelta.relativedelta(ref, date) rd = dateutil.relativedelta.relativedelta(ref, date)
if rd.months > 1: return "%d months, %d days" % (rd.months, rd.days) if rd.months > 1: return "%d months, %d days" % (rd.months, rd.days)
if rd.months == 1: return "%d month, %d days" % (rd.months, rd.days) if rd.months == 1: return "%d month, %d days" % (rd.months, rd.days)
@ -47,7 +48,7 @@ def backup_status(env):
backups[key] = { backups[key] = {
"date": m.group("date"), "date": m.group("date"),
"date_str": date.strftime("%x %X"), "date_str": date.strftime("%x %X"),
"date_delta": reldate(date, now), "date_delta": reldate(date, now, "the future?"),
"full": m.group("incbase") is None, "full": m.group("incbase") is None,
"previous": m.group("incbase"), "previous": m.group("incbase"),
"size": 0, "size": 0,
@ -80,7 +81,7 @@ def backup_status(env):
deleted_in = None deleted_in = None
elif saw_full and not deleted_in: elif saw_full and not deleted_in:
# Mark deleted_in only on the first increment after a full backup. # Mark deleted_in only on the first increment after a full backup.
deleted_in = reldate(days_ago, dateutil.parser.parse(bak["date"])) deleted_in = reldate(days_ago, dateutil.parser.parse(bak["date"]), "on next daily backup")
bak["deleted_in"] = deleted_in bak["deleted_in"] = deleted_in
return { return {