diff options
| -rw-r--r-- | core/models/caves.py | 16 | ||||
| -rw-r--r-- | core/models/wallets.py | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/core/models/caves.py b/core/models/caves.py index 45a7b5e..2914e1e 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -53,18 +53,10 @@ class CaveAndEntrance(models.Model): def get_cave_leniently(caveid): - try: - c = getCave(caveid) - if c: - return c - except: - # print(f"get_cave_leniently FAIL {caveid}") - try: - c = getCave("1623-"+caveid) - if c: - return c - except: - return None + Gcavelookup = GetCaveLookup() + if caveid in Gcavelookup: + return Gcavelookup[caveid] + class Cave(TroggleModel): # (far) too much here perhaps, diff --git a/core/models/wallets.py b/core/models/wallets.py index 288608a..4474aee 100644 --- a/core/models/wallets.py +++ b/core/models/wallets.py @@ -245,13 +245,21 @@ class Wallet(models.Model): return None #cavelist = jsondata["cave"] cavelist = Wallet.input_to_list(jsondata["cave"]) + from troggle.core.models.troggle import DataIssue for i in cavelist: + if not i: + continue + #print(f"Attempting adding cave '{i}' to wallet {self} ") try: - caveobject = get_cave_leniently(i) + caveobject = get_cave_leniently(i.strip()) + print(f"Attempting adding cave '{caveobject}' to wallet {self} ") if caveobject: self.caves.add(caveobject) except: - print(f"FAIL adding cave to wallet.caves '{i}'") + message = f"FAIL adding cave {caveobject} to wallet.caves '{i}'" + + DataIssue.objects.update_or_create(parser="wallets", message=message, url=wurl) + print(message) pass def year(self): |