eric: comparison eric6/UI/FindFileDialog.py

-:866adc8c315b
+:0acf98cd089a
 "FindFileDialog/DirectoryHistory"))
 self.findtextCombo.addItems(self.searchHistory)
 self.replacetextCombo.addItems(self.replaceHistory)
 self.dirPicker.addItems(self.dirHistory)
+self.excludeHiddenCheckBox.setChecked(Preferences.toBool(
+Preferences.Prefs.settings.value(
+"FindFileDialog/ExcludeHidden", True)
+))
 self.project = project
 self.findList.headerItem().setText(self.findList.columnCount(), "")
 self.findList.header().setSortIndicator(0, Qt.AscendingOrder)
 self.__section0Size = self.findList.header().sectionSize(0)
 @param line line number (integer)
 @param text text found (string)
 @param start start position of match (integer)
 @param end end position of match (integer)
 @param replTxt text with replacements applied (string)
-@keyparam md5 MD5 hash of the file (string)
+@param md5 MD5 hash of the file (string)
 """
 if self.__lastFileItem is None:
 # It's a new file
 self.__lastFileItem = QTreeWidgetItem(self.findList, [file])
 self.__lastFileItem.setFirstColumnSpanned(True)
 self.__lastFileItem.setExpanded(True)
 if self.__replaceMode:
 self.__lastFileItem.setFlags(
 self.__lastFileItem.flags() |
 Qt.ItemFlags(Qt.ItemIsUserCheckable | Qt.ItemIsTristate))
-# Qt bug:
-# item is not user checkable if setFirstColumnSpanned
-# is True (< 4.5.0)
 self.__lastFileItem.setData(0, self.md5Role, md5)
 itm = QTreeWidgetItem(self.__lastFileItem)
 itm.setTextAlignment(0, Qt.AlignRight)
 itm.setData(0, Qt.DisplayRole, line)
 ]
 filterRe = re.compile("|".join(fileFilterList))
 if self.projectButton.isChecked():
 if self.filterCheckBox.isChecked():
-files = [self.project.getRelativePath(file)
+files = [
-for file in
+self.project.getRelativePath(file)
-self.__getFileList(
+for file in
-self.project.getProjectPath(), filterRe)]
+self.__getFileList(
+self.project.getProjectPath(),
+filterRe,
+excludeHiddenDirs=self.excludeHiddenCheckBox
+.isChecked(),
+)
+]
 else:
 files = []
 if self.sourcesCheckBox.isChecked():
 files += self.project.pdata["SOURCES"]
 if self.formsCheckBox.isChecked():
 if self.resourcesCheckBox.isChecked():
 files += self.project.pdata["RESOURCES"]
 elif self.dirButton.isChecked():
 if not self.filterCheckBox.isChecked():
 filters = []
-if self.sourcesCheckBox.isChecked():
+if (
-filters.extend(
+self.project.isOpen() and
-["^{0}$".format(
+os.path.abspath(self.dirPicker.currentText()).startswith(
-assoc.replace(".", r"\.").replace("*", ".*"))
+self.project.getProjectPath())
-for assoc in list(
+):
-Preferences.getEditorLexerAssocs().keys())
+if self.sourcesCheckBox.isChecked():
-if assoc not in self.formsExt + self.interfacesExt +
+filters.extend([
-self.protocolsExt])
+"^{0}$".format(
-if self.formsCheckBox.isChecked():
+assoc.replace(".", r"\.").replace("*", ".*")
-filters.append(self.filterForms)
+) for assoc in
-if self.interfacesCheckBox.isChecked():
+self.project.getFiletypeAssociations("SOURCES")
-filters.append(self.filterInterfaces)
+])
-if self.protocolsCheckBox.isChecked():
+if self.formsCheckBox.isChecked():
-filters.append(self.filterProtocols)
+filters.extend([
-if self.resourcesCheckBox.isChecked():
+"^{0}$".format(
-filters.append(self.filterResources)
+assoc.replace(".", r"\.").replace("*", ".*")
+) for assoc in
+self.project.getFiletypeAssociations("FORMS")
+])
+if self.interfacesCheckBox.isChecked():
+filters.extend([
+"^{0}$".format(
+assoc.replace(".", r"\.").replace("*", ".*")
+) for assoc in
+self.project.getFiletypeAssociations("INTERFACES")
+])
+if self.protocolsCheckBox.isChecked():
+filters.extend([
+"^{0}$".format(
+assoc.replace(".", r"\.").replace("*", ".*")
+) for assoc in
+self.project.getFiletypeAssociations("PROTOCOLS")
+])
+if self.resourcesCheckBox.isChecked():
+filters.extend([
+"^{0}$".format(
+assoc.replace(".", r"\.").replace("*", ".*")
+) for assoc in
+self.project.getFiletypeAssociations("RESOURCES")
+])
+else:
+if self.sourcesCheckBox.isChecked():
+filters.extend([
+"^{0}$".format(
+assoc.replace(".", r"\.").replace("*", ".*"))
+for assoc in list(
+Preferences.getEditorLexerAssocs().keys())
+if assoc not in
+self.formsExt + self.interfacesExt +
+self.protocolsExt + self.resourcesExt
+])
+if self.formsCheckBox.isChecked():
+filters.append(self.filterForms)
+if self.interfacesCheckBox.isChecked():
+filters.append(self.filterInterfaces)
+if self.protocolsCheckBox.isChecked():
+filters.append(self.filterProtocols)
+if self.resourcesCheckBox.isChecked():
+filters.append(self.filterResources)
 filterString = "|".join(filters)
 filterRe = re.compile(filterString)
 files = self.__getFileList(
 os.path.abspath(self.dirPicker.currentText()),
-filterRe)
+filterRe,
+excludeHiddenDirs=self.excludeHiddenCheckBox.isChecked(),
+excludeHiddenFiles=self.excludeHiddenCheckBox.isChecked(),
+)
 elif self.openFilesButton.isChecked():
 vm = e5App().getObject("ViewManager")
 vm.checkAllDirty()
 files = vm.getOpenFilenames()
 self.findtextCombo.clear()
 self.findtextCombo.addItems(self.searchHistory)
 Preferences.Prefs.settings.setValue(
 "FindFileDialog/SearchHistory",
 self.searchHistory[:30])
+Preferences.Prefs.settings.setValue(
+"FindFileDialog/ExcludeHidden",
+self.excludeHiddenCheckBox.isChecked())
 if self.__replaceMode:
 replTxt = self.replacetextCombo.currentText()
 if replTxt in self.replaceHistory:
 self.replaceHistory.remove(replTxt)
 if fn.endswith('.ui'):
 self.designerFile.emit(fn)
 else:
 self.sourceFile.emit(fn, line, "", start, end)
-def __getFileList(self, path, filterRe):
+def __getFileList(self, path, filterRe, excludeHiddenDirs=False,
+excludeHiddenFiles=False):
 """
 Private method to get a list of files to search.
-@param path the root directory to search in (string)
+@param path the root directory to search in
+@type str
 @param filterRe regular expression defining the filter
-criteria (regexp object)
+criteria
-@return list of files to be processed (list of strings)
+@type regexp object
+@param excludeHiddenDirs flag indicating to exclude hidden directories
+@type bool
+@param excludeHiddenFiles flag indicating to exclude hidden files
+@type bool
+@return list of files to be processed
+@rtype list of str
 """
 path = os.path.abspath(path)
 files = []
-for dirname, _, names in os.walk(path):
+for dirname, dirs, filenames in os.walk(path):
-files.extend([os.path.join(dirname, f)
+files.extend([
-for f in names
+os.path.join(dirname, f) for f in filenames
-if re.match(filterRe, f)]
+if (not (excludeHiddenFiles and f.startswith(".")) and
-)
+re.match(filterRe, f))
+])
+if excludeHiddenDirs:
+for d in dirs[:]:
+if d .startswith("."):
+dirs.remove(d)
 return files
 def setSearchDirectory(self, searchDir):
 """
 Public slot to set the name of the directory to search in.

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/FindFileDialog.py

eric6/UI/FindFileDialog.py