eric: comparison UI/BrowserModel.py

-:0ee8be384de2
+:9d2677615a3d
 self.rootItem = BrowserItem(None, rootData)
 self.progDir = None
 self.watchedItems = {}
 self.watcher = QFileSystemWatcher(self)
-self.watcher.directoryChanged.connect(self.__directoryChanged)
+self.watcher.directoryChanged.connect(self.directoryChanged)
 self.__populateModel()
 def columnCount(self, parent=QModelIndex()):
 """
 if dirName != "" and \
 not dirName.startswith("//") and \
 not dirName.startswith("\\\\"):
 if dirName not in self.watcher.directories():
 self.watcher.addPath(dirName)
-if dirName in self.watchedItems and \
+if dirName in self.watchedItems:
-itm not in self.watchedItems[dirName]:
+if itm not in self.watchedItems[dirName]:
 self.watchedItems[dirName].append(itm)
 else:
 self.watchedItems[dirName] = [itm]
 def _removeWatchedItem(self, itm):
 """
 @param itm item to be removed (BrowserDirectoryItem)
 """
 if isinstance(itm, BrowserDirectoryItem):
 dirName = itm.dirName()
-if dirName in self.watchedItems and \
+if dirName in self.watchedItems:
-itm in self.watchedItems[dirName]:
+if itm in self.watchedItems[dirName]:
 self.watchedItems[dirName].remove(itm)
 if len(self.watchedItems[dirName]) == 0:
 del self.watchedItems[dirName]
 self.watcher.removePath(dirName)
-def __directoryChanged(self, path):
+def directoryChanged(self, path):
 """
-Private slot to handle the directoryChanged signal of the watcher.
+Public slot to handle the directoryChanged signal of the watcher.
 @param path path of the directory (string)
 """
 if path not in self.watchedItems:
 # just ignore the situation we don't have a reference to the item
 return
 for itm in self.watchedItems[path]:
-if itm.isPopulated():
+oldCnt = itm.childCount()
-oldCnt = itm.childCount()
+qdir = QDir(itm.dirName())
+entryInfoList = qdir.entryInfoList(
+QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot))
+# step 1: check for new entries
+children = itm.children()
+for f in entryInfoList:
+fpath = f.absoluteFilePath()
+childFound = False
+for child in children:
+if child.name() == fpath:
+childFound = True
+children.remove(child)
+break
+if childFound:
+continue
-qdir = QDir(itm.dirName())
+cnt = itm.childCount()
+self.beginInsertRows(self.createIndex(itm.row(), 0, itm),
-entryInfoList = qdir.entryInfoList(
+cnt, cnt)
-QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot))
+if f.isDir():
+node = BrowserDirectoryItem(itm,
-# step 1: check for new entries
+Utilities.toNativeSeparators(f.absoluteFilePath()),
-for f in entryInfoList:
+False)
-fpath = f.absoluteFilePath()
+else:
-childFound = False
+node = BrowserFileItem(itm,
-for child in itm.children():
+Utilities.toNativeSeparators(f.absoluteFilePath()))
-if child.name() == fpath:
+self._addItem(node, itm)
-childFound = True
+self.endInsertRows()
+# step 2: check for removed entries
+if len(entryInfoList) != itm.childCount():
+for row in range(oldCnt - 1, -1, -1):
+child = itm.child(row)
+entryFound = False
+for f in entryInfoList:
+if f.absoluteFilePath() == child.name():
+entryFound = True
+entryInfoList.remove(f)
 break
-if childFound:
+if entryFound:
 continue
-cnt = itm.childCount()
+self._removeWatchedItem(child)
-self.beginInsertRows(self.createIndex(itm.row(), 0, itm),
+self.beginRemoveRows(self.createIndex(itm.row(), 0, itm),
-cnt, cnt)
+row, row)
-if f.isDir():
+itm.removeChild(child)
-node = BrowserDirectoryItem(itm,
+self.endRemoveRows()
-Utilities.toNativeSeparators(f.absoluteFilePath()),
-False)
-self._addWatchedItem(node)
-else:
-node = BrowserFileItem(itm,
-Utilities.toNativeSeparators(f.absoluteFilePath()))
-self._addItem(node, itm)
-self.endInsertRows()
-# step 2: check for removed entries
-if len(entryInfoList) != itm.childCount():
-for row in range(oldCnt - 1, -1, -1):
-child = itm.child(row)
-entryFound = False
-for f in entryInfoList:
-if f.absoluteFilePath() == child.name():
-entryFound = True
-break
-if entryFound:
-continue
-self.beginRemoveRows(self.createIndex(itm.row(), 0, itm),
-row, row)
-itm.removeChild(child)
-self.endRemoveRows()
 def __populateModel(self):
 """
 Private method to populate the browser model.
 """
 for d in QDir.drives():
 self.toplevelDirs.append(Utilities.toNativeSeparators(\
 d.absoluteFilePath()))
 for d in self.toplevelDirs:
-self._addItem(BrowserDirectoryItem(self.rootItem, d), self.rootItem)
+itm = BrowserDirectoryItem(self.rootItem, d)
-self.watcher.addPath(d)
+self._addItem(itm, self.rootItem)
 def programChange(self, dirname):
 """
 Public method to change the entry for the directory of file being debugged.
 self.progDir = None
 itm = BrowserDirectoryItem(self.rootItem, dirname)
 self.addItem(itm)
 self.progDir = itm
-self._addWatchedItem(itm)
 def addTopLevelDir(self, dirname):
 """
 Public method to add a new toplevel directory.
 """
 if dirname not in self.toplevelDirs:
 itm = BrowserDirectoryItem(self.rootItem, dirname)
 self.addItem(itm)
 self.toplevelDirs.append(itm.dirName())
-self._addWatchedItem(itm)
 def removeToplevelDir(self, index):
 """
 Public method to remove a toplevel directory.
 Public method to populate a directory item's subtree.
 @param parentItem reference to the directory item to be populated
 @param repopulate flag indicating a repopulation (boolean)
 """
+self._addWatchedItem(parentItem)
 qdir = QDir(parentItem.dirName())
 entryInfoList = \
 qdir.entryInfoList(QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot))
 if len(entryInfoList) > 0:
 for f in entryInfoList:
 if f.isDir():
 node = BrowserDirectoryItem(parentItem,
 Utilities.toNativeSeparators(f.absoluteFilePath()),
 False)
-self._addWatchedItem(node)
 else:
 node = BrowserFileItem(parentItem,
 Utilities.toNativeSeparators(f.absoluteFilePath()))
 self._addItem(node, parentItem)
 if repopulate:
 if p == '':
 p = os.getcwd()
 node = BrowserDirectoryItem(parentItem, p)
 self._addItem(node, parentItem)
-self._addWatchedItem(node)
 if repopulate:
 self.endInsertRows()
 def populateFileItem(self, parentItem, repopulate = False):
 """

Mercurial Repositories > eric / file comparison

comparison: UI/BrowserModel.py

UI/BrowserModel.py