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

pending caves aliases stuff

Browse Source
This commit is contained in:
Philip Sargent 2023-09-26 19:44:06 +03:00
parent 51dbf5e9e6
commit 505eb6475e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/models/caves.py
View File

@ -641,7 +641,6 @@ def GetCaveLookup():
("fishface", "1623-290"), ("fishface", "1623-290"),
("gsh", "1623-291"), ("gsh", "1623-291"),
("tempest", "1623-2023-lc-01"), ("tempest", "1623-2023-lc-01"),
("loveshack", "2023-pb-01"),
("1623-2023-kt-02", "2023-kt-02"), ("1623-2023-kt-02", "2023-kt-02"),
#("1623-2023-jss-01", "2023-jss-01"), #("1623-2023-jss-01", "2023-jss-01"),
@ -653,7 +652,9 @@ def GetCaveLookup():
("heimkommen", "2018-dm-07"), ("heimkommen", "2018-dm-07"),
("Heimkehr", "2018-dm-07"), ("Heimkehr", "2018-dm-07"),
("hc", "2018-dm-07"), ("hc", "2018-dm-07"),
("loveshack", "1626-2018-ad-03"),
("crushed-garlic", "1626-2018-ad-03"),
] ]
for key, alias in aliases: for key, alias in aliases:

6
core/views/scans.py
View File

@ -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, # Historic wallets used just 2 or 3 digits and were all 1623 area. So, just for these wallets,
# assume it is 1623-xxx # assume it is 1623-xxx
if f"1623-{id}" in Gcavelookup: if f"1623-{id}" in Gcavelookup:
print(f" - Should modify wallet {wallet} to us 1623- prefix for cave <{id}>") print(f" - Should modify wallet {wallet} to use 1623- prefix for cave <{id}>")
Gcavelookup[id] = Gcavelookup[f"1623-{id}"] # restoring ambiguous alias Gcavelookup[id] = Gcavelookup[f"1623-{id}"] # restoring an ambiguous alias, BAD idea.
return True return True
else: else:
print(f" - Wallet {wallet} Failed to find cave object from id <{id}>") print(f" - Wallet {wallet} Failed to find cave object from id <{id}>")
if id.lower() != "unknown" and 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}>") add_cave_to_pending_list(id, wallet, f"Wallet {wallet} - Could not find id <{id}>")
return False return False