eric: comparison eric6/UI/FindFileDialog.py

-:fb0ef164f536
+:698ae46f40a4
 @param project reference to the project object
 @param replaceMode flag indicating the replace dialog mode (boolean)
 @param parent parent widget of this dialog (QWidget)
 """
-super(FindFileDialog, self).__init__(parent)
+super().__init__(parent)
 self.setupUi(self)
 self.setWindowFlags(Qt.WindowType.Window)
 self.dirPicker.setMode(E5PathPickerModes.DirectoryMode)
 self.dirPicker.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop)
 if self.__replaceMode:
 self.findList.clear()
 self.replacetextCombo.setEditText("")
-super(FindFileDialog, self).show()
+super().show()
 def on_findtextCombo_editTextChanged(self, text):
 """
 Private slot to handle the editTextChanged signal of the find
 text combo.
 # retrieve the values
 reg = self.regexpCheckBox.isChecked()
 wo = self.wordCheckBox.isChecked()
 cs = self.caseCheckBox.isChecked()
 ct = self.findtextCombo.currentText()
-if reg:
+txt = ct if reg else re.escape(ct)
-txt = ct
-else:
-txt = re.escape(ct)
 if wo:
 txt = "\\b{0}\\b".format(txt)
 flags = re.UNICODE
 if not cs:
 flags |= re.IGNORECASE
 self.findButton.setEnabled(False)
 # now go through all the files
 self.__populating = True
 self.findList.setUpdatesEnabled(False)
-progress = 0
 breakSearch = False
 occurrences = 0
 fileOccurrences = 0
-for file in files:
+for progress, file in enumerate(files, start=1):
 self.__lastFileItem = None
 found = False
 if self.__cancelSearch or breakSearch:
 break
 self.findProgressLabel.setPath(file)
-if self.projectButton.isChecked():
+fn = (
-fn = os.path.join(self.project.ppath, file)
+os.path.join(self.project.ppath, file)
-else:
+if self.projectButton.isChecked() else
-fn = file
+file
+)
 # read the file and split it into textlines
 try:
 text, encoding, hashStr = Utilities.readEncodedFileWithHash(fn)
 lines = text.splitlines(True)
 except (UnicodeError, OSError):
-progress += 1
 self.findProgress.setValue(progress)
 continue
 # now perform the search and display the lines found
-count = 0
+for count, line in enumerate(lines, start=1):
-for line in lines:
 if self.__cancelSearch:
 break
-count += 1
 contains = search.search(line)
 if contains:
 occurrences += 1
 found = True
 start = contains.start()
 QApplication.processEvents()
 if found:
 fileOccurrences += 1
-progress += 1
 self.findProgress.setValue(progress)
 if not files:
 self.findProgress.setMaximum(1)
 self.findProgress.setValue(1)
 file = itm.text(0)
 line = 1
 start = 0
 end = 0
-if self.project:
+fn = os.path.join(self.project.ppath, file) if self.project else file
-fn = os.path.join(self.project.ppath, file)
-else:
-fn = file
 if fn.endswith('.ui'):
 self.designerFile.emit(fn)
 else:
 self.sourceFile.emit(fn, line, "", start, end)
 Private slot to perform the requested replace actions.
 """
 self.findProgress.setMaximum(self.findList.topLevelItemCount())
 self.findProgress.setValue(0)
-progress = 0
 for index in range(self.findList.topLevelItemCount()):
 itm = self.findList.topLevelItem(index)
 if itm.checkState(0) in [Qt.CheckState.PartiallyChecked,
 Qt.CheckState.Checked]:
 file = itm.text(0)
 self.tr(
 """<p>Could not read the file <b>{0}</b>."""
 """ Skipping it.</p><p>Reason: {1}</p>""")
 .format(fn, str(err))
 )
-progress += 1
+self.findProgress.setValue(index)
-self.findProgress.setValue(progress)
 continue
 # Check the original and the current hash. Skip the file,
 # if hashes are different.
 if origHash != hashStr:
 """<p>The current and the original hash of the"""
 """ file <b>{0}</b> are different. Skipping it."""
 """</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p>""")
 .format(fn, origHash, hashStr)
 )
-progress += 1
+self.findProgress.setValue(index)
-self.findProgress.setValue(progress)
 continue
 # replace the lines authorized by the user
 for cindex in range(itm.childCount()):
 citm = itm.child(cindex)
 """<p>Could not save the file <b>{0}</b>."""
 """ Skipping it.</p><p>Reason: {1}</p>""")
 .format(fn, str(err))
 )
-progress += 1
+self.findProgress.setValue(index + 1)
-self.findProgress.setValue(progress)
 self.findProgressLabel.setPath("")
 self.findList.clear()
 self.replaceButton.setEnabled(False)
 def __copyToClipboard(self):
 """
 Private method to copy the path of an entry to the clipboard.
 """
 itm = self.findList.selectedItems()[0]
-if itm.parent():
+fn = itm.parent().text(0) if itm.parent() else itm.text(0)
-fn = itm.parent().text(0)
-else:
-fn = itm.text(0)
 cb = QApplication.clipboard()
 cb.setText(fn)

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/FindFileDialog.py

eric6/UI/FindFileDialog.py