expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-26 01:01:53 +00:00
Code Issues 19 Projects 3 Activity

better fix for variant date formats

Browse Source
This commit is contained in:
Philip Sargent 2023-07-25 01:33:58 +03:00
parent 748cb91a20
commit 3c78ab79ca
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/models/wallets.py
View File

@ -21,6 +21,7 @@ def make_valid_date(date):
datestr = date.replace(".", "-") datestr = date.replace(".", "-")
try: try:
samedate = datetime.date.fromisoformat(datestr) samedate = datetime.date.fromisoformat(datestr)
return samedate
except ValueError: except ValueError:
# Could be in std euro format e.g. 14/07/2023 # Could be in std euro format e.g. 14/07/2023
match = re.search(r'(\d{1,2})/(\d{1,2})/(\d{2,4})', datestr) match = re.search(r'(\d{1,2})/(\d{1,2})/(\d{2,4})', datestr)
@ -37,19 +38,22 @@ def make_valid_date(date):
except: except:
print(f"! - Fail, tried to decompose date in dd/mm/yyyy format but failed: {datestr=} ") print(f"! - Fail, tried to decompose date in dd/mm/yyyy format but failed: {datestr=} ")
return None return None
# probably a single digit day number. HACKUS MAXIMUS. # probably a single digit day number or month number
datestr = datestr[:-1] + "0" + datestr[-1] match = re.search(r'(\d{4})-(\d{1,2})-(\d{1,2})', datestr)
# datestr = f"{datestr:02d}" if match:
print(f"! - ValueError, trying.. {datestr=} ") y = int(match.group(1))
m = int(match.group(2))
d = int(match.group(3))
try: try:
samedate = datetime.date.fromisoformat(datestr) samedate = datetime.date(y, m, d)
except: print(f"- - Warning, 1 digit only for month or day '{datestr=}' but we coped: {samedate.isoformat()} ")
try:
samedate = datetime.date.fromisoformat(datestr[:10])
except:
print(f"! - ValueError, FAILED {datestr=} ")
samedate = None
return samedate return samedate
except:
print(f"! - Fail, tried to decompose date in yyyy-mm-d or yyy-m-dd format but failed: {datestr=} ")
return None
print(f"! - Failed to understand date, none of our tricks worked {datestr=} ")
return None
class Wallet(models.Model): class Wallet(models.Model):
"""We do not keep the JSON values in the database, we query them afresh each time, """We do not keep the JSON values in the database, we query them afresh each time,