xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

bugfixes and enabling older wallets to be found and listed

Browse Source
This commit is contained in:
Philip Sargent
2022-09-22 22:41:42 +03:00
parent af88cb4d0f
commit aa20692ad6
4 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
parsers/scans.py
View File

@@ -100,25 +100,32 @@ def load_all_scans():
for walletname, fpath, fisdir in GetListDir(settings.SCANS_ROOT):
if not fisdir:
continue
# do the year folders
if re.match(r"\d\d\d\d$", walletname):
print(f"{walletname}", end=' ')
for walletname, fpath, fisdir in GetListDir(fpath):
if fisdir:
wallet = Wallet(fpath=fpath, walletname=walletname)
# this is where we should load the contents.json for people, cave and date so we can report on them later
# this is where we should record the year explicitly
# line 347 of view/uploads.py and needs refactoring for loading contentsjson
CheckEmptyDate(wallet)
CheckEmptyPeople(wallet)
wallet.save()
LoadListScansFile(wallet)
else:
# but We *should* load all the scans, even for nonstandard names.
print(f'\n - IGNORE {walletname} - {fpath}')
for walletname, fpath, fisdir in GetListDir(fpath):
if fisdir:
wallet = Wallet(fpath=fpath, walletname=walletname)
# this is where we should record the year explicitly
# line 347 of view/uploads.py and needs refactoring for loading contentsjson
CheckEmptyDate(wallet)
CheckEmptyPeople(wallet)
wallet.save()
LoadListScansFile(wallet)
# # do the year folders
# if re.match(r"\d\d\d\d$", walletname):
# print(f"{walletname}", end=' ')
# for walletname, fpath, fisdir in GetListDir(fpath):
# if fisdir:
# wallet = Wallet(fpath=fpath, walletname=walletname)
# # this is where we should record the year explicitly
# # line 347 of view/uploads.py and needs refactoring for loading contentsjson
# CheckEmptyDate(wallet)
# CheckEmptyPeople(wallet)
# wallet.save()
# LoadListScansFile(wallet)
# else:
# # but We *should* load all the scans, even for nonstandard names.
# print(f'\n - IGNORE {walletname} - {fpath}')
# but we also need to check if JSON exists, even if there are no uploaded scan files
contents_path = Path(settings.DRAWINGS_DATA, "walletjson")