eric: comparison src/eric7/Project/ProjectBrowserModel.py

-:280a53840aa3
+:306373ccf8fd
 import contextlib
 import os
 import re
-from PyQt6.QtCore import QDir, QFileSystemWatcher, QModelIndex, Qt, pyqtSignal
+from PyQt6.QtCore import QDir, QModelIndex, Qt, pyqtSignal
 from PyQt6.QtGui import QColor
 from eric7 import Preferences
+from eric7.EricCore import EricFileSystemWatcher
 from eric7.SystemUtilities import FileSystemUtilities
 from eric7.UI.BrowserModel import (
 BrowserDirectoryItem,
 BrowserFileItem,
 BrowserItem,
 self.project = parent
 self.__projectBrowser = None
 self.__remotefsInterface = fsInterface
-self.watchedItems = {}
+self.watchedDirItems = {}
 self.__watcherActive = True
-self.watcher = QFileSystemWatcher(self)
+watcher = EricFileSystemWatcher.instance()
-self.watcher.directoryChanged.connect(self.directoryChanged)
+watcher.directoryCreated.connect(lambda x: self.entryCreated(x, isDir=True))
+watcher.directoryDeleted.connect(lambda x: self.entryDeleted(x, isDir=True))
+watcher.fileCreated.connect(lambda x: self.entryCreated(x, isDir=False))
+watcher.fileDeleted.connect(lambda x: self.entryDeleted(x, isDir=False))
 self.inRefresh = False
 self.colorNames = {
 "A": "VcsAdded",
 """
 Public method called after a project has been closed.
 """
 self.__vcsStatus = {}
-self.watchedItems = {}
+paths = list(self.watchedDirItems.keys())
-watchedDirs = self.watcher.directories()
+if paths:
-if watchedDirs:
+watcher = EricFileSystemWatcher.instance()
-self.watcher.removePaths(watchedDirs)
+watcher.removePaths(paths)
+self.watchedDirItems.clear()
 self.rootItem.removeChildren()
 self.beginResetModel()
 self.endResetModel()
 """
 Public method to stop monitoring the project file system.
 """
 self.__watcherActive = False
-def directoryChanged(self, path):
+def entryCreated(self, path, isDir=False):
 """
-Public slot to handle the directoryChanged signal of the watcher.
+Public method to handle the creation of a file or directory.
-@param path path of the directory
+@param path path of the created file or directory
 @type str
+@param isDir flag indicating a created directory (defaults to False)
+@type bool (optional)
 """
 if not self.__watcherActive:
 return
-if path not in self.watchedItems:
+parentPath = os.path.dirname(path)
+if parentPath not in self.watchedDirItems:
 # just ignore the situation we don't have a reference to the item
 return
-fileFilter = (
+if not Preferences.getProject("BrowsersListHiddenFiles") and os.path.basename(
-(QDir.Filter.AllEntries | QDir.Filter.Hidden | QDir.Filter.NoDotAndDotDot)
+path
-if Preferences.getProject("BrowsersListHiddenFiles")
+).startswith("."):
-else QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot
+return
-)
+for itm in self.watchedDirItems[parentPath]:
-for itm in self.watchedItems[path]:
+cnt = itm.childCount()
-oldCnt = itm.childCount()
+self.beginInsertRows(self.createIndex(itm.row(), 0, itm), cnt, cnt)
+node = (
-qdir = QDir(itm.dirName())
+ProjectBrowserDirectoryItem(
+itm,
-entryInfoList = qdir.entryInfoList(fileFilter)
+FileSystemUtilities.toNativeSeparators(path),
+itm.getProjectTypes()[0],
-# step 1: check for new entries
+False,
-children = itm.children()
+fsInterface=self.__remotefsInterface,
-for f in entryInfoList:
-fpath = FileSystemUtilities.toNativeSeparators(f.absoluteFilePath())
-childFound = False
-for child in children[:]:
-if child.name() == fpath:
-childFound = True
-children.remove(child)
-break
-if childFound:
-continue
-cnt = itm.childCount()
-self.beginInsertRows(self.createIndex(itm.row(), 0, itm), cnt, cnt)
-node = (
-ProjectBrowserDirectoryItem(
-itm,
-FileSystemUtilities.toNativeSeparators(f.absoluteFilePath()),
-itm.getProjectTypes()[0],
-False,
-fsInterface=self.__remotefsInterface,
-)
-if f.isDir()
-else ProjectBrowserFileItem(
-itm,
-FileSystemUtilities.toNativeSeparators(f.absoluteFilePath()),
-itm.getProjectTypes()[0],
-fsInterface=self.__remotefsInterface,
-)
 )
-self._addItem(node, itm)
+if isDir
-if self.project.vcs is not None:
+else ProjectBrowserFileItem(
-self.project.vcs.clearStatusCache()
+itm,
-state = self.project.vcs.vcsRegisteredState(node.name())
+FileSystemUtilities.toNativeSeparators(path),
-if state == VersionControlState.Controlled:
+itm.getProjectTypes()[0],
-node.addVcsStatus(self.project.vcs.vcsName())
+fsInterface=self.__remotefsInterface,
-else:
+)
-node.addVcsStatus(self.tr("local"))
+)
-self.endInsertRows()
+self._addItem(node, itm)
+self.endInsertRows()
-# step 2: check for removed entries
-if len(entryInfoList) != itm.childCount():
+def entryDeleted(self, path, isDir=False):
-for row in range(oldCnt - 1, -1, -1):
+"""
-child = itm.child(row)
+Public method to handle the deletion of a file or directory.
-childname = FileSystemUtilities.fromNativeSeparators(child.name())
-entryFound = False
+@param path path of the deleted file or directory
-for f in entryInfoList[:]:
+@type str
-if f.absoluteFilePath() == childname:
+@param isDir flag indicating a deleted directory (defaults to False)
-entryFound = True
+@type bool (optional)
-entryInfoList.remove(f)
+"""
-break
+if not self.__watcherActive:
-if entryFound:
+return
-continue
+super().entryDeleted(path, isDir=isDir)
-self._removeWatchedItem(child)
-self.beginRemoveRows(self.createIndex(itm.row(), 0, itm), row, row)
-itm.removeChild(child)
-self.endRemoveRows()
 def __addVCSStatus(self, item, name):
 """
 Private method used to set the vcs status of a node.
 if itm.childCount():
 index = self.createIndex(itm.row(), 0, itm)
 self.beginRemoveRows(index, 0, itm.childCount() - 1)
 itm.removeChildren()
 self.endRemoveRows()
+# reset the module parser cache
 ModuleParser.resetParsedModule(os.path.join(self.project.ppath, name))
 self.populateItem(itm, True)
 def projectPropertiesChanged(self):

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Project/ProjectBrowserModel.py

src/eric7/Project/ProjectBrowserModel.py