fix bug for wallet with empty fpath

1 files changed, 12 insertions, 4 deletions

diff --git a/core/models/survex.py b/core/models/survex.py
index 1071537..b7c0b9b 100644
--- a/core/models/survex.py
+++ b/core/models/survex.py
@@ -277,15 +277,23 @@ class Wallet(models.Model):
     def get_fnames(self):
         '''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 = []
-        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:
                 for f in dirpath.iterdir():
                     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:
+                files.append("FileNotFoundError")
                 pass
         return files