From 505eb6475ecd347c833a2fddf23323b65a0b5444 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Tue, 26 Sep 2023 19:44:06 +0300 Subject: [PATCH] pending caves aliases stuff --- core/models/caves.py | 5 +++-- core/views/scans.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/models/caves.py b/core/models/caves.py index cc5dcac..bad3768 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -641,7 +641,6 @@ def GetCaveLookup(): ("fishface", "1623-290"), ("gsh", "1623-291"), ("tempest", "1623-2023-lc-01"), - ("loveshack", "2023-pb-01"), ("1623-2023-kt-02", "2023-kt-02"), #("1623-2023-jss-01", "2023-jss-01"), @@ -653,7 +652,9 @@ def GetCaveLookup(): ("heimkommen", "2018-dm-07"), ("Heimkehr", "2018-dm-07"), ("hc", "2018-dm-07"), - + ("loveshack", "1626-2018-ad-03"), + ("crushed-garlic", "1626-2018-ad-03"), + ] for key, alias in aliases: diff --git a/core/views/scans.py b/core/views/scans.py index 428f8cf..1556c0f 100644 --- a/core/views/scans.py +++ b/core/views/scans.py @@ -97,13 +97,13 @@ def is_cave(wallet, id): # Historic wallets used just 2 or 3 digits and were all 1623 area. So, just for these wallets, # assume it is 1623-xxx if f"1623-{id}" in Gcavelookup: - print(f" - Should modify wallet {wallet} to us 1623- prefix for cave <{id}>") - Gcavelookup[id] = Gcavelookup[f"1623-{id}"] # restoring ambiguous alias + print(f" - Should modify wallet {wallet} to use 1623- prefix for cave <{id}>") + Gcavelookup[id] = Gcavelookup[f"1623-{id}"] # restoring an ambiguous alias, BAD idea. return True else: print(f" - Wallet {wallet} Failed to find cave object from id <{id}>") if id.lower() != "unknown" and id != "": - print(f" - adding <{id}> to pendingcaves.txt list") + print(f" - adding <{id}> to pendingcaves DataIssues") add_cave_to_pending_list(id, wallet, f"Wallet {wallet} - Could not find id <{id}>") return False