novelWriter 2.4.3__py3-none-any.whl → 2.5__py3-none-any.whl

novelwriter/core/index.py

@@ -29,17 +29,20 @@ from __future__ import annotations
 
 import json
 import logging
+import random
 
-from time import time
-from typing import TYPE_CHECKING
-from pathlib import Path
 from collections.abc import ItemsView, Iterable
+from pathlib import Path
+from time import time
+from typing import TYPE_CHECKING, Literal
 
 from novelwriter import SHARED
-from novelwriter.enum import nwComment, nwItemClass, nwItemType, nwItemLayout
+from novelwriter.common import (
+    checkInt, isHandle, isItemClass, isListInstance, isTitleTag, jsonEncode
+)
+from novelwriter.constants import nwFiles, nwHeaders, nwKeyWords
+from novelwriter.enum import nwComment, nwItemClass, nwItemLayout, nwItemType
 from novelwriter.error import logException
-from novelwriter.common import checkInt, isHandle, isItemClass, isTitleTag, jsonEncode
-from novelwriter.constants import nwFiles, nwKeyWords, nwHeaders
 from novelwriter.text.counting import standardCounter
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -48,7 +51,12 @@ if TYPE_CHECKING:  # pragma: no cover
 
 logger = logging.getLogger(__name__)
 
-TT_NONE = "T0000"
+T_NoteTypes = Literal["footnotes", "comments"]
+
+TT_NONE = "T0000"  # Default title key
+MAX_RETRY = 1000  # Key generator recursion limit
+KEY_SOURCE = "0123456789bcdfghjklmnpqrstvwxz"
+NOTE_TYPES: list[T_NoteTypes] = ["footnotes", "comments"]
 
 
 class NWIndex:
@@ -301,9 +309,9 @@ class NWIndex:
 
     def _scanActive(self, tHandle: str, nwItem: NWItem, text: str, tags: dict[str, bool]) -> None:
         """Scan an active document for meta data."""
-        nTitle = 0           # Line Number of the previous title
-        cTitle = TT_NONE     # Tag of the current title
-        pTitle = TT_NONE     # Tag of the previous title
+        nTitle = 0         # Line Number of the previous title
+        cTitle = TT_NONE   # Tag of the current title
+        pTitle = TT_NONE   # Tag of the previous title
         canSetHead = True  # First heading has not yet been set
 
         lines = text.splitlines()
@@ -335,10 +343,11 @@ class NWIndex:
                     self._indexKeyword(tHandle, line, cTitle, nwItem.itemClass, tags)
 
             elif line.startswith("%"):
-                if cTitle != TT_NONE:
-                    cStyle, cText, _ = processComment(line)
-                    if cStyle in (nwComment.SYNOPSIS, nwComment.SHORT):
-                        self._itemIndex.setHeadingSynopsis(tHandle, cTitle, cText)
+                cStyle, cKey, cText, _, _ = processComment(line)
+                if cStyle in (nwComment.SYNOPSIS, nwComment.SHORT):
+                    self._itemIndex.setHeadingSynopsis(tHandle, cTitle, cText)
+                elif cStyle == nwComment.FOOTNOTE:
+                    self._itemIndex.addNoteKey(tHandle, "footnotes", cKey)
 
         # Count words for remaining text after last heading
         if pTitle != TT_NONE:
@@ -506,6 +515,14 @@ class NWIndex:
         name, _, display = text.partition("|")
         return name.rstrip(), display.lstrip()
 
+    def newCommentKey(self, tHandle: str, style: nwComment) -> str:
+        """Generate a new key for a comment style."""
+        if style == nwComment.FOOTNOTE:
+            return self._itemIndex.genNewNoteKey(tHandle, "footnotes")
+        elif style == nwComment.COMMENT:
+            return self._itemIndex.genNewNoteKey(tHandle, "comments")
+        return "err"
+
     ##
     #  Extract Data
     ##
@@ -690,12 +707,9 @@ class NWIndex:
             return tName, tClass, iItem, None if iItem is None else iItem[tHeading]
         return "", "", None, None
 
-# END Class NWIndex
-
 
