novelWriter 2.2rc1__py3-none-any.whl → 2.3b1__py3-none-any.whl

novelwriter/core/projectdata.py

@@ -3,10 +3,10 @@ novelWriter – Project Data Class
 ================================
 
 File History:
-Created: 2022-10-30 [2.0rc2]
+Created: 2022-10-30 [2.0rc2] NWProjectData
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -53,7 +53,6 @@ class NWProjectData:
         # Project Meta
         self._uuid = ""
         self._name = ""
-        self._title = ""
         self._author = ""
         self._saveCount = 0
         self._autoCount = 0
@@ -102,11 +101,6 @@ class NWProjectData:
         """Return the project name."""
         return self._name
 
-    @property
-    def title(self) -> str:
-        """Return the project title."""
-        return self._title
-
     @property
     def author(self) -> str:
         """Return the project author."""
@@ -228,16 +222,9 @@ class NWProjectData:
             self._project.setProjectChanged(True)
         return
 
-    def setTitle(self, value: str | None) -> None:
-        """Set a new novel title."""
-        if value != self._title:
-            self._title = simplified(str(value or ""))
-            self._project.setProjectChanged(True)
-        return
-
     def setAuthor(self, value: str | None) -> None:
         """Set the author value."""
-        if value != self._title:
+        if value != self._author:
             self._author = simplified(str(value or ""))
             self._project.setProjectChanged(True)
         return

novelwriter/core/projectxml.py

@@ -8,7 +8,7 @@ Created: 2022-09-28 [2.0rc2] ProjectXMLReader
 Created: 2022-10-31 [2.0rc2] ProjectXMLWriter
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -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

@@ -3,10 +3,10 @@ novelWriter – Project Session Log Class
 =======================================
 
 File History:
-Created:   2023-06-11 [2.1b1]
+Created: 2023-06-11 [2.1b1] NWSessionLog
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -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

@@ -3,10 +3,11 @@ novelWriter – Spell Check Classes
 =================================
 
 File History:
-Created: 2019-06-11 [0.1.5]
+Created: 2019-06-11 [0.1.5] NWSpellEnchant
+Created: 2023-06-13 [2.1b1] UserDictionary
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -26,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
 
@@ -56,7 +58,7 @@ class NWSpellEnchant:
         logger.debug("Ready: NWSpellEnchant")
         return
 
-    def __del__(self):  # pragma: no cover
+    def __del__(self) -> None:  # pragma: no cover
         logger.debug("Delete: NWSpellEnchant")
         return
 

novelwriter/core/status.py

@@ -3,11 +3,11 @@ novelWriter – Project Item Status Class
 =======================================
 
 File History:
-Created:   2019-05-19 [0.1.3]
-Rewritten: 2022-04-05 [2.0b1]
+Created:   2019-05-19 [0.1.3] NWStatus
+Rewritten: 2022-04-05 [2.0b1] NWStatus
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -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