Wed, 13 Jul 2022 14:55:47 +0200
Reformatted the source code using the 'Black' utility.
9214 | 1 | # -*- coding: utf-8 -*- |
2 | ||
3 | # Copyright (c) 2022 Detlev Offenbach <detlev@die-offenbachs.de> | |
4 | # | |
5 | ||
6 | """ | |
7 | Module implementing a dialog showing the code formatting progress and the result. | |
8 | """ | |
9 | ||
10 | import copy | |
11 | import datetime | |
12 | import pathlib | |
13 | ||
14 | import black | |
15 | ||
16 | from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication | |
17 | from PyQt6.QtWidgets import ( | |
18 | QAbstractButton, | |
19 | QDialog, | |
20 | QDialogButtonBox, | |
21 | QHeaderView, | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
22 | QTreeWidgetItem, |
9214 | 23 | ) |
24 | ||
25 | from EricWidgets import EricMessageBox | |
26 | ||
27 | from .Ui_BlackFormattingDialog import Ui_BlackFormattingDialog | |
28 | ||
29 | from . import BlackUtilities | |
30 | from .BlackDiffWidget import BlackDiffWidget | |
31 | from .BlackFormattingAction import BlackFormattingAction | |
32 | ||
33 | import Utilities | |
34 | ||
35 | ||
36 | class BlackFormattingDialog(QDialog, Ui_BlackFormattingDialog): | |
37 | """ | |
38 | Class implementing a dialog showing the code formatting progress and the result. | |
39 | """ | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
40 | |
9214 | 41 | DataTypeRole = Qt.ItemDataRole.UserRole |
42 | DataRole = Qt.ItemDataRole.UserRole + 1 | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
43 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
44 | StatusColumn = 0 |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
45 | FileNameColumn = 1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
46 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
47 | def __init__( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
48 | self, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
49 | configuration, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
50 | filesList, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
51 | project=None, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
52 | action=BlackFormattingAction.Format, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
53 | parent=None, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
54 | ): |
9214 | 55 | """ |
56 | Constructor | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
57 | |
9214 | 58 | @param configuration dictionary containing the configuration parameters |
59 | @type dict | |
60 | @param filesList list of absolute file paths to be processed | |
61 | @type list of str | |
62 | @param project reference to the project object (defaults to None) | |
63 | @type Project (optional) | |
64 | @param action action to be performed (defaults to BlackFormattingAction.Format) | |
65 | @type BlackFormattingAction (optional) | |
66 | @param parent reference to the parent widget (defaults to None) | |
67 | @type QWidget (optional) | |
68 | """ | |
69 | super().__init__(parent) | |
70 | self.setupUi(self) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
71 | |
9214 | 72 | self.progressBar.setMaximum(len(filesList)) |
73 | self.progressBar.setValue(0) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
74 | |
9214 | 75 | self.resultsList.header().setSortIndicator(1, Qt.SortOrder.AscendingOrder) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
76 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
77 | self.statisticsGroup.setVisible(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
78 | |
9214 | 79 | self.__report = BlackReport(self) |
80 | self.__report.check = action is BlackFormattingAction.Check | |
81 | self.__report.diff = action is BlackFormattingAction.Diff | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
82 | |
9214 | 83 | self.__config = copy.deepcopy(configuration) |
84 | self.__project = project | |
85 | self.__action = action | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
86 | |
9214 | 87 | self.__cancelled = False |
88 | self.__diffDialog = None | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
89 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
90 | self.__allFilter = self.tr("<all>") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
91 | |
9214 | 92 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(True) |
93 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) | |
94 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
95 | |
9214 | 96 | self.show() |
97 | QCoreApplication.processEvents() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
98 | |
9214 | 99 | self.__files = self.__filterFiles(filesList) |
100 | self.__formatFiles() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
101 | |
9214 | 102 | def __filterFiles(self, filesList): |
103 | """ | |
104 | Private method to filter the given list of files according the | |
105 | configuration parameters. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
106 | |
9214 | 107 | @param filesList list of files |
108 | @type list of str | |
109 | @return list of filtered files | |
110 | @rtype list of str | |
111 | """ | |
112 | filterRegExps = [ | |
113 | BlackUtilities.compileRegExp(self.__config[k]) | |
114 | for k in ["force-exclude", "extend-exclude", "exclude"] | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
115 | if k in self.__config |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
116 | and bool(self.__config[k]) |
9214 | 117 | and BlackUtilities.validateRegExp(self.__config[k])[0] |
118 | ] | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
119 | |
9214 | 120 | files = [] |
121 | for file in filesList: | |
122 | file = Utilities.fromNativeSeparators(file) | |
123 | for filterRegExp in filterRegExps: | |
124 | filterMatch = filterRegExp.search(file) | |
125 | if filterMatch and filterMatch.group(0): | |
126 | self.__report.path_ignored(file) | |
127 | break | |
128 | else: | |
129 | files.append(file) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
130 | |
9214 | 131 | return files |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
132 | |
9214 | 133 | def __resort(self): |
134 | """ | |
135 | Private method to resort the result list. | |
136 | """ | |
137 | self.resultsList.sortItems( | |
138 | self.resultsList.sortColumn(), | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
139 | self.resultsList.header().sortIndicatorOrder(), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
140 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
141 | |
9214 | 142 | def __resizeColumns(self): |
143 | """ | |
144 | Private method to resize the columns of the result list. | |
145 | """ | |
146 | self.resultsList.header().resizeSections( | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
147 | QHeaderView.ResizeMode.ResizeToContents |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
148 | ) |
9214 | 149 | self.resultsList.header().setStretchLastSection(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
150 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
151 | def __populateStatusFilterCombo(self): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
152 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
153 | Private method to populate the status filter combo box with allowed selections. |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
154 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
155 | allowedSelections = set() |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
156 | for row in range(self.resultsList.topLevelItemCount()): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
157 | allowedSelections.add( |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
158 | self.resultsList.topLevelItem(row).text( |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
159 | BlackFormattingDialog.StatusColumn |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
160 | ) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
161 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
162 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
163 | self.statusFilterComboBox.addItem(self.__allFilter) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
164 | self.statusFilterComboBox.addItems(sorted(allowedSelections)) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
165 | |
9214 | 166 | def __finish(self): |
167 | """ | |
168 | Private method to perform some actions after the run was performed or canceled. | |
169 | """ | |
170 | self.__resort() | |
171 | self.__resizeColumns() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
172 | |
9214 | 173 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False) |
174 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True) | |
175 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
176 | |
9214 | 177 | self.progressBar.setVisible(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
178 | |
9214 | 179 | self.__updateStatistics() |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
180 | self.__populateStatusFilterCombo() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
181 | |
9214 | 182 | def __updateStatistics(self): |
183 | """ | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
184 | Private method to update the statistics about the recent formatting run and |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
185 | make them visible. |
9214 | 186 | """ |
187 | self.reformattedLabel.setText( | |
188 | self.tr("reformatted") | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
189 | if self.__action is BlackFormattingAction.Format |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
190 | else self.tr("would reformat") |
9214 | 191 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
192 | |
9214 | 193 | total = self.progressBar.maximum() |
194 | processed = total - self.__report.ignored_count | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
195 | |
9214 | 196 | self.totalCountLabel.setText("{0:n}".format(total)) |
197 | self.excludedCountLabel.setText("{0:n}".format(self.__report.ignored_count)) | |
198 | self.failuresCountLabel.setText("{0:n}".format(self.__report.failure_count)) | |
199 | self.processedCountLabel.setText("{0:n}".format(processed)) | |
200 | self.reformattedCountLabel.setText("{0:n}".format(self.__report.change_count)) | |
201 | self.unchangedCountLabel.setText("{0:n}".format(self.__report.same_count)) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
202 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
203 | self.statisticsGroup.setVisible(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
204 | |
9214 | 205 | @pyqtSlot(QAbstractButton) |
206 | def on_buttonBox_clicked(self, button): | |
207 | """ | |
208 | Private slot to handle button presses of the dialog buttons. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
209 | |
9214 | 210 | @param button reference to the pressed button |
211 | @type QAbstractButton | |
212 | """ | |
213 | if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel): | |
214 | self.__cancelled = True | |
215 | elif button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close): | |
216 | self.accept() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
217 | |
9214 | 218 | @pyqtSlot(QTreeWidgetItem, int) |
219 | def on_resultsList_itemDoubleClicked(self, item, column): | |
220 | """ | |
221 | Private slot handling a double click of a result item. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
222 | |
9214 | 223 | @param item reference to the double clicked item |
224 | @type QTreeWidgetItem | |
225 | @param column column number that was double clicked | |
226 | @type int | |
227 | """ | |
228 | dataType = item.data(0, BlackFormattingDialog.DataTypeRole) | |
229 | if dataType == "error": | |
230 | EricMessageBox.critical( | |
231 | self, | |
232 | self.tr("Formatting Failure"), | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
233 | self.tr("<p>Formatting failed due to this error.</p><p>{0}</p>").format( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
234 | item.data(0, BlackFormattingDialog.DataRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
235 | ), |
9214 | 236 | ) |
237 | elif dataType == "diff": | |
238 | if self.__diffDialog is None: | |
239 | self.__diffDialog = BlackDiffWidget() | |
240 | self.__diffDialog.showDiff(item.data(0, BlackFormattingDialog.DataRole)) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
241 | |
9214 | 242 | def addResultEntry(self, status, fileName, isError=False, data=None): |
243 | """ | |
244 | Public method to add an entry to the result list. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
245 | |
9214 | 246 | @param status status of the operation |
247 | @type str | |
248 | @param fileName name of the processed file | |
249 | @type str | |
250 | @param isError flag indicating that data contains an error message (defaults to | |
251 | False) | |
252 | @type bool (optional) | |
253 | @param data associated data (diff or error message) (defaults to None) | |
254 | @type str (optional) | |
255 | """ | |
256 | if self.__project: | |
257 | fileName = self.__project.getRelativePath(fileName) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
258 | |
9214 | 259 | itm = QTreeWidgetItem(self.resultsList, [status, fileName]) |
260 | if data: | |
261 | itm.setData( | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
262 | 0, BlackFormattingDialog.DataTypeRole, "error" if isError else "diff" |
9214 | 263 | ) |
264 | itm.setData(0, BlackFormattingDialog.DataRole, data) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
265 | |
9214 | 266 | self.progressBar.setValue(self.progressBar.value() + 1) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
267 | |
9214 | 268 | QCoreApplication.processEvents() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
269 | |
9214 | 270 | def __formatFiles(self): |
271 | """ | |
272 | Private method to format the list of files according the configuration. | |
273 | """ | |
274 | writeBack = black.WriteBack.from_configuration( | |
275 | check=self.__action is BlackFormattingAction.Check, | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
276 | diff=self.__action is BlackFormattingAction.Diff, |
9214 | 277 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
278 | |
9214 | 279 | versions = ( |
280 | { | |
281 | black.TargetVersion[target.upper()] | |
282 | for target in self.__config["target-version"] | |
283 | } | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
284 | if self.__config["target-version"] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
285 | else set() |
9214 | 286 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
287 | |
9214 | 288 | mode = black.Mode( |
289 | target_versions=versions, | |
290 | line_length=int(self.__config["line-length"]), | |
291 | string_normalization=not self.__config["skip-string-normalization"], | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
292 | magic_trailing_comma=not self.__config["skip-magic-trailing-comma"], |
9214 | 293 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
294 | |
9214 | 295 | for file in self.__files: |
296 | if self.__action is BlackFormattingAction.Diff: | |
297 | self.__diffFormatFile( | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
298 | pathlib.Path(file), fast=False, mode=mode, report=self.__report |
9214 | 299 | ) |
300 | else: | |
301 | black.reformat_one( | |
302 | pathlib.Path(file), | |
303 | fast=False, | |
304 | write_back=writeBack, | |
305 | mode=mode, | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
306 | report=self.__report, |
9214 | 307 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
308 | |
9214 | 309 | if self.__cancelled: |
310 | break | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
311 | |
9214 | 312 | self.__finish() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
313 | |
9214 | 314 | def __diffFormatFile(self, src, fast, mode, report): |
315 | """ | |
316 | Private method to check, if the given files need to be reformatted, and generate | |
317 | a unified diff. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
318 | |
9214 | 319 | @param src path of file to be checked |
320 | @type pathlib.Path | |
321 | @param fast flag indicating fast operation | |
322 | @type bool | |
323 | @param mode code formatting options | |
324 | @type black.Mode | |
325 | @param report reference to the report object | |
326 | @type BlackReport | |
327 | """ | |
328 | then = datetime.datetime.utcfromtimestamp(src.stat().st_mtime) | |
329 | with open(src, "rb") as buf: | |
330 | srcContents, _, _ = black.decode_bytes(buf.read()) | |
331 | try: | |
332 | dstContents = black.format_file_contents(srcContents, fast=fast, mode=mode) | |
333 | except black.NothingChanged: | |
334 | report.done(src, black.Changed.NO) | |
335 | return | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
336 | |
9214 | 337 | fileName = str(src) |
338 | if self.__project: | |
339 | fileName = self.__project.getRelativePath(fileName) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
340 | |
9214 | 341 | now = datetime.datetime.utcnow() |
342 | srcName = f"{fileName}\t{then} +0000" | |
343 | dstName = f"{fileName}\t{now} +0000" | |
344 | diffContents = black.diff(srcContents, dstContents, srcName, dstName) | |
345 | report.done(src, black.Changed.YES, diff=diffContents) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
346 | |
9214 | 347 | def closeEvent(self, evt): |
348 | """ | |
349 | Protected slot implementing a close event handler. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
350 | |
9214 | 351 | @param evt reference to the close event |
352 | @type QCloseEvent | |
353 | """ | |
354 | if self.__diffDialog is not None: | |
355 | self.__diffDialog.close() | |
356 | evt.accept() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
357 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
358 | @pyqtSlot(str) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
359 | def on_statusFilterComboBox_currentTextChanged(self, status): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
360 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
361 | Private slot handling the selection of a status for items to be shown. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
362 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
363 | @param status selected status |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
364 | @type str |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
365 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
366 | for row in range(self.resultsList.topLevelItemCount()): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
367 | itm = self.resultsList.topLevelItem(row) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
368 | itm.setHidden( |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
369 | status != self.__allFilter |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
370 | and itm.text(BlackFormattingDialog.StatusColumn) != status |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
371 | ) |
9214 | 372 | |
373 | ||
374 | class BlackReport(black.Report): | |
375 | """ | |
376 | Class extending the black Report to work with our dialog. | |
377 | """ | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
378 | |
9214 | 379 | def __init__(self, dialog): |
380 | """ | |
381 | Constructor | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
382 | |
9214 | 383 | @param dialog reference to the result dialog |
384 | @type QDialog | |
385 | """ | |
386 | super().__init__() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
387 | |
9214 | 388 | self.ignored_count = 0 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
389 | |
9214 | 390 | self.__dialog = dialog |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
391 | |
9214 | 392 | def done(self, src, changed, diff=""): |
393 | """ | |
394 | Public method to handle the end of a reformat. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
395 | |
9214 | 396 | @param src name of the processed file |
397 | @type pathlib.Path | |
398 | @param changed change status | |
399 | @type black.Changed | |
400 | @param diff unified diff of potential changes (defaults to "") | |
401 | @type str | |
402 | """ | |
403 | if changed is black.Changed.YES: | |
404 | status = ( | |
405 | QCoreApplication.translate("BlackFormattingDialog", "would reformat") | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
406 | if self.check or self.diff |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
407 | else QCoreApplication.translate("BlackFormattingDialog", "reformatted") |
9214 | 408 | ) |
409 | self.change_count += 1 | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
410 | |
9214 | 411 | elif changed is black.Changed.NO: |
412 | status = QCoreApplication.translate("BlackFormattingDialog", "unchanged") | |
413 | self.same_count += 1 | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
414 | |
9214 | 415 | elif changed is black.Changed.CACHED: |
416 | status = QCoreApplication.translate("BlackFormattingDialog", "unmodified") | |
417 | self.same_count += 1 | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
418 | |
9214 | 419 | if self.diff: |
420 | self.__dialog.addResultEntry(status, str(src), data=diff) | |
421 | else: | |
422 | self.__dialog.addResultEntry(status, str(src)) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
423 | |
9214 | 424 | def failed(self, src, message): |
425 | """ | |
426 | Public method to handle a reformat failure. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
427 | |
9214 | 428 | @param src name of the processed file |
429 | @type pathlib.Path | |
430 | @param message error message | |
431 | @type str | |
432 | """ | |
433 | status = QCoreApplication.translate("BlackFormattingDialog", "failed") | |
434 | self.failure_count += 1 | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
435 | |
9214 | 436 | self.__dialog.addResultEntry(status, str(src), isError=True, data=message) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
437 | |
9214 | 438 | def path_ignored(self, src, message=""): |
439 | """ | |
440 | Public method handling an ignored path. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
441 | |
9214 | 442 | @param src name of the processed file |
443 | @type pathlib.Path or str | |
444 | @param message ignore message (default to "") | |
445 | @type str (optional) | |
446 | """ | |
447 | status = QCoreApplication.translate("BlackFormattingDialog", "ignored") | |
448 | self.ignored_count += 1 | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
449 | |
9214 | 450 | self.__dialog.addResultEntry(status, str(src)) |