novelWriter 2.2.1__py3-none-any.whl → 2.3b1__py3-none-any.whl

novelwriter/core/projectxml.py

@@ -38,7 +38,6 @@ from novelwriter.common import (
     checkBool, checkInt, checkString, checkStringNone, formatTimeStamp,
     hexToInt, simplified, xmlIndent, yesNo
 )
-from novelwriter.constants import nwFiles
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.core.status import NWStatus
@@ -47,7 +46,7 @@ if TYPE_CHECKING:  # pragma: no cover
 logger = logging.getLogger(__name__)
 
 FILE_VERSION = "1.5"  # The current project file format version
-FILE_REVISION = "1"   # The current project file format revision
+FILE_REVISION = "2"   # The current project file format revision
 HEX_VERSION = 0x0105
 
 NUM_VERSION = {
@@ -65,12 +64,11 @@ class XMLReadState(Enum):
 
     NO_ACTION       = 0
     NO_ERROR        = 1
-    PARSED_BACKUP   = 2
-    CANNOT_PARSE    = 3
-    NOT_NWX_FILE    = 4
-    UNKNOWN_VERSION = 5
-    PARSED_OK       = 6
-    WAS_LEGACY      = 7
+    CANNOT_PARSE    = 2
+    NOT_NWX_FILE    = 3
+    UNKNOWN_VERSION = 4
+    PARSED_OK       = 5
+    WAS_LEGACY      = 6
 
 # END Class XMLReadState
 
@@ -107,7 +105,9 @@ class ProjectXMLReader:
         the project or the content into their respective section nodes
         as attributes. The id attribute was also added to the project.
 
-        Rev 1: Drops the titleFormat section of settings.
+        Rev 1: Drops the titleFormat node from settings. 2.1 Beta 1.
+        Rev 2: Drops the title node from project and adds the TEMPLATE
+               class for items. 2.3 Beta 1.
     """
 
     def __init__(self, path: str | Path) -> None:
@@ -172,23 +172,9 @@ class ProjectXMLReader:
             xml = ET.parse(str(self._path))
             self._state = XMLReadState.NO_ERROR
         except Exception as exc:
-            # Trying to open backup file instead
             logger.error("Failed to parse project XML", exc_info=exc)
             self._state = XMLReadState.CANNOT_PARSE
-
-            backFile = self._path.with_suffix(".bak")
-            if backFile.is_file():
-                try:
-                    xml = ET.parse(str(backFile))
-                    self._state = XMLReadState.PARSED_BACKUP
-                    logger.info("Backup project file parsed")
-                except Exception as exc:
-                    logger.error("Failed to parse backup project XML", exc_info=exc)
-                    self._state = XMLReadState.CANNOT_PARSE
-                    return False
-            else:
-                self._state = XMLReadState.CANNOT_PARSE
-                return False
+            return False
 
         xRoot = xml.getroot()
         self._root = str(xRoot.tag)
@@ -248,8 +234,6 @@ class ProjectXMLReader:
         for xItem in xSection:
             if xItem.tag == "name":
                 data.setName(xItem.text)
-            elif xItem.tag == "title":
-                data.setTitle(xItem.text)
             elif xItem.tag == "author":
                 data.setAuthor(xItem.text)
             else:
@@ -521,7 +505,6 @@ class ProjectXMLWriter:
 
         xProject = ET.SubElement(xRoot, "project", attrib=projAttr)
         self._packSingleValue(xProject, "name", data.name)
-        self._packSingleValue(xProject, "title", data.title)
         self._packSingleValue(xProject, "author", data.author)
 
         # Save Project Settings
@@ -558,23 +541,12 @@ class ProjectXMLWriter:
             xName.text = item["name"]
 
         # Write the XML tree to file
-        saveFile = self._path / nwFiles.PROJ_FILE
-        tempFile = saveFile.with_suffix(".tmp")
-        backFile = saveFile.with_suffix(".bak")
+        tmp = self._path.with_suffix(".tmp")
         try:
             xml = ET.ElementTree(xRoot)
             xmlIndent(xml)
-            xml.write(tempFile, encoding="utf-8", xml_declaration=True)
-        except Exception as exc:
-            self._error = exc
-            return False
-
-        # If we're here, the file was successfully saved,
-        # so let's sort out the temps and backups
-        try:
-            if saveFile.exists():
-                saveFile.replace(backFile)
-            tempFile.replace(saveFile)
+            xml.write(tmp, encoding="utf-8", xml_declaration=True)
+            tmp.replace(self._path)
         except Exception as exc:
             self._error = exc
             return False

novelwriter/core/sessions.py

@@ -27,8 +27,9 @@ import json
 import logging
 
 from time import time
-from typing import TYPE_CHECKING, Iterator
+from typing import TYPE_CHECKING
 from pathlib import Path
+from collections.abc import Iterator
 
 from novelwriter.error import logException
 from novelwriter.common import formatTimeStamp

novelwriter/core/spellcheck.py

@@ -27,8 +27,9 @@ from __future__ import annotations
 import json
 import logging
 
-from typing import TYPE_CHECKING, Iterator
+from typing import TYPE_CHECKING
 from pathlib import Path
+from collections.abc import Iterator
 
 from PyQt5.QtCore import QLocale
 

novelwriter/core/status.py

@@ -27,7 +27,8 @@ from __future__ import annotations
 import random
 import logging
 
-from typing import TYPE_CHECKING, ItemsView, Iterator, KeysView, Literal, ValuesView
+from typing import TYPE_CHECKING, Literal
+from collections.abc import ItemsView, Iterator, KeysView, ValuesView
 
 from PyQt5.QtGui import QIcon, QPainter, QPainterPath, QPixmap, QColor
 from PyQt5.QtCore import QRectF, Qt

novelwriter/core/storage.py

@@ -26,6 +26,7 @@ from __future__ import annotations
 import json
 import logging
 
+from enum import Enum
 from time import time
 from typing import TYPE_CHECKING
 from pathlib import Path
@@ -45,6 +46,26 @@ if TYPE_CHECKING:  # pragma: no cover
 logger = logging.getLogger(__name__)
 
 
+class NWStorageOpen(Enum):
+
+    UNKOWN    = 0
+    NOT_FOUND = 1
+    LOCKED    = 2
+    FAILED    = 3
+    READY     = 4
+
+# END Enum NWStorageOpen
+
+
+class NWStorageCreate(Enum):
+
+    NOT_EMPTY = 0
+    OS_ERROR  = 1
+    READY     = 2
+
+# END Enum NWStorageCreate
+
+
 class NWStorage:
     """Core: Project Storage Class
 
@@ -60,7 +81,10 @@ class NWStorage:
         self._storagePath = None
         self._runtimePath = None
         self._lockFilePath = None
+        self._lockedBy = None
         self._openMode = self.MODE_INACTIVE
+        self._ready = False
+        self._exception = None
         return
 
     def clear(self) -> None:
@@ -69,6 +93,7 @@ class NWStorage:
         self._runtimePath = None
         self._lockFilePath = None
         self._openMode = self.MODE_INACTIVE
+        self._ready = False
         return
 
     ##
@@ -77,12 +102,12 @@ class NWStorage:
 
     @property
     def storagePath(self) -> Path | None:
-        """Get the path where the project is saved."""
+        """Return the path where the project is stored."""
         return self._storagePath
 
     @property
     def runtimePath(self) -> Path | None:
-        """Get the path where the project is saved at runtime."""
+        """Return the path where the project is stored at runtime."""
         return self._runtimePath
 
     @property
@@ -97,44 +122,123 @@ class NWStorage:
         logger.error("Content path cannot be resolved")
         return None
 
+    @property
+    def lockStatus(self) -> list | None:
+        """Return the project lock information."""
+        if isinstance(self._lockedBy, list) and len(self._lockedBy) == 4:
+            return self._lockedBy
+        return None
+
+    @property
+    def exc(self) -> Exception | None:
+        """Return the latest exception of the storage instance."""
+        return self._exception
+
     ##
     #  Core Methods
     ##
 
     def isOpen(self) -> bool:
         """Check if the storage location is open."""
-        return self._runtimePath is not None
+        return self._ready and self._runtimePath is not None
 
-    def openProjectInPlace(self, path: str | Path, newProject: bool = False) -> bool:
-        """Open a novelWriter project in-place. That is, it is opened
-        directly from a project folder.
-        """
+    def createNewProject(self, path: str | Path) -> NWStorageCreate:
+        """Create a new project at the given location."""
         inPath = Path(path).resolve()
-        if inPath.is_file():
-            # The path should not point to an existing file,
-            # but it can point to a folder containing files
-            inPath = inPath.parent
-
-        if not (inPath.is_dir() or newProject):
-            # If the project is not new, the folder must already exist.
-            return False
+        if inPath.is_dir() and len(list(inPath.iterdir())) > 0:
+            logger.error("Folder is not empty: %s", inPath)
+            return NWStorageCreate.NOT_EMPTY
 
         self._storagePath = inPath
         self._runtimePath = inPath
         self._lockFilePath = inPath / nwFiles.PROJ_LOCK
         self._openMode = self.MODE_INPLACE
 
-        if not self._prepareStorage(checkLegacy=True, newProject=newProject):
+        basePath = self._runtimePath
+        metaPath = basePath / "meta"
+        contPath = basePath / "content"
+        try:
+            basePath.mkdir(exist_ok=True)
+            metaPath.mkdir(exist_ok=True)
+            contPath.mkdir(exist_ok=True)
+        except Exception as exc:
+            self._exception = exc
+            logger.error("Failed to create project folders", exc_info=exc)
             self.clear()
-            return False
+            return NWStorageCreate.OS_ERROR
 
-        return True
+        self._ready = True
 
-    def openProjectArchive(self, path: str | Path) -> bool:  # pragma: no cover
-        """Open the project from a single file.
-        Placeholder for later implementation. See #977.
-        """
-        return False
+        return NWStorageCreate.READY
+
+    def initProjectStorage(self, path: str | Path, clearLock: bool = False) -> NWStorageOpen:
+        """Initialise a novelWriter project location."""
+        inPath = Path(path).resolve()
+
+        # Initialise Storage Instance
+        # ===========================
+
+        # Check what we're opening. Only two options are allowed:
+        # 1. A folder with an nwProject.nwx file in it (not home)
+        # 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
+        else:
+            logger.error("Not a novelWriter project")
+            return NWStorageOpen.UNKOWN
+
+        if not nwxFile.exists():
+            # The .nwx file must exist to continue
+            logger.error("Not found: %s", nwxFile)
+            return NWStorageOpen.NOT_FOUND
+
+        nwxPath = nwxFile.parent
+
+        self._storagePath = nwxPath
+        self._runtimePath = nwxPath
+        self._lockFilePath = nwxPath / nwFiles.PROJ_LOCK
+        self._openMode = self.MODE_INPLACE
+
+        # Check Project Lock
+        # ==================
+
+        if clearLock:
+            self._clearLockFile()
+
+        self._readLockFile()
+        if self._lockedBy:
+            logger.error("Project is locked, so not opening")
+            return NWStorageOpen.LOCKED
+        else:
+            logger.debug("Project is not locked")
+
+        # Prepare Folder
+        # ==============
+
+        basePath = self._runtimePath
+        metaPath = basePath / "meta"
+        contPath = basePath / "content"
+        try:
+            metaPath.mkdir(exist_ok=True)
+            contPath.mkdir(exist_ok=True)
+        except Exception as exc:
+            logger.error("Failed to create project folders", exc_info=exc)
+            self.clear()
+            return NWStorageOpen.FAILED
+
+        # Check for legacy data folders
+        legacy = _LegacyStorage(self._project)
+        legacy.deprecatedFiles(basePath)
+        for child in basePath.iterdir():
+            if child.is_dir() and child.name.startswith("data_"):
+                legacy.legacyDataFolder(basePath, child)
+
+        self._writeLockFile()
+        self._ready = True
+
+        return NWStorageOpen.READY
 
     def runPostSaveTasks(self, autoSave: bool = False) -> bool:  # pragma: no cover
         """Run tasks after the project has been saved.
@@ -147,7 +251,7 @@ class NWStorage:
 
     def closeSession(self) -> None:
         """Run tasks related to closing the session."""
-        self.clearLockFile()
+        self._clearLockFile()
         self.clear()
         return
 
@@ -157,26 +261,25 @@ class NWStorage:
 
     def getXmlReader(self) -> ProjectXMLReader | None:
         """Return a properly configured ProjectXMLReader instance."""
-        if isinstance(self._runtimePath, Path):
-            projFile = self._runtimePath / nwFiles.PROJ_FILE
-            return ProjectXMLReader(projFile)
+        if isinstance(self._runtimePath, Path) and self._ready:
+            return ProjectXMLReader(self._runtimePath / nwFiles.PROJ_FILE)
         return None
 
     def getXmlWriter(self) -> ProjectXMLWriter | None:
         """Return a properly configured ProjectXMLWriter instance."""
-        if isinstance(self._runtimePath, Path):
-            return ProjectXMLWriter(self._runtimePath)
+        if isinstance(self._runtimePath, Path) and self._ready:
+            return ProjectXMLWriter(self._runtimePath / nwFiles.PROJ_FILE)
         return None
 
     def getDocument(self, tHandle: str | None) -> NWDocument:
         """Return a document wrapper object."""
-        if isinstance(self._runtimePath, Path):
+        if isinstance(self._runtimePath, Path) and self._ready:
             return NWDocument(self._project, tHandle)
         return NWDocument(self._project, None)
 
     def getMetaFile(self, fileName: str) -> Path | None:
         """Return the path to a file in the project meta folder."""
-        if isinstance(self._runtimePath, Path):
+        if isinstance(self._runtimePath, Path) and self._ready:
             return self._runtimePath / "meta" / fileName
         return None
 
@@ -190,59 +293,6 @@ class NWStorage:
             if item.suffix == ".nwd" and isHandle(item.stem)
         ] if contentPath else []
 
-    def readLockFile(self) -> list[str]:
-        """Read the project lock file."""
-        if self._lockFilePath is None:
-            return ["ERROR"]
-
-        if not self._lockFilePath.exists():
-            return []
-
-        try:
-            lines = self._lockFilePath.read_text(encoding="utf-8").strip().split(";")
-        except Exception:
-            logger.error("Failed to read project lockfile")
-            logException()
-            return ["ERROR"]
-
-        if len(lines) != 4:
-            return ["ERROR"]
-
-        return lines
-
-    def writeLockFile(self) -> bool:
-        """Write the project lock file."""
-        if self._lockFilePath is None:
-            return False
-
-        data = [
-            CONFIG.hostName, CONFIG.osType,
-            CONFIG.kernelVer, str(int(time()))
-        ]
-        try:
-            self._lockFilePath.write_text(";".join(data), encoding="utf-8")
-        except Exception:
-            logger.error("Failed to write project lockfile")
-            logException()
-            return False
-
-        return True
-
-    def clearLockFile(self) -> bool:
-        """Remove the lock file, if it exists."""
-        if self._lockFilePath is None:
-            return False
-
-        if self._lockFilePath.exists():
-            try:
-                self._lockFilePath.unlink()
-            except Exception:
-                logger.error("Failed to remove project lockfile")
-                logException()
-                return False
-
-        return True
-
     def zipIt(self, target: str | Path, compression: int | None = None) -> bool:
         """Zip the content of the project at its runtime location into a
         zip file. This process will only grab files that are supposed to
@@ -257,7 +307,6 @@ class NWStorage:
         baseCont = basePath / "content"
         files = [
             (basePath / nwFiles.PROJ_FILE,   nwFiles.PROJ_FILE),
-            (basePath / nwFiles.PROJ_BACKUP, nwFiles.PROJ_BACKUP),
             (baseMeta / nwFiles.BUILDS_FILE, f"meta/{nwFiles.BUILDS_FILE}"),
             (baseMeta / nwFiles.INDEX_FILE,  f"meta/{nwFiles.INDEX_FILE}"),
             (baseMeta / nwFiles.OPTS_FILE,   f"meta/{nwFiles.OPTS_FILE}"),
@@ -279,7 +328,7 @@ class NWStorage:
                         zipObj.write(srcPath, zipPath)
                         logger.debug("Added: %s", zipPath)
         except Exception:
-            logger.error("Failed to create acrhive")
+            logger.error("Failed to create archive")
             logException()
             return False
 
@@ -289,59 +338,48 @@ class NWStorage:
     #  Internal Functions
     ##
 
-    def _prepareStorage(self, checkLegacy: bool = True, newProject: bool = False) -> bool:
-        """Prepare the storage area for the project."""
-        path = self._runtimePath
-        if not isinstance(path, Path):
-            logger.error("No path set")
-            self.clear()
-            return False
+    def _readLockFile(self) -> None:
+        """Read the project lock file."""
+        self._lockedBy = None
+        path = self._lockFilePath
+        if isinstance(path, Path) and path.exists():
+            try:
+                self._lockedBy = path.read_text(encoding="utf-8").strip().split(";")
+            except Exception:
+                logger.error("Failed to read project lockfile")
+                logException()
+                self._lockedBy = ["ERROR", "ERROR", "ERROR", "ERROR"]
+                return
+        return
 
-        if path == Path.home().absolute():
-            logger.error("Cannot use the user's home path as the root of a project")
-            self.clear()
+    def _writeLockFile(self) -> bool:
+        """Write the project lock file."""
+        if self._lockFilePath is None:
             return False
-
-        if newProject:
-            # If it's a new project, we check that there is no existing
-            # project in the selected path.
-            if path.exists() and len(list(path.iterdir())) > 0:
-                logger.error("The new project folder is not empty")
-                self.clear()
-                return False
-
-        # The folder is not required to exist, as it could be a new
-        # project, so we make sure it does. Then we add subfolders.
         try:
-            path.mkdir(exist_ok=True)
-            (path / "content").mkdir(exist_ok=True)
-            (path / "meta").mkdir(exist_ok=True)
-        except Exception as exc:
-            logger.error("Failed to create required project folders", exc_info=exc)
-            self.clear()
+            self._lockFilePath.write_text(
+                f"{CONFIG.hostName};{CONFIG.osType};{CONFIG.kernelVer};{int(time())}",
+                encoding="utf-8"
+            )
+        except Exception:
+            logger.error("Failed to write project lockfile")
+            logException()
             return False
-
-        if not checkLegacy:
-            # The legacy content check is only needed for project folder
-            # storage, so if it is not expected to be that, there's no
-            # need for the remaining checks.
-            return True
-
-        legacy = _LegacyStorage(self._project)
-
-        # Check for legacy data folders
-        for child in path.iterdir():
-            if child.is_dir() and child.name.startswith("data_"):
-                legacy.legacyDataFolder(path, child)
-
-        # Check for no longer used files, and delete them
-        legacy.deprecatedFiles(path)
-
         return True
 
-    ##
-    #  Legacy Project Data Handlers
-    ##
+    def _clearLockFile(self) -> bool:
+        """Remove the lock file, if it exists."""
+        if self._lockFilePath is None:
+            return False
+        if self._lockFilePath.exists():
+            try:
+                self._lockFilePath.unlink()
+            except Exception:
+                logger.error("Failed to remove project lockfile")
+                logException()
+                return False
+        self._lockedBy = None
+        return True
 
 # END Class NWStorage
 
@@ -350,7 +388,7 @@ class _LegacyStorage:
     """Core: Legacy Storage Converter Utils
 
     A class with various functions to convert old file formats and
-    file/folder layout to the current project format.
+    file/folder layouts to the current project format.
     """
 
     def __init__(self, project: NWProject) -> None:
@@ -359,7 +397,8 @@ class _LegacyStorage:
 
     def legacyDataFolder(self, path: Path, child: Path) -> None:
         """Handle the content of a legacy data folder from a version 1.0
-        project.
+        project. This format had 16 data folders where there now is only
+        one content folder.
         """
         logger.info("Processing legacy data folder: %s", path)
 
@@ -411,6 +450,7 @@ class _LegacyStorage:
             path / "meta" / nwFiles.OPTS_FILE
         )
 
+        # Delete removed files
         remove = [
             path / "meta" / "tagsIndex.json",          # Renamed in 2.1 Beta 1
             path / "meta" / "mainOptions.json",        # Replaced in 0.5
@@ -422,6 +462,7 @@ class _LegacyStorage:
             path / "cache" / "prevBuild.json",         # Dropped in 2.1 Beta 1
             path / "cache",                            # Dropped in 2.1 Beta 1
             path / "ToC.json",                         # Dropped in 1.0 RC 1
+            path / "nwProject.bak",                    # Dropped in 2.3 Beta 1
         ]
         for item in remove:
             if item.exists():
@@ -457,7 +498,6 @@ class _LegacyStorage:
 
             # Save dictionary and clean up old file
             userDict.save()
-            assert wordJson.exists()
             wordList.unlink()
 
         except Exception:
@@ -467,9 +507,7 @@ class _LegacyStorage:
         return
 
     def _convertOldLogFile(self, sessLog: Path, sessJson: Path) -> None:
-        """Convert the old text log file format to the new JSON Lines
-        format.
-        """
+        """Convert the old text log file format to JSON Lines."""
         if sessJson.exists() or not sessLog.exists():
             # If the new file already exists, we won't overwrite it
             return
@@ -508,7 +546,7 @@ class _LegacyStorage:
         return
 
     def _convertOldOptionsFile(self, optsOld: Path, optsNew: Path) -> None:
-        """Convert the old options state file format to the format."""
+        """Convert the old options state file format to new format."""
         if optsNew.exists() or not optsOld.exists():
             # If the new file already exists, we won't overwrite it
             return

novelwriter/core/tohtml.py

@@ -338,7 +338,6 @@ class ToHtml(Tokenizer):
         data = {
             "meta": {
                 "projectName": self._project.data.name,
-                "novelTitle": self._project.data.title,
                 "novelAuthor": self._project.data.author,
                 "buildTime": int(timeStamp),
                 "buildTimeStr": formatTimeStamp(timeStamp),
@@ -485,7 +484,10 @@ class ToHtml(Tokenizer):
         result = f"<span class='tags'>{self._localLookup(nwLabels.KEY_NAME[bits[0]])}:</span> "
         if len(bits) > 1:
             if bits[0] == nwKeyWords.TAG_KEY:
-                result += f"<a name='tag_{bits[1]}'>{bits[1]}</a>"
+                one, two = self._project.index.parseValue(bits[1])
+                result += f"<a name='tag_{one}'>{one}</a>"
+                if two:
+                    result += f" | <span class='optional'>{two}</a>"
             else:
                 if self._genMode == self.M_PREVIEW:
                     result += ", ".join(f"<a href='#{bits[0][1:]}={t}'>{t}</a>" for t in bits[1:])