-# =============================================================================================== #
-#  The Tags Index Object
-# =============================================================================================== #
+# The Tags Index Object
+# =====================
 
 class TagsIndex:
     """Core: Tags Index Wrapper Class
@@ -790,7 +804,7 @@ class TagsIndex:
 
         for key, entry in data.items():
             if not isinstance(key, str):
-                raise ValueError("tagsIndex keys must be a string")
+                raise ValueError("tagsIndex key must be a string")
             if not isinstance(entry, dict):
                 raise ValueError("tagsIndex entry is not a dict")
 
@@ -815,12 +829,9 @@ class TagsIndex:
 
         return
 
-# END Class TagsIndex
-
 
-# =============================================================================================== #
-#  The Item Index Objects
-# =============================================================================================== #
+# The Item Index Objects
+# ======================
 
 class ItemIndex:
     """Core: Item Index Wrapper Class
@@ -950,6 +961,25 @@ class ItemIndex:
             self._items[tHandle].addHeadingRef(sTitle, tagKeys, refType)
         return
 
+    def addNoteKey(self, tHandle: str, style: T_NoteTypes, key: str) -> None:
+        """Set notes key for a given item."""
+        if tHandle in self._items:
+            self._items[tHandle].addNoteKey(style, key)
+        return
+
+    def genNewNoteKey(self, tHandle: str, style: T_NoteTypes) -> str:
+        """Set notes key for a given item."""
+        if style in NOTE_TYPES and (item := self._items.get(tHandle)):
+            keys = set()
+            for entry in self._items.values():
+                keys.update(entry.noteKeys(style))
+            for _ in range(MAX_RETRY):
+                key = style[:1] + "".join(random.choices(KEY_SOURCE, k=4))
+                if key not in keys:
+                    item.addNoteKey(style, key)
+                    return key
+        return "err"
+
     ##
     #  Pack/Unpack
     ##
@@ -978,8 +1008,6 @@ class ItemIndex:
 
         return
 
-# END Class ItemIndex
-
 
 class IndexItem:
     """Core: Single Index Item Class
@@ -991,12 +1019,13 @@ class IndexItem:
     must be reset each time the item is re-indexed.
     """
 
-    __slots__ = ("_handle", "_item", "_headings", "_count")
+    __slots__ = ("_handle", "_item", "_headings", "_count", "_notes")
 
     def __init__(self, tHandle: str, nwItem: NWItem) -> None:
         self._handle = tHandle
         self._item = nwItem
         self._headings: dict[str, IndexHeading] = {TT_NONE: IndexHeading(TT_NONE)}
+        self._notes: dict[str, set[str]] = {}
         self._count = 0
         return
 
@@ -1064,6 +1093,13 @@ class IndexItem:
                 self._headings[sTitle].addReference(tagKey, refType)
         return
 
+    def addNoteKey(self, style: T_NoteTypes, key: str) -> None:
+        """Add a note key to the index."""
+        if style not in self._notes:
+            self._notes[style] = set()
+        self._notes[style].add(key)
+        return
+
     ##
     #  Data Methods
     ##
@@ -1085,6 +1121,10 @@ class IndexItem:
         self._count += 1
         return f"T{self._count:04d}"
 
+    def noteKeys(self, style: T_NoteTypes) -> set[str]:
+        """Return a set of all note keys."""
+        return self._notes.get(style, set())
+
     ##
     #  Pack/Unpack
     ##
@@ -1103,6 +1143,8 @@ class IndexItem:
         data["headings"] = heads
         if refs:
             data["references"] = refs
+        if self._notes:
+            data["notes"] = {style: list(keys) for style, keys in self._notes.items()}
 
         return data
 
@@ -1116,9 +1158,15 @@ class IndexItem:
             tHeading.unpackData(hData)
             tHeading.unpackReferences(references.get(sTitle, {}))
             self.addHeading(tHeading)
-        return
 
-# END Class IndexItem
+        for style, keys in data.get("notes", {}).items():
+            if style not in NOTE_TYPES:
+                raise ValueError("The notes style is invalid")
+            if not isListInstance(keys, str):
+                raise ValueError("The notes keys must be a list of strings")
+            self._notes[style] = set(keys)
+
+        return
 
 
 class IndexHeading:
@@ -1295,25 +1343,47 @@ class IndexHeading:
                     raise ValueError("The itemIndex contains an invalid reference type")
         return
 
