Make some improvements to the tree consistency check

This commit is contained in:
Veronica Berglyd Olsen
2023-07-22 01:06:04 +02:00
parent 3753f5b829
commit d382775d1d
2 changed files with 14 additions and 12 deletions
+10 -7
View File
@@ -195,21 +195,24 @@ class NWTree:
the project returns. The functions requires a prefix string to
mark recovered files.
"""
storage = self._project.storage
files = set(storage.scanContent())
for tHandle in self._treeOrder:
if self.updateItemData(tHandle):
logger.debug("Checking item '%s' ... OK", tHandle)
files.discard(tHandle) # Remove it from the record
else:
logger.error("Checking item '%s' ... ERROR", tHandle)
self.__delitem__(tHandle) # The file will be re-added as orphaned
orphans = 0
recovered = 0
storage = self._project.storage
for cHandle in storage.scanContent():
if cHandle in self._treeOrder:
continue
orphans = len(files)
if orphans == 0:
logger.info("Checked project files: OK")
return 0, 0
orphans += 1
logger.warning("Found %d file(s) not tracked in project", orphans)
recovered = 0
for cHandle in files:
aDoc = storage.getDocument(cHandle)
aDoc.readDocument(isOrphan=True)
oName, oParent, oClass, oLayout = aDoc.getMeta()
+4 -5
View File
@@ -1046,13 +1046,12 @@ class GuiProjectTree(QTreeWidget):
"""
logger.debug("Building the project tree ...")
self.clearTree()
iCount = 0
count = 0
for nwItem in self.theProject.getProjectItems():
iCount += 1
count += 1
self._addTreeItem(nwItem)
logger.debug("%d item(s) added to the project tree", iCount)
if count > 0:
logger.info("%d item(s) added to the project tree", count)
return
def undoLastMove(self):