Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change file format to save dictionaries consistently

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2022-10-31 22:37:05 +01:00
parent 13b9e5a434
commit a88a2f5b40
13 changed files with 220 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/core/project.py
+20 -15
View File
@@ -24,6 +24,8 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
""" """
from __future__ import annotations
import os import os
import json import json
import shutil import shutil
@@ -46,7 +48,7 @@ from novelwriter.core.options import OptionState
from novelwriter.core.document import NWDoc from novelwriter.core.document import NWDoc
from novelwriter.core.projectxml import ProjectXMLReader, ProjectXMLWriter, XMLReadState from novelwriter.core.projectxml import ProjectXMLReader, ProjectXMLWriter, XMLReadState
from novelwriter.common import ( from novelwriter.common import (
checkBool, checkInt, checkString, checkStringNone, formatTimeStamp, hexToInt, isHandle, checkBool, checkInt, checkStringNone, formatTimeStamp, hexToInt, isHandle,
makeFileNameSafe, minmax, simplified, makeFileNameSafe, minmax, simplified,
) )
@@ -122,7 +124,7 @@ class NWProject(QObject):
@property @property
def projChanged(self): def projChanged(self):
return self._projChanged or self._data.changed return self._projChanged
@property @property
def projAltered(self): def projAltered(self):
@@ -596,7 +598,9 @@ class NWProject(QObject):
content = self._projTree.pack() content = self._projTree.pack()
xmlWriter = ProjectXMLWriter(self.projPath) xmlWriter = ProjectXMLWriter(self.projPath)
if not xmlWriter.write(self._data, content, saveTime, editTime): if not xmlWriter.write(self._data, content, saveTime, editTime):
self.mainGui.makeAlert(self.tr("Failed to save project."), nwAlert.ERROR) self.mainGui.makeAlert(self.tr(
"Failed to save project."
), nwAlert.ERROR, exception=xmlWriter.error)
return False return False
# Save project GUI options # Save project GUI options
@@ -1331,17 +1335,18 @@ class NWProjectData:
self._language = None self._language = None
self._spellCheck = False self._spellCheck = False
self._spellLang = None self._spellLang = None
self._lastHandle = {
"editor": "",
"viewer": "",
"novelTree": "",
"outline": "",
}
self._lastCount = {}
self._currCount = {}
self._autoReplace = {} # Project Dictionaries
self._titleFormat = { self._lastCount: dict[str, int] = {}
self._currCount: dict[str, int] = {}
self._lastHandle: dict[str, str | None] = {
"editor": None,
"viewer": None,
"novelTree": None,
"outline": None,
}
self._autoReplace: dict[str, str] = {}
self._titleFormat: dict[str, str] = {
"title": "%title%", "title": "%title%",
"chapter": "%title%", "chapter": "%title%",
"unnumbered": "%title%", "unnumbered": "%title%",
@@ -1562,12 +1567,12 @@ class NWProjectData:
values. values.
""" """
if isinstance(component, str): if isinstance(component, str):
self._lastHandle[component] = checkString(value, "") self._lastHandle[component] = checkStringNone(value, None)
self.theProject.setProjectChanged(True) self.theProject.setProjectChanged(True)
elif isinstance(value, dict): elif isinstance(value, dict):
for key, entry in value.items(): for key, entry in value.items():
if key in self._lastHandle: if key in self._lastHandle:
self._lastHandle[key] = checkString(entry, "") self._lastHandle[key] = str(entry) if isHandle(entry) else None
self.theProject.setProjectChanged(True) self.theProject.setProjectChanged(True)
return return
novelwriter/core/projectxml.py
+60 -48
View File
@@ -266,11 +266,7 @@ class ProjectXMLReader:
projData.setSpellCheck(xItem.text) projData.setSpellCheck(xItem.text)
elif xItem.tag == "spellLang": elif xItem.tag == "spellLang":
projData.setSpellLang(xItem.text) projData.setSpellLang(xItem.text)
elif xItem.tag == "lastEdited": # Discontinued in 1.4 elif xItem.tag == "totalWordCount":
projData.setLastHandle(xItem.text, "editor")
elif xItem.tag == "lastViewed": # Discontinued in 1.4
projData.setLastHandle(xItem.text, "viewer")
elif xItem.tag == "lastWordCount":
projData.setLastCount(xItem.text, "total") projData.setLastCount(xItem.text, "total")
elif xItem.tag == "novelWordCount": elif xItem.tag == "novelWordCount":
projData.setLastCount(xItem.text, "novel") projData.setLastCount(xItem.text, "novel")
@@ -281,16 +277,30 @@ class ProjectXMLReader:
elif xItem.tag in ("import", "importance"): elif xItem.tag in ("import", "importance"):
self._parseStatusImport(xItem, projData.itemImport) self._parseStatusImport(xItem, projData.itemImport)
elif xItem.tag == "lastHandle": elif xItem.tag == "lastHandle":
projData.setLastHandle(self._parseDictKeyText(xItem, "component")) projData.setLastHandle(self._parseDictKeyText(xItem))
elif xItem.tag == "autoReplace": elif xItem.tag == "autoReplace":
if self._version >= 0x0102: if self._version >= 0x0102:
projData.setAutoReplace(self._parseDictKeyText(xItem, "key")) projData.setAutoReplace(self._parseDictKeyText(xItem))
else: # Pre 1.2 format else: # Pre 1.2 format
projData.setAutoReplace(self._parseDictTagText(xItem)) projData.setAutoReplace(self._parseDictTagText(xItem))
elif xItem.tag == "titleFormat": elif xItem.tag == "titleFormat":
projData.setTitleFormat(self._parseDictTagText(xItem)) if self._version >= 0x0104:
projData.setTitleFormat(self._parseDictKeyText(xItem))
else: # Pre 1.4 format
projData.setTitleFormat(self._parseDictTagText(xItem))
else: else:
logger.warning("Ignored <root/settings/%s> in xml", xItem.tag) if self._version < 0x0104:
# Convert some deprecated fields
if xItem.tag == "lastEdited": # Discontinued in 1.4
projData.setLastHandle(xItem.text, "editor")
elif xItem.tag == "lastViewed": # Discontinued in 1.4
projData.setLastHandle(xItem.text, "viewer")
elif xItem.tag == "lastWordCount": # Renamed in 1.4
projData.setLastCount(xItem.text, "total")
else:
logger.warning("Ignored <root/settings/%s> in xml", xItem.tag)
else:
logger.warning("Ignored <root/settings/%s> in xml", xItem.tag)
return True return True
@@ -419,14 +429,14 @@ class ProjectXMLReader:
self._importMap = {entry["name"]: key for key, entry in projData.itemImport.items()} self._importMap = {entry["name"]: key for key, entry in projData.itemImport.items()}
return return
def _parseDictKeyText(self, xItem, keyName): def _parseDictKeyText(self, xItem):
"""Parse a dictionary stored with key as an attribute and the """Parse a dictionary stored with key as an attribute and the
value as the text porperty. value as the text porperty.
""" """
result = {} result = {}
for xEntry in xItem: for xEntry in xItem:
if xEntry.tag == "entry" and keyName in xEntry.attrib: if xEntry.tag == "entry" and "key" in xEntry.attrib:
result[xEntry.attrib[keyName]] = checkString(xEntry.text, "") result[xEntry.attrib["key"]] = checkString(xEntry.text, "")
return result return result
def _parseDictTagText(self, xItem): def _parseDictTagText(self, xItem):
@@ -447,7 +457,21 @@ class ProjectXMLWriter:
return return
##
# Properties
##
@property
def error(self):
return self._error
##
# Methods
##
def write(self, projData, projContent, saveTime, editTime): def write(self, projData, projContent, saveTime, editTime):
"""Write the project data and content to the XML files.
"""
nwXML = etree.Element("novelWriterXML", attrib={ nwXML = etree.Element("novelWriterXML", attrib={
"appVersion": str(novelwriter.__version__), "appVersion": str(novelwriter.__version__),
@@ -471,27 +495,24 @@ class ProjectXMLWriter:
self._packSingleValue(xSettings, "language", projData.language) self._packSingleValue(xSettings, "language", projData.language)
self._packSingleValue(xSettings, "spellCheck", projData.spellCheck) self._packSingleValue(xSettings, "spellCheck", projData.spellCheck)
self._packSingleValue(xSettings, "spellLang", projData.spellLang) self._packSingleValue(xSettings, "spellLang", projData.spellLang)
self._packSingleValue(xSettings, "lastWordCount", projData.getCurrCount("total")) self._packSingleValue(xSettings, "totalWordCount", projData.getCurrCount("total"))
self._packSingleValue(xSettings, "novelWordCount", projData.getCurrCount("novel")) self._packSingleValue(xSettings, "novelWordCount", projData.getCurrCount("novel"))
self._packSingleValue(xSettings, "notesWordCount", projData.getCurrCount("notes")) self._packSingleValue(xSettings, "notesWordCount", projData.getCurrCount("notes"))
self._packDictKeyValue(xSettings, "lastHandle", projData.lastHandle, "component") self._packDictKeyValue(xSettings, "lastHandle", projData.lastHandle)
self._packDictKeyValue(xSettings, "autoReplace", projData.autoReplace, "key") self._packDictKeyValue(xSettings, "autoReplace", projData.autoReplace)
self._packDictTagValue(xSettings, "titleFormat", projData.titleFormat) self._packDictKeyValue(xSettings, "titleFormat", projData.titleFormat)
# Save Status/Importance # Save Status/Importance
xStatus = etree.SubElement(xSettings, "status") xStatus = etree.SubElement(xSettings, "status")
for (label, attr) in projData.itemStatus.pack(): for label, attrib in projData.itemStatus.pack():
xEntry = etree.SubElement(xStatus, "entry", attrib=attr) self._packSingleValue(xStatus, "entry", label, attrib=attrib)
xEntry.text = label
xImport = etree.SubElement(xSettings, "importance") xImport = etree.SubElement(xSettings, "importance")
for (label, attr) in projData.itemImport.pack(): for label, attrib in projData.itemImport.pack():
xEntry = etree.SubElement(xImport, "entry", attrib=attr) self._packSingleValue(xImport, "entry", label, attrib=attrib)
xEntry.text = label
# Save Tree Content # Save Tree Content
cAttr = {"count": str(len(projContent))} xContent = etree.SubElement(nwXML, "content", attrib={"count": str(len(projContent))})
xContent = etree.SubElement(nwXML, "content", attrib=cAttr)
for item in projContent: for item in projContent:
xItem = etree.SubElement(xContent, "item", attrib=item.get("itemAttr", {})) xItem = etree.SubElement(xContent, "item", attrib=item.get("itemAttr", {}))
etree.SubElement(xItem, "meta", attrib=item.get("metaAttr", {})) etree.SubElement(xItem, "meta", attrib=item.get("metaAttr", {}))
@@ -499,8 +520,8 @@ class ProjectXMLWriter:
xName.text = item["name"] xName.text = item["name"]
# Write the xml tree to file # Write the xml tree to file
tempFile = os.path.join(self._path, nwFiles.PROJ_FILE+"~")
saveFile = os.path.join(self._path, nwFiles.PROJ_FILE) saveFile = os.path.join(self._path, nwFiles.PROJ_FILE)
tempFile = os.path.join(self._path, nwFiles.PROJ_FILE+"~")
backFile = os.path.join(self._path, nwFiles.PROJ_FILE[:-3]+"bak") backFile = os.path.join(self._path, nwFiles.PROJ_FILE[:-3]+"bak")
try: try:
with open(tempFile, mode="wb") as outFile: with open(tempFile, mode="wb") as outFile:
@@ -510,7 +531,8 @@ class ProjectXMLWriter:
encoding="utf-8", encoding="utf-8",
xml_declaration=True xml_declaration=True
)) ))
except Exception: except Exception as exc:
self._error = exc
return False return False
# If we're here, the file was successfully saved, # If we're here, the file was successfully saved,
@@ -519,7 +541,8 @@ class ProjectXMLWriter:
if os.path.isfile(saveFile): if os.path.isfile(saveFile):
os.replace(saveFile, backFile) os.replace(saveFile, backFile)
os.replace(tempFile, saveFile) os.replace(tempFile, saveFile)
except OSError: except OSError as exc:
self._error = exc
return False return False
return True return True
@@ -528,40 +551,29 @@ class ProjectXMLWriter:
# Internal Functions # Internal Functions
## ##
def _packSingleValue(self, xParent, name, value, allowNone=True): def _packSingleValue(self, xParent, name, value, attrib=None):
"""Pack a list of values into an xml element. """Pack a single value into an xml element.
""" """
if (value == "" or value is None) and not allowNone: xItem = etree.SubElement(xParent, name, attrib=attrib)
return xItem.text = str(value) or ""
xItem = etree.SubElement(xParent, name)
xItem.text = str(value)
return return
def _packListValue(self, xParent, name, data, allowNone=True): def _packListValue(self, xParent, name, data):
"""Pack a list of values into an xml element. """Pack a list of values into an xml element.
""" """
for value in data: for value in data:
self._packSingleValue(xParent, name, value, allowNone=allowNone) xItem = etree.SubElement(xParent, name)
xItem.text = str(value) or ""
return return
def _packDictKeyValue(self, xParent, name, data, keyName): def _packDictKeyValue(self, xParent, name, data):
"""Pack the entries of a dictionary into an xml element. """Pack the entries of a dictionary into an xml element.
""" """
xItem = etree.SubElement(xParent, name) xItem = etree.SubElement(xParent, name)
for key, value in data.items(): for key, value in data.items():
if len(key) > 0: if len(key) > 0:
xEntry = etree.SubElement(xItem, "entry", attrib={keyName: key}) xEntry = etree.SubElement(xItem, "entry", attrib={"key": key})
if value: xEntry.text = str(value) or ""
xEntry.text = value
return
def _packDictTagValue(self, xParent, name, data):
"""Pack the entries of a dictionary into an xml element.
"""
xItem = etree.SubElement(xParent, name)
for aKey, value in data.items():
if len(aKey) > 0:
self._packSingleValue(xItem, aKey, value)
return return
# END Class ProjectXMLWriter # END Class ProjectXMLWriter
sample/nwProject.nwx
+13 -13
View File
@@ -1,27 +1,27 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 21:24:31"> <novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 22:33:20">
<project> <project>
<name>Sample Project</name> <name>Sample Project</name>
<title>Sample Project</title> <title>Sample Project</title>
<author>Jane Smith</author> <author>Jane Smith</author>
<author>Jay Doh</author> <author>Jay Doh</author>
<saveCount>1403</saveCount> <saveCount>1407</saveCount>
<autoCount>236</autoCount> <autoCount>236</autoCount>
<editTime>69454</editTime> <editTime>69424</editTime>
</project> </project>
<settings> <settings>
<doBackup>False</doBackup> <doBackup>False</doBackup>
<language>en_GB</language> <language>en_GB</language>
<spellCheck>True</spellCheck> <spellCheck>True</spellCheck>
<spellLang>None</spellLang> <spellLang>None</spellLang>
<lastWordCount>1363</lastWordCount> <totalWordCount>1363</totalWordCount>
<novelWordCount>954</novelWordCount> <novelWordCount>954</novelWordCount>
<notesWordCount>409</notesWordCount> <notesWordCount>409</notesWordCount>
<lastHandle> <lastHandle>
<entry component="editor">636b6aa9b697b</entry> <entry key="editor">636b6aa9b697b</entry>
<entry component="viewer">636b6aa9b697b</entry> <entry key="viewer">636b6aa9b697b</entry>
<entry component="novelTree">7031beac91f75</entry> <entry key="novelTree">7031beac91f75</entry>
<entry component="outline">7031beac91f75</entry> <entry key="outline">7031beac91f75</entry>
</lastHandle> </lastHandle>
<autoReplace> <autoReplace>
<entry key="A">B</entry> <entry key="A">B</entry>
@@ -29,11 +29,11 @@
<entry key="C">D</entry> <entry key="C">D</entry>
</autoReplace> </autoReplace>
<titleFormat> <titleFormat>
<title>%title%</title> <entry key="title">%title%</entry>
<chapter>Chapter %chw%: %title%</chapter> <entry key="chapter">Chapter %chw%: %title%</entry>
<unnumbered>%title%</unnumbered> <entry key="unnumbered">%title%</entry>
<scene>Scene %ch%.%sc%: %title%</scene> <entry key="scene">Scene %ch%.%sc%: %title%</entry>
<section></section> <entry key="section"></entry>
</titleFormat> </titleFormat>
<status> <status>
<entry key="sf12341" count="4" red="100" green="100" blue="100">New</entry> <entry key="sf12341" count="4" red="100" green="100" blue="100">New</entry>
tests/lipsum/nwProject.nwx
+15 -13
View File
@@ -1,35 +1,37 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-17 21:17:31"> <novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 22:17:38">
<project> <project>
<name>Lorem Ipsum</name> <name>Lorem Ipsum</name>
<title>Lorem Ipsum</title> <title>Lorem Ipsum</title>
<author>lipsum.com</author> <author>lipsum.com</author>
<saveCount>28</saveCount> <saveCount>32</saveCount>
<autoCount>24</autoCount> <autoCount>24</autoCount>
<editTime>1874</editTime> <editTime>1889</editTime>
</project> </project>
<settings> <settings>
<doBackup>False</doBackup> <doBackup>False</doBackup>
<language>en_GB</language> <language>en_GB</language>
<spellCheck>False</spellCheck> <spellCheck>False</spellCheck>
<spellLang>None</spellLang> <spellLang>None</spellLang>
<lastEdited>7a992350f3eb6</lastEdited> <totalWordCount>3847</totalWordCount>
<lastViewed>None</lastViewed>
<lastNovel>None</lastNovel>
<lastOutline>None</lastOutline>
<lastWordCount>3847</lastWordCount>
<novelWordCount>3109</novelWordCount> <novelWordCount>3109</novelWordCount>
<notesWordCount>738</notesWordCount> <notesWordCount>738</notesWordCount>
<lastHandle>
<entry key="editor">7a992350f3eb6</entry>
<entry key="viewer">None</entry>
<entry key="novelTree">b3643d0f92e32</entry>
<entry key="outline">None</entry>
</lastHandle>
<autoReplace> <autoReplace>
<entry key="Rep1">Replace Text 1</entry> <entry key="Rep1">Replace Text 1</entry>
<entry key="Rep2">Replace Text 2</entry> <entry key="Rep2">Replace Text 2</entry>
</autoReplace> </autoReplace>
<titleFormat> <titleFormat>
<title>%title%</title> <entry key="title">%title%</entry>
<chapter>Chapter %ch%: %title%</chapter> <entry key="chapter">Chapter %ch%: %title%</entry>
<unnumbered>%title%</unnumbered> <entry key="unnumbered">%title%</entry>
<scene>* * *</scene> <entry key="scene">* * *</entry>
<section></section> <entry key="section"></entry>
</titleFormat> </titleFormat>
<status> <status>
<entry key="sbaa94f" count="3" red="100" green="100" blue="100">New</entry> <entry key="sbaa94f" count="3" red="100" green="100" blue="100">New</entry>
tests/minimal/nwProject.nwx
+15 -13
View File
@@ -1,33 +1,35 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-30 23:46:07"> <novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 22:17:45">
<project> <project>
<name>Test Minimal</name> <name>Test Minimal</name>
<title>Minimal</title> <title>Minimal</title>
<author>Jane Doe</author> <author>Jane Doe</author>
<author>John Doh</author> <author>John Doh</author>
<saveCount>21</saveCount> <saveCount>25</saveCount>
<autoCount>2</autoCount> <autoCount>2</autoCount>
<editTime>177</editTime> <editTime>203</editTime>
</project> </project>
<settings> <settings>
<doBackup>True</doBackup> <doBackup>True</doBackup>
<language>en_GB</language> <language>en_GB</language>
<spellCheck>False</spellCheck> <spellCheck>False</spellCheck>
<spellLang>None</spellLang> <spellLang>None</spellLang>
<lastEdited>None</lastEdited> <totalWordCount>10</totalWordCount>
<lastViewed>None</lastViewed>
<lastNovel>a508bb932959c</lastNovel>
<lastOutline>None</lastOutline>
<lastWordCount>10</lastWordCount>
<novelWordCount>10</novelWordCount> <novelWordCount>10</novelWordCount>
<notesWordCount>0</notesWordCount> <notesWordCount>0</notesWordCount>
<lastHandle>
<entry key="editor">None</entry>
<entry key="viewer">None</entry>
<entry key="novelTree">a508bb932959c</entry>
<entry key="outline">None</entry>
</lastHandle>
<autoReplace/> <autoReplace/>
<titleFormat> <titleFormat>
<title>%title%</title> <entry key="title">%title%</entry>
<chapter>Chapter %ch%: %title%</chapter> <entry key="chapter">Chapter %ch%: %title%</entry>
<unnumbered>%title%</unnumbered> <entry key="unnumbered">%title%</entry>
<scene>* * *</scene> <entry key="scene">* * *</entry>
<section></section> <entry key="section"></entry>
</titleFormat> </titleFormat>
<status> <status>
<entry key="s72322d" count="5" red="100" green="100" blue="100">New</entry> <entry key="s72322d" count="5" red="100" green="100" blue="100">New</entry>
tests/mock.py
+5 -1
View File
@@ -19,14 +19,18 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
""" """
from PyQt5.QtCore import QObject
# =========================================================================== # # =========================================================================== #
# Mock GUI # Mock GUI
# =========================================================================== # # =========================================================================== #
class MockGuiMain: class MockGuiMain(QObject):
def __init__(self): def __init__(self):
super().__init__()
self.mainConf = None self.mainConf = None
self.hasProject = True self.hasProject = True
self.theProject = None self.theProject = None
tests/reference/coreProject_NewCustomA_nwProject.nwx
+13 -11
View File
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-30 23:48:41"> <novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 22:20:45">
<project> <project>
<name>Test Custom</name> <name>Test Custom</name>
<title>Test Novel</title> <title>Test Novel</title>
@@ -14,20 +14,22 @@
<language>None</language> <language>None</language>
<spellCheck>False</spellCheck> <spellCheck>False</spellCheck>
<spellLang>None</spellLang> <spellLang>None</spellLang>
<lastEdited>None</lastEdited> <totalWordCount>0</totalWordCount>
<lastViewed>None</lastViewed>
<lastNovel>None</lastNovel>
<lastOutline>None</lastOutline>
<lastWordCount>0</lastWordCount>
<novelWordCount>0</novelWordCount> <novelWordCount>0</novelWordCount>
<notesWordCount>0</notesWordCount> <notesWordCount>0</notesWordCount>
<lastHandle>
<entry key="editor">None</entry>
<entry key="viewer">None</entry>
<entry key="novelTree">None</entry>
<entry key="outline">None</entry>
</lastHandle>
<autoReplace/> <autoReplace/>
<titleFormat> <titleFormat>
<title>%title%</title> <entry key="title">%title%</entry>
<chapter>%title%</chapter> <entry key="chapter">%title%</entry>
<unnumbered>%title%</unnumbered> <entry key="unnumbered">%title%</entry>
<scene>* * *</scene> <entry key="scene">* * *</entry>
<section></section> <entry key="section"></entry>
</titleFormat> </titleFormat>
<status> <status>
<entry key="s000008" count="15" red="100" green="100" blue="100">New</entry> <entry key="s000008" count="15" red="100" green="100" blue="100">New</entry>
tests/reference/coreProject_NewCustomB_nwProject.nwx
+13 -11
View File
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-30 23:48:41"> <novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 22:20:45">
<project> <project>
<name>Test Custom</name> <name>Test Custom</name>
<title>Test Novel</title> <title>Test Novel</title>
@@ -14,20 +14,22 @@
<language>None</language> <language>None</language>
<spellCheck>False</spellCheck> <spellCheck>False</spellCheck>
<spellLang>None</spellLang> <spellLang>None</spellLang>
<lastEdited>None</lastEdited> <totalWordCount>0</totalWordCount>
<lastViewed>None</lastViewed>
<lastNovel>None</lastNovel>
<lastOutline>None</lastOutline>
<lastWordCount>0</lastWordCount>
<novelWordCount>0</novelWordCount> <novelWordCount>0</novelWordCount>
<notesWordCount>0</notesWordCount> <notesWordCount>0</notesWordCount>
<lastHandle>
<entry key="editor">None</entry>
<entry key="viewer">None</entry>
<entry key="novelTree">None</entry>
<entry key="outline">None</entry>
</lastHandle>
<autoReplace/> <autoReplace/>
<titleFormat> <titleFormat>
<title>%title%</title> <entry key="title">%title%</entry>
<chapter>%title%</chapter> <entry key="chapter">%title%</entry>
<unnumbered>%title%</unnumbered> <entry key="unnumbered">%title%</entry>
<scene>* * *</scene> <entry key="scene">* * *</entry>
<section></section> <entry key="section"></entry>
</titleFormat> </titleFormat>
<status> <status>
<entry key="s000008" count="9" red="100" green="100" blue="100">New</entry> <entry key="s000008" count="9" red="100" green="100" blue="100">New</entry>
tests/reference/coreProject_NewFileFolder_nwProject.nwx
+13 -11
View File
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 20:02:22"> <novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 22:20:45">
<project> <project>
<name>New Project</name> <name>New Project</name>
<title>New Novel</title> <title>New Novel</title>
@@ -13,20 +13,22 @@
<language>None</language> <language>None</language>
<spellCheck>False</spellCheck> <spellCheck>False</spellCheck>
<spellLang>None</spellLang> <spellLang>None</spellLang>
<lastEdited>None</lastEdited> <totalWordCount>13</totalWordCount>
<lastViewed>None</lastViewed>
<lastNovel>None</lastNovel>
<lastOutline>None</lastOutline>
<lastWordCount>13</lastWordCount>
<novelWordCount>10</novelWordCount> <novelWordCount>10</novelWordCount>
<notesWordCount>3</notesWordCount> <notesWordCount>3</notesWordCount>
<lastHandle>
<entry key="editor">None</entry>
<entry key="viewer">None</entry>
<entry key="novelTree">None</entry>
<entry key="outline">None</entry>
</lastHandle>
<autoReplace/> <autoReplace/>
<titleFormat> <titleFormat>
<title>%title%</title> <entry key="title">%title%</entry>
<chapter>%title%</chapter> <entry key="chapter">%title%</entry>
<unnumbered>%title%</unnumbered> <entry key="unnumbered">%title%</entry>
<scene>* * *</scene> <entry key="scene">* * *</entry>
<section></section> <entry key="section"></entry>
</titleFormat> </titleFormat>
<status> <status>
<entry key="s000000" count="7" red="100" green="100" blue="100">New</entry> <entry key="s000000" count="7" red="100" green="100" blue="100">New</entry>
tests/reference/coreProject_NewMinimal_nwProject.nwx
+13 -11
View File
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-30 23:31:31"> <novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 22:20:45">
<project> <project>
<name>New Project</name> <name>New Project</name>
<title>None</title> <title>None</title>
@@ -12,20 +12,22 @@
<language>None</language> <language>None</language>
<spellCheck>False</spellCheck> <spellCheck>False</spellCheck>
<spellLang>None</spellLang> <spellLang>None</spellLang>
<lastEdited>None</lastEdited> <totalWordCount>0</totalWordCount>
<lastViewed>None</lastViewed>
<lastNovel>None</lastNovel>
<lastOutline>None</lastOutline>
<lastWordCount>0</lastWordCount>
<novelWordCount>0</novelWordCount> <novelWordCount>0</novelWordCount>
<notesWordCount>0</notesWordCount> <notesWordCount>0</notesWordCount>
<lastHandle>
<entry key="editor">None</entry>
<entry key="viewer">None</entry>
<entry key="novelTree">None</entry>
<entry key="outline">None</entry>
</lastHandle>
<autoReplace/> <autoReplace/>
<titleFormat> <titleFormat>
<title>%title%</title> <entry key="title">%title%</entry>
<chapter>%title%</chapter> <entry key="chapter">%title%</entry>
<unnumbered>%title%</unnumbered> <entry key="unnumbered">%title%</entry>
<scene>* * *</scene> <entry key="scene">* * *</entry>
<section></section> <entry key="section"></entry>
</titleFormat> </titleFormat>
<status> <status>
<entry key="s000008" count="5" red="100" green="100" blue="100">New</entry> <entry key="s000008" count="5" red="100" green="100" blue="100">New</entry>
tests/reference/coreProject_NewRoot_nwProject.nwx
+13 -11
View File
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 20:02:21"> <novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 22:23:18">
<project> <project>
<name>New Project</name> <name>New Project</name>
<title>New Novel</title> <title>New Novel</title>
@@ -13,20 +13,22 @@
<language>None</language> <language>None</language>
<spellCheck>False</spellCheck> <spellCheck>False</spellCheck>
<spellLang>None</spellLang> <spellLang>None</spellLang>
<lastEdited>None</lastEdited> <totalWordCount>9</totalWordCount>
<lastViewed>None</lastViewed>
<lastNovel>None</lastNovel>
<lastOutline>None</lastOutline>
<lastWordCount>9</lastWordCount>
<novelWordCount>9</novelWordCount> <novelWordCount>9</novelWordCount>
<notesWordCount>0</notesWordCount> <notesWordCount>0</notesWordCount>
<lastHandle>
<entry key="editor">None</entry>
<entry key="viewer">None</entry>
<entry key="novelTree">None</entry>
<entry key="outline">None</entry>
</lastHandle>
<autoReplace/> <autoReplace/>
<titleFormat> <titleFormat>
<title>%title%</title> <entry key="title">%title%</entry>
<chapter>%title%</chapter> <entry key="chapter">%title%</entry>
<unnumbered>%title%</unnumbered> <entry key="unnumbered">%title%</entry>
<scene>* * *</scene> <entry key="scene">* * *</entry>
<section></section> <entry key="section"></entry>
</titleFormat> </titleFormat>
<status> <status>
<entry key="s000000" count="6" red="100" green="100" blue="100">New</entry> <entry key="s000000" count="6" red="100" green="100" blue="100">New</entry>
tests/reference/guiEditor_Main_Final_nwProject.nwx
+14 -12
View File
@@ -1,32 +1,34 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-30 23:53:59"> <novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 22:31:39">
<project> <project>
<name>New Project</name> <name>New Project</name>
<title>New Novel</title> <title>New Novel</title>
<author>Jane Doe</author> <author>Jane Doe</author>
<saveCount>4</saveCount> <saveCount>4</saveCount>
<autoCount>2</autoCount> <autoCount>2</autoCount>
<editTime>3</editTime> <editTime>4</editTime>
</project> </project>
<settings> <settings>
<doBackup>True</doBackup> <doBackup>True</doBackup>
<language>None</language> <language>None</language>
<spellCheck>True</spellCheck> <spellCheck>True</spellCheck>
<spellLang>None</spellLang> <spellLang>None</spellLang>
<lastEdited>000000000000f</lastEdited> <totalWordCount>163</totalWordCount>
<lastViewed>None</lastViewed>
<lastNovel>0000000000008</lastNovel>
<lastOutline>0000000000008</lastOutline>
<lastWordCount>163</lastWordCount>
<novelWordCount>136</novelWordCount> <novelWordCount>136</novelWordCount>
<notesWordCount>27</notesWordCount> <notesWordCount>27</notesWordCount>
<lastHandle>
<entry key="editor">000000000000f</entry>
<entry key="viewer">None</entry>
<entry key="novelTree">0000000000008</entry>
<entry key="outline">0000000000008</entry>
</lastHandle>
<autoReplace/> <autoReplace/>
<titleFormat> <titleFormat>
<title>%title%</title> <entry key="title">%title%</entry>
<chapter>%title%</chapter> <entry key="chapter">%title%</entry>
<unnumbered>%title%</unnumbered> <entry key="unnumbered">%title%</entry>
<scene>* * *</scene> <entry key="scene">* * *</entry>
<section></section> <entry key="section"></entry>
</titleFormat> </titleFormat>
<status> <status>
<entry key="s000000" count="5" red="100" green="100" blue="100">New</entry> <entry key="s000000" count="5" red="100" green="100" blue="100">New</entry>
tests/reference/guiEditor_Main_Initial_nwProject.nwx
+13 -11
View File
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-30 23:53:03"> <novelWriterXML appVersion="2.0-rc1" hexVersion="0x020000c1" fileVersion="1.4" timeStamp="2022-10-31 22:20:53">
<project> <project>
<name>New Project</name> <name>New Project</name>
<title>New Novel</title> <title>New Novel</title>
@@ -13,20 +13,22 @@
<language>None</language> <language>None</language>
<spellCheck>False</spellCheck> <spellCheck>False</spellCheck>
<spellLang>None</spellLang> <spellLang>None</spellLang>
<lastEdited>None</lastEdited> <totalWordCount>9</totalWordCount>
<lastViewed>None</lastViewed>
<lastNovel>None</lastNovel>
<lastOutline>None</lastOutline>
<lastWordCount>9</lastWordCount>
<novelWordCount>9</novelWordCount> <novelWordCount>9</novelWordCount>
<notesWordCount>0</notesWordCount> <notesWordCount>0</notesWordCount>
<lastHandle>
<entry key="editor">None</entry>
<entry key="viewer">None</entry>
<entry key="novelTree">None</entry>
<entry key="outline">None</entry>
</lastHandle>
<autoReplace/> <autoReplace/>
<titleFormat> <titleFormat>
<title>%title%</title> <entry key="title">%title%</entry>
<chapter>%title%</chapter> <entry key="chapter">%title%</entry>
<unnumbered>%title%</unnumbered> <entry key="unnumbered">%title%</entry>
<scene>* * *</scene> <entry key="scene">* * *</entry>
<section></section> <entry key="section"></entry>
</titleFormat> </titleFormat>
<status> <status>
<entry key="s000000" count="5" red="100" green="100" blue="100">New</entry> <entry key="s000000" count="5" red="100" green="100" blue="100">New</entry>