From 175e71facf74ad91347eb9c7a6865a13b8a3cd09 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Fri, 3 Feb 2023 22:19:51 +0000 Subject: Many many bugs fixed for >1 svx file on a wallet --- core/models/wallets.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/models/wallets.py') diff --git a/core/models/wallets.py b/core/models/wallets.py index 931a1fc..551e3e1 100644 --- a/core/models/wallets.py +++ b/core/models/wallets.py @@ -32,7 +32,8 @@ class Wallet(models.Model): return urljoin(settings.URL_ROOT, reverse("singlewallet", kwargs={"path": re.sub("#", "%23", self.walletname)})) def get_json(self): - """Read the JSON file for the wallet and do stuff""" + """Read the JSON file for the wallet and do stuff + Do it every time it is queried, to be sure the result is fresh""" # jsonfile = Path(self.fpath, 'contents.json') # Get from git repo instead @@ -102,9 +103,8 @@ class Wallet(models.Model): """Reads all the JSON data just to get the JSON date.""" if self.walletdate: return self.walletdate - if not self.get_json(): + if not (jsondata := self.get_json()): # WALRUS return None - jsondata = self.get_json() # use walrus operator? datestr = jsondata["date"] if not datestr: @@ -259,7 +259,7 @@ class Wallet(models.Model): ticks["N"] = "red" else: ticks["N"] = "green" - print(f"{self.walletname} {ticks['N'].upper()} {notes_scanned=} {notes_required=} {waldata['notes not required']=}") + # print(f"{self.walletname} {ticks['N'].upper()} {notes_scanned=} {notes_required=} {waldata['notes not required']=}") # Plan drawing required plan_scanned = reduce(operator.or_, [f.startswith("plan") for f in files], False) -- cgit v1.2.3