-# END Class IndexHeading
-
 
-# =============================================================================================== #
-#  Text Processing Functions
-# =============================================================================================== #
+# Text Processing Functions
+# =========================
 
-CLASSIFIERS = {
-    "short": nwComment.SHORT,
+MODIFIERS = {
     "synopsis": nwComment.SYNOPSIS,
+    "short":    nwComment.SHORT,
+    "note":     nwComment.NOTE,
+    "footnote": nwComment.FOOTNOTE,
 }
+KEY_REQ = {
+    "synopsis": 0,  # Key not allowed
+    "short":    0,  # Key not allowed
+    "note":     1,  # Key optional
+    "footnote": 2,  # Key required
+}
+
+
+def _checkModKey(modifier: str, key: str) -> bool:
+    """Check if a modifier and key set are ok."""
+    if modifier in MODIFIERS:
+        if key == "":
+            return KEY_REQ[modifier] < 2
+        elif key.replace("_", "").isalnum():
+            return KEY_REQ[modifier] > 0
+    return False
 
 
-def processComment(text: str) -> tuple[nwComment, str, int]:
-    """Extract comment style and text. Should only be called on text
-    starting with a %.
+def processComment(text: str) -> tuple[nwComment, str, str, int, int]:
+    """Extract comment style, key and text. Should only be called on
+    text starting with a %.
     """
-    check = text[1:].lstrip()
-    classifier, _, content = check.partition(":")
-    if content and (clean := classifier.strip().lower()) in CLASSIFIERS:
-        return CLASSIFIERS[clean], content.strip(), text.find(":") + 1
-    return nwComment.PLAIN, check, 0
+    if text[:2] == "%~":
+        return nwComment.IGNORE, "", text[2:].lstrip(), 0, 0
+
+    check = text[1:].strip()
+    start, _, content = check.partition(":")
+    modifier, _, key = start.rstrip().partition(".")
+    if content and (clean := modifier.lower()) and _checkModKey(clean, key):
+        col = text.find(":") + 1
+        dot = text.find(".", 0, col) + 1
+        return MODIFIERS[clean], key, content.lstrip(), dot, col
+
+    return nwComment.PLAIN, "", check, 0, 0

novelwriter/core/item.py

@@ -25,15 +25,16 @@ from __future__ import annotations
 
 import logging
 
-from typing import TYPE_CHECKING, Any, Literal, overload
+from typing import TYPE_CHECKING, Any
 
 from PyQt5.QtGui import QIcon
 
-from novelwriter.enum import nwItemType, nwItemClass, nwItemLayout
 from novelwriter.common import (
-    checkInt, isHandle, isItemClass, isItemLayout, isItemType, simplified, yesNo
+    checkInt, isHandle, isItemClass, isItemLayout, isItemType, simplified,
+    yesNo
 )
 from novelwriter.constants import nwHeaders, nwLabels, trConst
+from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.core.project import NWProject
@@ -308,25 +309,15 @@ class NWItem:
 
         return trConst(nwLabels.ITEM_DESCRIPTION.get(descKey, ""))
 
-    @overload  # pragma: no cover
-    def getImportStatus(self, incIcon: Literal[True] = True) -> tuple[str, QIcon]:
-        pass
-
-    @overload  # pragma: no cover
-    def getImportStatus(self, incIcon: Literal[False]) -> tuple[str, None]:
-        pass
-
-    def getImportStatus(self, incIcon=True):
+    def getImportStatus(self) -> tuple[str, QIcon]:
         """Return the relevant importance or status label and icon for
         the current item based on its class.
         """
         if self.isNovelLike():
-            stName = self._project.data.itemStatus.name(self._status)
-            stIcon = self._project.data.itemStatus.icon(self._status) if incIcon else None
+            entry = self._project.data.itemStatus[self._status]
         else:
-            stName = self._project.data.itemImport.name(self._import)
-            stIcon = self._project.data.itemImport.icon(self._import) if incIcon else None
-        return stName, stIcon
+            entry = self._project.data.itemImport[self._import]
+        return entry.name, entry.icon
 
     ##
     #  Checker Methods
@@ -567,5 +558,3 @@ class NWItem:
         """Save the initial word count."""
         self._initCount = self._wordCount
         return
-
-# END Class NWItem

novelwriter/core/options.py

@@ -28,12 +28,12 @@ import json
 import logging
 
 from enum import Enum
-from typing import TYPE_CHECKING, Any, TypeVar
 from pathlib import Path
+from typing import TYPE_CHECKING, Any, TypeVar
 
-from novelwriter.error import logException
 from novelwriter.common import checkBool, checkFloat, checkInt, checkString, jsonEncode
 from novelwriter.constants import nwFiles
+from novelwriter.error import logException
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.core.project import NWProject
@@ -218,5 +218,3 @@ class OptionState:
                     if value in lookup.__members__:
                         return lookup[value]
         return default
-
-# END Class OptionState

novelwriter/core/project.py

@@ -26,33 +26,33 @@ from __future__ import annotations
 import json
 import logging
 
+from collections.abc import Iterable
 from enum import Enum
+from functools import partial
+from pathlib import Path
 from time import time
 from typing import TYPE_CHECKING
-from pathlib import Path
-from functools import partial
-from collections.abc import Iterable
 
 from PyQt5.QtCore import QCoreApplication
 
-from novelwriter import CONFIG, SHARED, __version__, __hexversion__
-from novelwriter.enum import nwItemType, nwItemClass, nwItemLayout
-from novelwriter.error import logException
-from novelwriter.constants import trConst, nwLabels
-from novelwriter.core.tree import NWTree
+from novelwriter import CONFIG, SHARED, __hexversion__, __version__
+from novelwriter.common import (
+    checkStringNone, formatInt, formatTimeStamp, getFileSize, hexToInt,
+    makeFileNameSafe, minmax
+)
+from novelwriter.constants import nwLabels, trConst
 from novelwriter.core.index import NWIndex
 from novelwriter.core.options import OptionState
-from novelwriter.core.storage import NWStorage, NWStorageOpen
-from novelwriter.core.sessions import NWSessionLog
-from novelwriter.core.projectxml import ProjectXMLReader, ProjectXMLWriter, XMLReadState
 from novelwriter.core.projectdata import NWProjectData
-from novelwriter.common import (
-    checkStringNone, formatInt, formatTimeStamp, getFileSize, hexToInt, makeFileNameSafe, minmax
-)
+from novelwriter.core.projectxml import ProjectXMLReader, ProjectXMLWriter, XMLReadState
+from novelwriter.core.sessions import NWSessionLog
+from novelwriter.core.storage import NWStorage, NWStorageOpen
+from novelwriter.core.tree import NWTree
+from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType
+from novelwriter.error import logException
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.core.item import NWItem
-    from novelwriter.core.status import NWStatus
 
 logger = logging.getLogger(__name__)
 
@@ -64,8 +64,6 @@ class NWProjectState(Enum):
     RECOVERY = 2
     READY    = 3
 
-# END Enum NWProjectState
-
 
 class NWProject:
 
@@ -256,13 +254,23 @@ class NWProject:
         status = self._storage.initProjectStorage(projPath, clearLock)
         if status != NWStorageOpen.READY:
             if status == NWStorageOpen.UNKOWN:
-                SHARED.error(self.tr("Not a known project file format."))
+                SHARED.error(
+                    self.tr("Not a known project file format."),
+                    info=self.tr("Path: {0}").format(str(projPath))
+                )
             elif status == NWStorageOpen.NOT_FOUND:
-                SHARED.error(self.tr("Project file not found."))
+                SHARED.error(
+                    self.tr("Project file not found."),
+                    info=self.tr("Path: {0}").format(str(projPath))
+                )
+            elif status == NWStorageOpen.FAILED:
+                SHARED.error(
+                    self.tr("Failed to open project."),
+                    info=self.tr("Path: {0}").format(str(projPath)),
+                    exc=self._storage.exc
+                )
             elif status == NWStorageOpen.LOCKED:
                 self._state = NWProjectState.LOCKED
-            elif status == NWStorageOpen.FAILED:
-                SHARED.error(self.tr("Failed to open project."), exc=self._storage.exc)
             return False
 
         # Read Project XML
@@ -461,14 +469,14 @@ class NWProject:
 
     def setDefaultStatusImport(self) -> None:
         """Set the default status and importance values."""
-        self._data.itemStatus.write(None, self.tr("New"),      (100, 100, 100))
-        self._data.itemStatus.write(None, self.tr("Note"),     (200, 50,  0))
-        self._data.itemStatus.write(None, self.tr("Draft"),    (200, 150, 0))
-        self._data.itemStatus.write(None, self.tr("Finished"), (50,  200, 0))
-        self._data.itemImport.write(None, self.tr("New"),      (100, 100, 100))
-        self._data.itemImport.write(None, self.tr("Minor"),    (200, 50,  0))
-        self._data.itemImport.write(None, self.tr("Major"),    (200, 150, 0))
-        self._data.itemImport.write(None, self.tr("Main"),     (50,  200, 0))
+        self._data.itemStatus.add(None, self.tr("New"),      (100, 100, 100), "SQUARE", 0)
+        self._data.itemStatus.add(None, self.tr("Note"),     (200, 50,  0),   "SQUARE", 0)
+        self._data.itemStatus.add(None, self.tr("Draft"),    (200, 150, 0),   "SQUARE", 0)
+        self._data.itemStatus.add(None, self.tr("Finished"), (50,  200, 0),   "SQUARE", 0)
+        self._data.itemImport.add(None, self.tr("New"),      (100, 100, 100), "SQUARE", 0)
+        self._data.itemImport.add(None, self.tr("Minor"),    (200, 50,  0),   "SQUARE", 0)
+        self._data.itemImport.add(None, self.tr("Major"),    (200, 150, 0),   "SQUARE", 0)
+        self._data.itemImport.add(None, self.tr("Main"),     (50,  200, 0),   "SQUARE", 0)
         return
 
     def setProjectLang(self, language: str | None) -> None:
@@ -491,14 +499,6 @@ class NWProject:
         self.setProjectChanged(True)
         return
 
-    def setStatusColours(self, new: list[dict], deleted: list[str]) -> bool:
-        """Update the list of novel file status flags."""
-        return self._setStatusImport(new, deleted, self._data.itemStatus)
-
-    def setImportColours(self, new: list[dict], deleted: list[str]) -> bool:
-        """Update the list of note file importance flags."""
-        return self._setStatusImport(new, deleted, self._data.itemImport)
-
     def setProjectChanged(self, status: bool) -> bool:
         """Toggle the project changed flag, and propagate the
         information to the GUI statusbar.
@@ -584,28 +584,6 @@ class NWProject:
     #  Internal Functions
     ##
 
-    def _setStatusImport(self, new: list[dict], delete: list[str], target: NWStatus) -> bool:
-        """Update the list of novel file status or importance flags, and
-        delete those that have been requested deleted.
-        """
-        if not (new or delete):
-            return False
-
-        order = []
-        for entry in new:
-            key = entry.get("key", None)
-            name = entry.get("name", "")
-            cols = entry.get("cols", (100, 100, 100))
-            if name:
-                order.append(target.write(key, name, cols))
-
-        for key in delete:
-            target.remove(key)
-
-        target.reorder(order)
-
-        return True
-
     def _loadProjectLocalisation(self) -> bool:
         """Load the language data for the current project language."""
         if self._data.language is None or CONFIG._nwLangPath is None:
@@ -626,5 +604,3 @@ class NWProject:
             return False
 
         return True
-
-# END Class NWProject

novelwriter/core/projectdata.py

@@ -23,8 +23,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import uuid
 import logging
+import uuid
 
 from typing import TYPE_CHECKING, Any
 
@@ -322,5 +322,3 @@ class NWProjectData:
                     self._autoReplace[key] = simplified(entry)
             self._project.setProjectChanged(True)
         return
-
-# END Class NWProjectData

novelwriter/core/projectxml.py

@@ -29,24 +29,24 @@ import logging
 import xml.etree.ElementTree as ET
 
 from enum import Enum
+from pathlib import Path
 from time import time
 from typing import TYPE_CHECKING
-from pathlib import Path
 
-from novelwriter import __version__, __hexversion__
+from novelwriter import __hexversion__, __version__
 from novelwriter.common import (
     checkBool, checkInt, checkString, checkStringNone, formatTimeStamp,
     hexToInt, simplified, xmlIndent, yesNo
 )
 
 if TYPE_CHECKING:  # pragma: no cover
-    from novelwriter.core.status import NWStatus
     from novelwriter.core.projectdata import NWProjectData
+    from novelwriter.core.status import NWStatus
 
 logger = logging.getLogger(__name__)
 
 FILE_VERSION = "1.5"  # The current project file format version
-FILE_REVISION = "3"   # The current project file format revision
+FILE_REVISION = "4"   # The current project file format revision
 HEX_VERSION = 0x0105
 
 NUM_VERSION = {
@@ -70,8 +70,6 @@ class XMLReadState(Enum):
     PARSED_OK       = 5
     WAS_LEGACY      = 6
 
-# END Class XMLReadState
-
 
 class ProjectXMLReader:
     """Core: Project XML Reader
@@ -109,6 +107,8 @@ class ProjectXMLReader:
         Rev 2: Drops the title node from project and adds the TEMPLATE
                class for items. 2.3 Beta 1.
         Rev 3: Added TEMPLATE class. 2.3.
+        Rev 4: Added shape attribute to status and importance entry
+               nodes. 2.5.
     """
 
     def __init__(self, path: str | Path) -> None:
@@ -356,8 +356,8 @@ class ProjectXMLReader:
         logger.debug("Parsing <content> section (legacy format)")
 
         # Create maps to look up name -> key for status and importance
-        statusMap = {entry.get("name"): key for key, entry in data.itemStatus.items()}
-        importMap = {entry.get("name"): key for key, entry in data.itemImport.items()}
+        sMap: dict[str | None, str] = {e.name: k for k, e in data.itemStatus.iterItems()}
+        iMap: dict[str | None, str] = {e.name: k for k, e in data.itemImport.iterItems()}
 
         for xItem in xSection:
             if xItem.tag != "item":
@@ -404,9 +404,9 @@ class ProjectXMLReader:
 
             # Status was split into separate status/import with a key in 1.4
             if item.get("class", "") in ("NOVEL", "ARCHIVE"):
-                name["status"] = statusMap.get(tmpStatus, None)
+                name["status"] = sMap.get(tmpStatus, None)
             else:
-                name["import"] = importMap.get(tmpStatus, None)
+                name["import"] = iMap.get(tmpStatus, None)
 
             # A number of layouts were removed in 1.3
             if item.get("layout", "") in (
@@ -436,7 +436,8 @@ class ProjectXMLReader:
                 green = checkInt(xEntry.attrib.get("green", 0), 0)
                 blue  = checkInt(xEntry.attrib.get("blue", 0), 0)
                 count = checkInt(xEntry.attrib.get("count", 0), 0)
-                sObject.write(key, xEntry.text or "", (red, green, blue), count)
+                shape = xEntry.attrib.get("shape", "")
+                sObject.add(key, xEntry.text or "", (red, green, blue), shape, count)
         return
 
     def _parseDictKeyText(self, xItem: ET.Element) -> dict:
@@ -455,8 +456,6 @@ class ProjectXMLReader:
         """
         return {xNode.tag: checkString(xNode.text, "") for xNode in xItem}
 
-# END Class ProjectXMLReader
-
 
 class ProjectXMLWriter:
     """Core: Project XML Writer
@@ -576,5 +575,3 @@ class ProjectXMLWriter:
                 xEntry = ET.SubElement(xItem, "entry", attrib={"key": key})
                 xEntry.text = str(value) or ""
         return
-
-# END Class ProjectXMLWriter

novelwriter/core/sessions.py

@@ -26,14 +26,14 @@ from __future__ import annotations
 import json
 import logging
 
+from collections.abc import Iterable
+from pathlib import Path
 from time import time
 from typing import TYPE_CHECKING
-from pathlib import Path
-from collections.abc import Iterable
 
-from novelwriter.error import logException
 from novelwriter.common import formatTimeStamp
 from novelwriter.constants import nwFiles
+from novelwriter.error import logException
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.core.project import NWProject
@@ -135,5 +135,3 @@ class NWSessionLog:
             "novel": novel, "notes": notes, "idle": idle,
         })
         return f"{data}\n"
-
-# END Class NWSessionLog