Merge branch 'main' into dev

2024-03-10 14:09:51 +01:00
parent c6aa6d575d a5064d6237
commit 91c6e13cbc
42 changed files with 4433 additions and 4545 deletions
@@ -183,11 +183,15 @@ class NWStorage:
        # 2. A full path to an nwProject.nwx file
        if inPath.is_dir() and inPath != Path.home().resolve():
            nwxFile = inPath / nwFiles.PROJ_FILE
-        elif inPath.is_file() and inPath.name == nwFiles.PROJ_FILE:
-            nwxFile = inPath
+        elif inPath.is_file():
+            if inPath.name == nwFiles.PROJ_FILE:
+                nwxFile = inPath
+            else:
+                logger.error("Not a novelWriter project")
+                return NWStorageOpen.UNKOWN
        else:
-            logger.error("Not a novelWriter project")
-            return NWStorageOpen.UNKOWN
+            logger.error("Not found: %s", inPath)
+            return NWStorageOpen.NOT_FOUND

        if not nwxFile.exists():
            # The .nwx file must exist to continue