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

wallets subfolders fiddling

Browse Source
This commit is contained in:
Philip Sargent 2024-08-11 15:19:59 +03:00
parent e64cb212c1
commit 74ce8894d2
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/models/wallets.py
View File

@ -148,18 +148,36 @@ class Wallet(models.Model):
if hasattr(self, "JSONdata"): if hasattr(self, "JSONdata"):
return self.JSONdata return self.JSONdata
scans_path = Path(settings.SCANS_ROOT)
# :drawings: walletjson/2022/2022#01/contents.json # :drawings: walletjson/2022/2022#01/contents.json
# fpath = /mnt/d/EXPO/expofiles/surveyscans/1999/1999#02 # fpath = /mnt/d/EXPO/expofiles/surveyscans/1999/1999#02
# This does not work if there are subdirectories in the surveyscan folder # This does not work if there are subdirectories in the surveyscan folder
fp = Path(self.fpath) fp = Path(self.fpath)
wname = fp.name if fp.name in archaic_wallets:
wyear = fp.parent.name return None
try: if fp.parent.parent.parent.parent == scans_path:
y = int(wyear) print(f" ! ", end="")
except: if fp.parent.parent.parent.parent.parent == scans_path:
message = f"! Subfolder detected?:\n {wyear=} (should be eg. '2023')\n {wname=} \n {self.fpath=}" print(f" !! ", end="")
print(message)
if fp.parent.parent.parent.parent == scans_path:
subfolder = fp.parent.name
wname = fp.parent.parent.name
wyear = fp.parent.parent.parent.name
print(f"\n - Subfolder {subfolder} one deep, detected in {wname}")
else:
wname = fp.name
wyear = fp.parent.name
try:
y = int(wyear)
except:
message = f"\n! 2 or more deep subfolder detected?:\n {fp.parent.name=}\n {fp.name=} \n {self.fpath=}"
print(message)
# this is a hack, work down from /surveyscans instead. To be fixed
wname = fp.parent.parent.parent.name
wyear = fp.parent.parent.parent.parent.name
wurl = self.get_url() wurl = self.get_url()
if len(wyear) != 4 or len(wname) !=6: if len(wyear) != 4 or len(wname) !=6:

13
parsers/scans.py
View File

@ -85,15 +85,15 @@ def load_all_scans():
seen = [] seen = []
c = 0 c = 0
wallets = {} wallets = {}
for p in scans_path.rglob("*"): for p in scans_path.rglob("*"): # this implicitly ignoires empty folders as it looks only for files
if p.is_file(): if p.is_file():
if p.suffix.lower() not in valids and p.name.lower() not in validnames: # if p.suffix.lower() not in valids and p.name.lower() not in validnames:
# # we do not care how the files are called. Many have no suffices at all.
# print(f"'{p}'", end='\n') # print(f"'{p}'", end='\n')
pass # pass
elif p.parent == scans_path: # skip files directly in /surveyscans/ if p.parent == scans_path: # skip files directly in /surveyscans/
pass pass
else: else:
c += 1 c += 1
if c % 15 == 0: if c % 15 == 0:
print(".", end="") print(".", end="")
@ -101,6 +101,7 @@ def load_all_scans():
print("\n ", end="") print("\n ", end="")
if p.parent.parent.parent.parent == scans_path: if p.parent.parent.parent.parent == scans_path:
# the wallet has subfolders, which we are uninterested in at this point.
# print(f"too deep {p}", end='\n') # print(f"too deep {p}", end='\n')
fpath = p.parent.parent fpath = p.parent.parent
walletname = p.parent.parent.name # wallet is one level higher walletname = p.parent.parent.name # wallet is one level higher
@ -167,7 +168,7 @@ def load_all_scans():
) )
print(f"\n - found another {wjson:,} JSON files, making a total of {len(wallets):,} wallets") print(f"\n - found another {wjson:,} JSON files, making a total of {len(wallets):,} wallets")
# Only the 1999 wallets have filenames which mean that the walletyear will be unset: # Only the 1999 wallets have filepaths which would mean that the walletyear will be unset:
wallets = Wallet.objects.filter(walletyear=None) wallets = Wallet.objects.filter(walletyear=None)
for w in wallets: for w in wallets:
w.walletyear = datetime.date(1999, 1, 1) w.walletyear = datetime.date(1999, 1, 1)