george/borg-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check that day doesn't exceed valid month range

Browse Source
This commit is contained in:
George Lacey 2021-05-30 05:00:14 +01:00
parent eabbf34fc3
commit d2ddf086ee
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
borgweb/borg/utility/time.py
View File

@ -51,9 +51,23 @@ def subtract_months(p_date: datetime, offset):
if new_date.month <= offset: if new_date.month <= offset:
offset -= new_date.month offset -= new_date.month
return new_date.replace(month=12 - offset, year=new_date.year - 1)
year = new_date.year - 1
month = 12 - offset
last_day = calendar.monthrange(year, month)[1]
if new_date.day > last_day:
new_date = new_date.replace(day=last_day)
return new_date.replace(month=month, year=year)
else: else:
return new_date.replace(month=new_date.month - months) year = new_date.year
month = new_date.month - months
last_day = calendar.monthrange(year, month)[1]
if new_date.day > last_day:
new_date = new_date.replace(day=last_day)
return new_date.replace(month=month)
def last_day_previous_months(months_ago: int): def last_day_previous_months(months_ago: int):