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

fix bug for wallet with empty fpath

Browse Source
This commit is contained in:
Philip Sargent 2022-10-03 21:18:35 +03:00
parent 4495be2083
commit c8163ab0cd
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/models/survex.py
View File

@ -277,15 +277,23 @@ class Wallet(models.Model):
def get_fnames(self): def get_fnames(self):
'''Filenames without the suffix, i.e. without the ".jpg" '''Filenames without the suffix, i.e. without the ".jpg"
''' '''
dirpath = Path(settings.SCANS_ROOT, self.fpath) dirpath = Path(settings.SCANS_ROOT, self.fpath) # does nowt as fpath is a rooted path already
files = [] files = []
if dirpath.is_dir(): if not self.fpath:
files.append(f"Incorrect path to wallet contents: '{self.fpath}'")
return files
if not dirpath.is_dir():
files.append(f"Incorrect path to wallet contents: '{self.fpath}'")
return files
else:
try: try:
for f in dirpath.iterdir(): for f in dirpath.iterdir():
if f.is_file(): if f.is_file():
if f.name != 'contents.json' and f.name != 'walletindex.html':
files.append(Path(f.name).stem) files.append(Path(f.name).stem)
else:
files.append(f"-{Path(f.name).stem}-")
except FileNotFoundError: except FileNotFoundError:
files.append("FileNotFoundError")
pass pass
return files return files

3
parsers/scans.py
View File

@ -126,7 +126,8 @@ def load_all_scans():
print("\n ", end='') print("\n ", end='')
print(f"{walletname} ", end='') print(f"{walletname} ", end='')
wallet, created = Wallet.objects.update_or_create(walletname=walletname) fpath = Path(settings.SCANS_ROOT, str(yeardir.stem), walletname)
wallet, created = Wallet.objects.update_or_create(walletname=walletname, fpath=fpath)
wallets[walletname] = wallet wallets[walletname] = wallet
# could now also load the json and use it. check &ref is correct or missing too.. # could now also load the json and use it. check &ref is correct or missing too..
if not created: if not created: