eric: comparison eric6/Project/ProjectBrowserModel.py

-:fb0ef164f536
+:698ae46f40a4
 Module implementing the browser model.
 """
 import os
 import re
+import contextlib
 from PyQt5.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt
 from PyQt5.QtGui import QColor
 from UI.BrowserModel import (
 ProjectBrowserOthersType = 5
 ProjectBrowserResourceType = 6
 ProjectBrowserProtocolsType = 7
-class ProjectBrowserItemMixin(object):
+class ProjectBrowserItemMixin:
 """
 Class implementing common methods of project browser items.
 It is meant to be used as a mixin class.
 """
 @param other reference to item to compare against (BrowserItem)
 @param column column number to use for the comparison (integer)
 @param order sort order (Qt.SortOrder) (for special sorting)
 @return true, if this item is less than other (boolean)
 """
-if issubclass(other.__class__, BrowserFileItem):
+if (
-if Preferences.getUI("BrowsersListFoldersFirst"):
+issubclass(other.__class__, BrowserFileItem) and
-return order == Qt.SortOrder.AscendingOrder
+Preferences.getUI("BrowsersListFoldersFirst")
+):
+return order == Qt.SortOrder.AscendingOrder
 return BrowserItem.lessThan(self, other, column, order)
 class ProjectBrowserDirectoryItem(BrowserDirectoryItem,
 """
 Constructor
 @param parent reference to parent object (Project.Project)
 """
-super(ProjectBrowserModel, self).__init__(parent, nopopulate=True)
+super().__init__(parent, nopopulate=True)
 rootData = self.tr("Name")
 self.rootItem = BrowserItem(None, rootData)
 self.rootItem.itemData.append(self.tr("VCS Status"))
 """
 self._addWatchedItem(parentItem)
 qdir = QDir(parentItem.dirName())
-if Preferences.getProject("BrowsersListHiddenFiles"):
+fileFilter = (
-fileFilter = QDir.Filters(
+QDir.Filters(
 QDir.Filter.AllEntries |
 QDir.Filter.Hidden |
 QDir.Filter.NoDotAndDotDot
 )
-else:
+if Preferences.getProject("BrowsersListHiddenFiles") else
-fileFilter = QDir.Filters(
+QDir.Filters(QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
-QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
+)
 entryInfoList = qdir.entryInfoList(fileFilter)
 if len(entryInfoList) > 0:
 if repopulate:
 self.beginInsertRows(self.createIndex(
 dname = parentItem.dirName()
 self.project.vcs.clearStatusCache()
 states = self.project.vcs.vcsAllRegisteredStates(states, dname)
 for f in entryInfoList:
-if f.isDir():
+node = (
-node = ProjectBrowserDirectoryItem(
+ProjectBrowserDirectoryItem(
 parentItem,
 Utilities.toNativeSeparators(f.absoluteFilePath()),
 parentItem.getProjectTypes()[0], False)
-else:
+if f.isDir() else
-node = ProjectBrowserFileItem(
+ProjectBrowserFileItem(
 parentItem,
 Utilities.toNativeSeparators(f.absoluteFilePath()),
 parentItem.getProjectTypes()[0])
+)
 if self.project.vcs is not None:
 fname = f.absoluteFilePath()
 if (
 states[os.path.normcase(fname)] ==
 self.project.vcs.canBeCommitted
 self.inRefresh = True
 for key in keys:
 # Show the entry in bold in the others browser to make it more
 # distinguishable
-if key == "OTHERS":
+bold = key == "OTHERS"
-bold = True
+sourceLanguage = (
-else:
+self.project.getProjectLanguage() if key == "SOURCES" else ""
-bold = False
+)
-if key == "SOURCES":
-sourceLanguage = self.project.getProjectLanguage()
-else:
-sourceLanguage = ""
 for fn in self.project.pdata[key]:
 fname = os.path.join(self.project.ppath, fn)
 parentItem, dt = self.findParentItemByName(
 self.projectBrowserTypes[key], fn)
-if os.path.isdir(fname):
+itm = (
-itm = ProjectBrowserDirectoryItem(
+ProjectBrowserDirectoryItem(
 parentItem, fname, self.projectBrowserTypes[key],
 False, bold)
-else:
+if os.path.isdir(fname) else
-itm = ProjectBrowserFileItem(
+ProjectBrowserFileItem(
 parentItem, fname, self.projectBrowserTypes[key],
 False, bold, sourceLanguage=sourceLanguage)
+)
 self._addItem(itm, parentItem)
 if self.project.vcs is not None:
 if (
 states[os.path.normcase(fname)] ==
 self.project.vcs.canBeCommitted
 @param name name of the new item (string)
 @param additionalTypeStrings names of additional types (list of string)
 """
 # Show the entry in bold in the others browser to make it more
 # distinguishable
-if typeString == "OTHERS":
+bold = typeString == "OTHERS"
-bold = True
-else:
-bold = False
 fname = os.path.join(self.project.ppath, name)
 parentItem, dt = self.findParentItemByName(
 self.projectBrowserTypes[typeString], name)
-if parentItem == self.rootItem:
+parentIndex = (
-parentIndex = QModelIndex()
+QModelIndex()
-else:
+if parentItem == self.rootItem else
-parentIndex = self.createIndex(parentItem.row(), 0, parentItem)
+self.createIndex(parentItem.row(), 0, parentItem)
+)
 if os.path.isdir(fname):
 itm = ProjectBrowserDirectoryItem(
 parentItem, fname, self.projectBrowserTypes[typeString],
 False, bold)
 else:
 @param name name of the item (string)
 @return index of the item found (QModelIndex)
 """
 itm = self.findItem(name)
-if itm is None:
+index = self.createIndex(itm.row(), 0, itm) if itm else QModelIndex()
-index = QModelIndex()
-else:
-index = self.createIndex(itm.row(), 0, itm)
 return index
 def itemIndexByNameAndLine(self, name, lineno):
 """
 Public method to find an item's index given its name.
 if itm.isLazyPopulated() and autoPopulate:
 self.populateItem(itm)
 else:
 break
 for child in itm.children():
-try:
+with contextlib.suppress(AttributeError):
 start, end = child.boundaries()
 if end == -1:
 end = 1000000   # assume end of file
 if start <= lineno <= end:
 itm = child
 break
-except AttributeError:
-pass
 else:
 itm = None
 if itm:
 olditem = itm
 index = self.createIndex(olditem.row(), 0, olditem)
 if path not in self.watchedItems:
 # just ignore the situation we don't have a reference to the item
 return
-if Preferences.getProject("BrowsersListHiddenFiles"):
+fileFilter = (
-fileFilter = QDir.Filters(
+QDir.Filters(
 QDir.Filter.AllEntries |
 QDir.Filter.Hidden |
 QDir.Filter.NoDotAndDotDot
 )
-else:
+if Preferences.getProject("BrowsersListHiddenFiles") else
-fileFilter = QDir.Filters(
+QDir.Filters(QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
-QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
+)
 for itm in self.watchedItems[path]:
 oldCnt = itm.childCount()
 qdir = QDir(itm.dirName())
 continue
 cnt = itm.childCount()
 self.beginInsertRows(
 self.createIndex(itm.row(), 0, itm), cnt, cnt)
-if f.isDir():
+node = (
-node = ProjectBrowserDirectoryItem(
+ProjectBrowserDirectoryItem(
 itm,
 Utilities.toNativeSeparators(f.absoluteFilePath()),
 itm.getProjectTypes()[0],
 False)
-else:
+if f.isDir() else
-node = ProjectBrowserFileItem(
+ProjectBrowserFileItem(
 itm,
 Utilities.toNativeSeparators(f.absoluteFilePath()),
 itm.getProjectTypes()[0])
+)
 self._addItem(node, itm)
 if self.project.vcs is not None:
 self.project.vcs.clearStatusCache()
 state = self.project.vcs.vcsRegisteredState(node.name())
 if state == self.project.vcs.canBeCommitted:
 @param name file or directory name of the item (string).
 """
 fname = os.path.basename(name)
 parentItem = self.findParentItemByName(0, name)[0]
-if parentItem == self.rootItem:
+parentIndex = (
-parentIndex = QModelIndex()
+QModelIndex()
-else:
+if parentItem == self.rootItem else
-parentIndex = self.createIndex(parentItem.row(), 0, parentItem)
+self.createIndex(parentItem.row(), 0, parentItem)
+)
 childItem = self.findChildItem(fname, 0, parentItem)
 if childItem is not None:
 self.beginRemoveRows(parentIndex, childItem.row(), childItem.row())
 parentItem.removeChild(childItem)
 self.endRemoveRows()

Mercurial Repositories > eric / file comparison

comparison: eric6/Project/ProjectBrowserModel.py

eric6/Project/ProjectBrowserModel.py