Remove the ToC.json file and change the format of the ToC.txt file a little

nw/constants/constants.py

@@ -59,7 +59,6 @@ class nwFiles():
     PROJ_DICT   = "wordlist.txt"
     PROJ_LOCK   = "nwProject.lock"
     TOC_TXT     = "ToC.txt"
-    TOC_JSON    = "ToC.json"
     SESS_STATS  = "sessionStats.log"
     INDEX_FILE  = "tagsIndex.json"
     OPTS_FILE   = "guiOptions.json"

nw/core/project.py

@@ -743,7 +743,7 @@ class NWProject():
         """Close the current project and clear all meta data.
         """
         self.optState.saveSettings()
-        self.projTree.writeToCFiles()
+        self.projTree.writeToCFile()
         self._appendSessionStats()
         self._clearLockFile()
         self.clearProject()
@@ -1480,6 +1480,7 @@ class NWProject():
             os.path.join(self.projMeta,  "timelineOptions.json"),
             os.path.join(self.projMeta,  "docMergeOptions.json"),
             os.path.join(self.projMeta,  "sessionLogOptions.json"),
+            os.path.join(self.projPath,  "ToC.json"),
         ]
 
         for rmFile in rmList:

nw/core/tree.py

@@ -139,46 +139,43 @@ class NWTree():
 
         return True
 
-    def writeToCFiles(self):
-        """Write the convenience table of contents files in the root of
-        the project directory. These files are there to assist the user
-        if they wish to browse the stored files.
+    def writeToCFile(self):
+        """Write the convenience table of contents file in the root of
+        the project directory.
         """
-        tocText = os.path.join(self.theProject.projPath, nwFiles.TOC_TXT)
-        tocJson = os.path.join(self.theProject.projPath, nwFiles.TOC_JSON)
+        tocList = []
+        tocLen = 0
+        # for tHandle in sorted(self._treeOrder):
+        for tHandle in self._treeOrder:
+            tItem = self.__getitem__(tHandle)
+            if tItem is None:
+                continue
+            tFile = tHandle+".nwd"
+            if os.path.isfile(os.path.join(self.theProject.projContent, tFile)):
+                tocLine = "%-25s  %-9s  %-10s  %s" % (
+                    os.path.join("content", tFile),
+                    tItem.itemClass.name,
+                    tItem.itemLayout.name,
+                    tItem.itemName,
+                )
+                tocList.append(tocLine)
+                tocLen = max(tocLen, len(tocLine))
 
-        jsonData = []
         try:
             # Dump the text
+            tocText = os.path.join(self.theProject.projPath, nwFiles.TOC_TXT)
             with open(tocText, mode="w", encoding="utf8") as outFile:
                 outFile.write("\n")
-                outFile.write(" Table of Contents\n")
-                outFile.write("===================\n")
+                outFile.write("Table of Contents\n")
+                outFile.write("=================\n")
                 outFile.write("\n")
-                outFile.write(" %-25s  %-9s  %s\n" % ("File Name", "Class", "Document Label"))
-                outFile.write("-"*80+"\n")
-                for tHandle in sorted(self._treeOrder):
-                    tItem = self.__getitem__(tHandle)
-                    if tItem is None:
-                        continue
-                    tFile = tHandle+".nwd"
-                    if os.path.isfile(os.path.join(self.theProject.projContent, tFile)):
-                        outFile.write(" %-25s  %-9s  %s\n" % (
-                            os.path.join("content", tFile),
-                            tItem.itemClass.name,
-                            tItem.itemName,
-                        ))
-                        jsonData.append([
-                            os.path.join("content", tFile),
-                            tItem.itemClass.name,
-                            tItem.itemName,
-                        ])
+                outFile.write("%-25s  %-9s  %-10s  %s\n" % (
+                    "File Name", "Class", "Layout", "Document Label"
+                ))
+                outFile.write("-"*tocLen + "\n")
+                outFile.write("\n".join(tocList))
                 outFile.write("\n")
 
-            # Dump the JSON
-            with open(tocJson, mode="w+", encoding="utf8") as outFile:
-                json.dump(jsonData, outFile, indent=2)
-
         except Exception as e:
             logger.error(str(e))