Remove project meta attribute from project class

novelwriter/dialogs/wordlist.py

@@ -23,10 +23,11 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import os
 import logging
 import novelwriter
 
+from pathlib import Path
+
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import (
     QDialog, QDialogButtonBox, QVBoxLayout, QHBoxLayout, QListWidget,
@@ -150,9 +151,11 @@ class GuiWordList(QDialog):
         """
         self._saveGuiSettings()
 
-        dctFile = os.path.join(self.theProject.projMeta, nwFiles.PROJ_DICT)
-        tmpFile = dctFile + "~"
+        dctFile = self.theProject.storage.getMetaFile(nwFiles.PROJ_DICT)
+        if not isinstance(dctFile, Path):
+            return False
 
+        tmpFile = dctFile.with_suffix(".tmp")
         try:
             with open(tmpFile, mode="w", encoding="utf-8") as outFile:
                 for i in range(self.listBox.count()):
@@ -160,15 +163,16 @@ class GuiWordList(QDialog):
                     if item is not None:
                         outFile.write(item.text() + "\n")
 
+            if dctFile.exists():
+                dctFile.unlink()
+            tmpFile.rename(dctFile)
+
         except Exception:
             logger.error("Could not save new word list")
             logException()
             self.reject()
             return False
 
-        if os.path.isfile(dctFile):
-            os.unlink(dctFile)
-        os.rename(tmpFile, dctFile)
         self.accept()
 
         return True
@@ -187,10 +191,12 @@ class GuiWordList(QDialog):
     def _loadWordList(self):
         """Load the project's word list, if it exists.
         """
-        self.listBox.clear()
+        wordList = self.theProject.storage.getMetaFile(nwFiles.PROJ_DICT)
+        if not isinstance(wordList, Path):
+            return False
 
-        wordList = os.path.join(self.theProject.projMeta, nwFiles.PROJ_DICT)
-        if not os.path.isfile(wordList):
+        self.listBox.clear()
+        if not wordList.exists():
             logger.debug("No project dictionary file found")
             return False