expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-04-04 09:51:47 +01:00
Code Issues 18 Projects 3 Activity

bug in getting cave slug

Browse Source
This commit is contained in:
Philip Sargent 2023-10-16 13:35:56 +03:00
parent 6b94829315
commit bf8bf7b3d2
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/views/wallets_edit.py
View File

@ -553,26 +553,32 @@ def walletedit(request, path=None):
if not type(survex_paths) == list: # a string also is a sequence type, so do it this way if not type(survex_paths) == list: # a string also is a sequence type, so do it this way
survex_paths = [survex_paths] survex_paths = [survex_paths]
for svxf in survex_paths: for svxfl in survex_paths:
if not svxf: # not a blank string if not svxfl: # not a blank string
continue continue
# print(f" - - {svxf=} ") # print(f" - - {svxf=} ")
svx = Path(svxf) svxf = Path(svxfl)
if svx.suffix.lower() != ".svx": if svxf.suffix.lower() != ".svx":
svx = svx.with_suffix(".svx") svxf = svx.with_suffix(".svx")
f = Path(settings.SURVEX_DATA) / svx f = Path(settings.SURVEX_DATA) / svxf
if not f.is_file(): if not f.is_file():
message = f"Specified survex file '{fpath}' in database not found on disc"
print(message)
continue continue
fpath = svx.parent / svx.stem fpath = svxf.parent / svxf.stem
# print(f' - {fpath=}') # print(f' - {fpath=}')
try: try:
svxfile = SurvexFile.objects.get(path=fpath) svxfile = SurvexFile.objects.get(path=fpath)
except:
message = f"Specified survex file '{fpath}'not found? database may be empty. Exception."
print(message)
# This failure will also get picked up by the "S" colour code red or orange
try:
if svxfile.cave: if svxfile.cave:
caves.append(svxfile.cave) caves.append(svxfile.cave)
cave_refs.append(svxfile.cave.reference()) # this is a string?! cave_refs.append(svxfile.cave.slug()) # this is a string?!
w, d, n, t = scan_survexblocks(svxfile) w, d, n, t = scan_survexblocks(svxfile)
@ -581,7 +587,7 @@ def walletedit(request, path=None):
names.extend(n) names.extend(n)
team.extend(t) team.extend(t)
except: except:
message = "Specified survex file not found - database may be empty." message = f"Exception wallet handling for {fpath} '{svxfile.cave}' "
print(message) print(message)
# This failure will also get picked up by the "S" colour code red or orange # This failure will also get picked up by the "S" colour code red or orange