summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2022-08-25 17:29:43 +0300
committerPhilip Sargent <philip.sargent@klebos.com>2022-08-25 17:29:43 +0300
commit6c384492bec48e588987764ee25883484b25b13c (patch)
tree4c2aeb1f73d9f265dbbc6bb95c27958e3351e2d4
parentab184bccf342aeac72d5d1a99c9f9ebd6b244d29 (diff)
downloadtroggle-6c384492bec48e588987764ee25883484b25b13c.tar.gz
troggle-6c384492bec48e588987764ee25883484b25b13c.tar.bz2
troggle-6c384492bec48e588987764ee25883484b25b13c.zip
fix missing .svx as not an error
-rw-r--r--core/views/uploads.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/views/uploads.py b/core/views/uploads.py
index 4a8a6de..b61eb0e 100644
--- a/core/views/uploads.py
+++ b/core/views/uploads.py
@@ -149,10 +149,12 @@ def get_complaints(complaints, waldata, svxfiles, files, wallet, wurl):
if waldata["survex file"]:
if not type(waldata["survex file"])==list: # a string also is a sequence type, so do it this way
waldata["survex file"] = [waldata["survex file"]]
- for svx in waldata["survex file"]:
- if svx !="":
- svxfiles.append(svx)
- if not (Path(settings.SURVEX_DATA) / svx).is_file():
+ for sx in waldata["survex file"]:
+ if sx !="":
+ if Path(sx).suffix.lower() != ".svx":
+ sx = sx + ".svx"
+ svxfiles.append(sx)
+ if not (Path(settings.SURVEX_DATA) / sx).is_file():
file_complaint = f"{wallet} Incorrect survex file name in {wallet} wallet data. {svx} was not found in LOSER repo"
complaints.append(file_complaint)
message = f"! {file_complaint}"