Move the remaining project meta settings to project data class

tests/test_core/test_core_project.py

@@ -555,22 +555,22 @@ def testCoreProject_Save(monkeypatch, nwMinimal, mockGUI, refDir):
         assert os.path.isfile(backFile) is False
 
     # Successful save
-    saveCount = theProject.saveCount
-    autoCount = theProject.autoCount
+    saveCount = theProject.data.saveCount
+    autoCount = theProject.data.autoCount
     assert theProject.saveProject() is True
-    assert theProject.saveCount == saveCount + 1
-    assert theProject.autoCount == autoCount
+    assert theProject.data.saveCount == saveCount + 1
+    assert theProject.data.autoCount == autoCount
     assert cmpFiles(testFile, compFile, ignoreStart=XML_IGNORE)
 
     # Check that a second save creates a .bak file
     assert os.path.isfile(backFile) is True
 
     # Successful autosave
-    saveCount = theProject.saveCount
-    autoCount = theProject.autoCount
+    saveCount = theProject.data.saveCount
+    autoCount = theProject.data.autoCount
     assert theProject.saveProject(autoSave=True) is True
-    assert theProject.saveCount == saveCount
-    assert theProject.autoCount == autoCount + 1
+    assert theProject.data.saveCount == saveCount
+    assert theProject.data.autoCount == autoCount + 1
     assert cmpFiles(testFile, compFile, ignoreStart=XML_IGNORE)
 
     # Close test project
@@ -902,30 +902,31 @@ def testCoreProject_Methods(monkeypatch, mockGUI, tmpDir, fncDir, mockRnd):
     assert theProject.data.name == "A Name"
 
     # Project Title
-    theProject.setBookTitle("  A Title ")
-    assert theProject.bookTitle == "A Title"
+    theProject.data.setTitle("  A Title ")
+    assert theProject.data.title == "A Title"
 
     # Project Authors
     # Check that the list is cleaned up and that it can be extracted as
     # a properly formatted string, depending on number of names
-    assert not theProject.setBookAuthors([])
-    assert theProject.setBookAuthors(" Jane Doe \n John Doh \n ")
-    assert theProject.bookAuthors == ["Jane Doe", "John Doh"]
+    theProject.data.setAuthors([])
+    assert theProject.data.authors == []
+    theProject.data.setAuthors(" Jane Doe \n John Doh \n ")
+    assert theProject.data.authors == ["Jane Doe", "John Doh"]
 
-    assert theProject.setBookAuthors("")
-    assert theProject.getAuthors() == ""
+    theProject.data.setAuthors("")
+    assert theProject.data.getAuthors() == ""
 
-    assert theProject.setBookAuthors("Jane Doe")
-    assert theProject.getAuthors() == "Jane Doe"
+    theProject.data.setAuthors("Jane Doe")
+    assert theProject.data.getAuthors() == "Jane Doe"
 
-    assert theProject.setBookAuthors("Jane Doe\nJohn Doh")
-    assert theProject.getAuthors() == "Jane Doe and John Doh"
+    theProject.data.setAuthors("Jane Doe\nJohn Doh")
+    assert theProject.data.getAuthors() == "Jane Doe and John Doh"
 
-    assert theProject.setBookAuthors("Jane Doe\nJohn Doh\nBod Owens")
-    assert theProject.getAuthors() == "Jane Doe, John Doh and Bod Owens"
+    theProject.data.setAuthors("Jane Doe\nJohn Doh\nBod Owens")
+    assert theProject.data.getAuthors() == "Jane Doe, John Doh and Bod Owens"
 
     # Edit Time
-    theProject.editTime = 1234
+    theProject.data.setEditTime(1234)
     theProject.projOpened = 1600000000
     with monkeypatch.context() as mp:
         mp.setattr("novelwriter.core.project.time", lambda: 1600005600)

tests/test_dialogs/test_dlg_projdetails.py

@@ -55,7 +55,7 @@ def testDlgProjDetails_Dialog(qtbot, nwGUI, nwLipsum):
     assert projDet.tabMain.wordCountVal.text() == f"{3000:n}"
     assert projDet.tabMain.chapCountVal.text() == f"{3:n}"
     assert projDet.tabMain.sceneCountVal.text() == f"{5:n}"
-    assert projDet.tabMain.revCountVal.text() == f"{nwGUI.theProject.saveCount:n}"
+    assert projDet.tabMain.revCountVal.text() == f"{nwGUI.theProject.data.saveCount:n}"
 
     assert projDet.tabMain.projPathVal.text() == nwLipsum
 

tests/test_dialogs/test_dlg_projsettings.py

@@ -96,7 +96,7 @@ def testDlgProjSettings_Main(qtbot, monkeypatch, nwGUI, fncDir, fncProj, mockRnd
     # Set some values
     theProject = nwGUI.theProject
     theProject.setSpellLang("en")
-    theProject.setBookAuthors("Jane Smith\nJohn Smith")
+    theProject.data.setAuthors("Jane Smith\nJohn Smith")
     theProject.setAutoReplace({"A": "B", "C": "D"})
 
     # Create Dialog
@@ -137,8 +137,8 @@ def testDlgProjSettings_Main(qtbot, monkeypatch, nwGUI, fncDir, fncProj, mockRnd
 
     projSettings._doSave()
     assert theProject.data.name == "Project Name"
-    assert theProject.bookTitle == "Project Title"
-    assert theProject.bookAuthors == ["Jane Doe", "John Doh"]
+    assert theProject.data.title == "Project Title"
+    assert theProject.data.authors == ["Jane Doe", "John Doh"]
 
     # Clean up
     projSettings._doClose()

tests/test_gui/test_gui_guimain.py

@@ -172,9 +172,9 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
     assert nwGUI.theProject.tree.trashRoot() is None
     assert nwGUI.theProject.projPath is None
     assert nwGUI.theProject.projMeta is None
-    assert nwGUI.theProject.data.name == "New Project"
-    assert nwGUI.theProject.bookTitle == ""
-    assert len(nwGUI.theProject.bookAuthors) == 0
+    assert nwGUI.theProject.data.name == ""
+    assert nwGUI.theProject.data.title == ""
+    assert nwGUI.theProject.data.authors == []
     assert not nwGUI.theProject.spellCheck
 
     # Check the files
@@ -195,8 +195,8 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
     assert nwGUI.theProject.projPath == fncProj
     assert nwGUI.theProject.projMeta == os.path.join(fncProj, "meta")
     assert nwGUI.theProject.data.name == "New Project"
-    assert nwGUI.theProject.bookTitle == "New Novel"
-    assert len(nwGUI.theProject.bookAuthors) == 1
+    assert nwGUI.theProject.data.title == "New Novel"
+    assert nwGUI.theProject.data.authors == ["Jane Doe"]
     assert nwGUI.theProject.spellCheck is False
 
     # Check that tree items have been created

tests/tools.py

@@ -168,8 +168,8 @@ def buildTestProject(theObject, projPath):
     theProject.clearProject()
     theProject.setProjectPath(projPath, newProject=True)
     theProject.data.setName("New Project")
-    theProject.setBookTitle("New Novel")
-    theProject.setBookAuthors("Jane Doe")
+    theProject.data.setTitle("New Novel")
+    theProject.data.setAuthors("Jane Doe")
 
     # Creating a minimal project with a few root folders and a
     # single chapter folder with a single file.