Wed, 02 Nov 2022 10:11:18 +0100
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
9214 | 1 | # -*- coding: utf-8 -*- |
2 | ||
3 | # Copyright (c) 2022 Detlev Offenbach <detlev@die-offenbachs.de> | |
4 | # | |
5 | ||
6 | """ | |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
7 | Module implementing a dialog showing the Black code formatting progress and the results. |
9214 | 8 | """ |
9 | ||
10 | import copy | |
11 | import datetime | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
12 | import multiprocessing |
9214 | 13 | import pathlib |
14 | ||
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
15 | from dataclasses import dataclass |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
16 | |
9214 | 17 | import black |
18 | ||
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
19 | from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QCoreApplication, QObject |
9214 | 20 | from PyQt6.QtWidgets import ( |
21 | QAbstractButton, | |
22 | QDialog, | |
23 | QDialogButtonBox, | |
24 | QHeaderView, | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
25 | QTreeWidgetItem, |
9214 | 26 | ) |
27 | ||
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9360
diff
changeset
|
28 | from eric7.EricWidgets import EricMessageBox |
9214 | 29 | |
30 | from .Ui_BlackFormattingDialog import Ui_BlackFormattingDialog | |
31 | ||
32 | from . import BlackUtilities | |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
33 | from .FormattingDiffWidget import FormattingDiffWidget |
9214 | 34 | from .BlackFormattingAction import BlackFormattingAction |
35 | ||
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9360
diff
changeset
|
36 | from eric7 import Preferences, Utilities |
9214 | 37 | |
38 | ||
39 | class BlackFormattingDialog(QDialog, Ui_BlackFormattingDialog): | |
40 | """ | |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
41 | Class implementing a dialog showing the Black code formatting progress and the |
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
42 | results. |
9214 | 43 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
44 | |
9460
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
45 | DataRole = Qt.ItemDataRole.UserRole |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
46 | DataTypeRole = Qt.ItemDataRole.UserRole + 1 |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
47 | FileNameRole = Qt.ItemDataRole.UserRole + 2 |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
48 | StatusRole = Qt.ItemDataRole.UserRole + 3 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
49 | |
9460
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
50 | FileNameColumn = 1 |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
51 | StatusColumn = 0 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
52 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
53 | def __init__( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
54 | self, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
55 | configuration, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
56 | filesList, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
57 | project=None, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
58 | action=BlackFormattingAction.Format, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
59 | parent=None, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
60 | ): |
9214 | 61 | """ |
62 | Constructor | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
63 | |
9214 | 64 | @param configuration dictionary containing the configuration parameters |
65 | @type dict | |
66 | @param filesList list of absolute file paths to be processed | |
67 | @type list of str | |
68 | @param project reference to the project object (defaults to None) | |
69 | @type Project (optional) | |
70 | @param action action to be performed (defaults to BlackFormattingAction.Format) | |
71 | @type BlackFormattingAction (optional) | |
72 | @param parent reference to the parent widget (defaults to None) | |
73 | @type QWidget (optional) | |
74 | """ | |
75 | super().__init__(parent) | |
76 | self.setupUi(self) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
77 | |
9214 | 78 | self.progressBar.setMaximum(len(filesList)) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
79 | |
9214 | 80 | 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
|
81 | |
9214 | 82 | self.__config = copy.deepcopy(configuration) |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
83 | self.__config["__action__"] = action # needed by the workers |
9214 | 84 | self.__project = project |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
85 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
86 | self.__filesList = filesList[:] |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
87 | |
9214 | 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 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
92 | self.__formatButton = self.buttonBox.addButton( |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
93 | self.tr("Format Code"), QDialogButtonBox.ButtonRole.ActionRole |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
94 | ) |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
95 | self.__formatButton.setVisible(False) |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
96 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
97 | self.show() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
98 | QCoreApplication.processEvents() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
99 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
100 | self.__performAction() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
101 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
102 | def __performAction(self): |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
103 | """ |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
104 | Private method to execute the requested formatting action. |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
105 | """ |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
106 | self.progressBar.setValue(0) |
9360
8b46571d9cc9
Forgot to make the progress bar of the formatting dialog visible again.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9348
diff
changeset
|
107 | self.progressBar.setVisible(True) |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
108 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
109 | self.statisticsGroup.setVisible(False) |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
110 | self.__statistics = BlackStatistics() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
111 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
112 | self.__cancelled = False |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
113 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
114 | self.statusFilterComboBox.clear() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
115 | self.resultsList.clear() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
116 | |
9214 | 117 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(True) |
118 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) | |
119 | 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
|
120 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
121 | files = self.__filterFiles(self.__filesList) |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
122 | if len(files) > 1: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
123 | self.__formatManyFiles(files) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
124 | elif len(files) == 1: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
125 | self.__formatOneFile(files[0]) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
126 | |
9214 | 127 | def __filterFiles(self, filesList): |
128 | """ | |
129 | Private method to filter the given list of files according the | |
130 | configuration parameters. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
131 | |
9214 | 132 | @param filesList list of files |
133 | @type list of str | |
134 | @return list of filtered files | |
135 | @rtype list of str | |
136 | """ | |
137 | filterRegExps = [ | |
138 | BlackUtilities.compileRegExp(self.__config[k]) | |
139 | 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
|
140 | if k in self.__config |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
141 | and bool(self.__config[k]) |
9214 | 142 | and BlackUtilities.validateRegExp(self.__config[k])[0] |
143 | ] | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
144 | |
9214 | 145 | files = [] |
146 | for file in filesList: | |
147 | file = Utilities.fromNativeSeparators(file) | |
148 | for filterRegExp in filterRegExps: | |
149 | filterMatch = filterRegExp.search(file) | |
150 | if filterMatch and filterMatch.group(0): | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
151 | self.__handleBlackFormattingResult("ignored", file, "") |
9214 | 152 | break |
153 | else: | |
154 | files.append(file) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
155 | |
9214 | 156 | return files |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
157 | |
9214 | 158 | def __resort(self): |
159 | """ | |
160 | Private method to resort the result list. | |
161 | """ | |
162 | self.resultsList.sortItems( | |
163 | self.resultsList.sortColumn(), | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
164 | self.resultsList.header().sortIndicatorOrder(), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
165 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
166 | |
9214 | 167 | def __resizeColumns(self): |
168 | """ | |
169 | Private method to resize the columns of the result list. | |
170 | """ | |
171 | self.resultsList.header().resizeSections( | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
172 | QHeaderView.ResizeMode.ResizeToContents |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
173 | ) |
9214 | 174 | 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
|
175 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
176 | def __populateStatusFilterCombo(self): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
177 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
178 | 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
|
179 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
180 | allowedSelections = set() |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
181 | for row in range(self.resultsList.topLevelItemCount()): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
182 | allowedSelections.add( |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
183 | self.resultsList.topLevelItem(row).text( |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
184 | BlackFormattingDialog.StatusColumn |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
185 | ) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
186 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
187 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
188 | self.statusFilterComboBox.addItem(self.__allFilter) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
189 | 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
|
190 | |
9214 | 191 | def __finish(self): |
192 | """ | |
193 | Private method to perform some actions after the run was performed or canceled. | |
194 | """ | |
195 | self.__resort() | |
196 | self.__resizeColumns() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
197 | |
9214 | 198 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False) |
199 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True) | |
200 | 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
|
201 | |
9214 | 202 | self.progressBar.setVisible(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
203 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
204 | self.__formatButton.setVisible( |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
205 | self.__config["__action__"] is not BlackFormattingAction.Format |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
206 | and self.__statistics.changeCount > 0 |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
207 | ) |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
208 | |
9214 | 209 | self.__updateStatistics() |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
210 | self.__populateStatusFilterCombo() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
211 | |
9214 | 212 | def __updateStatistics(self): |
213 | """ | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
214 | 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
|
215 | make them visible. |
9214 | 216 | """ |
217 | self.reformattedLabel.setText( | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
218 | self.tr("Reformatted:") |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
219 | if self.__config["__action__"] is BlackFormattingAction.Format |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
220 | else self.tr("Would Reformat:") |
9214 | 221 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
222 | |
9214 | 223 | total = self.progressBar.maximum() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
224 | |
9214 | 225 | self.totalCountLabel.setText("{0:n}".format(total)) |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
226 | self.excludedCountLabel.setText("{0:n}".format(self.__statistics.ignoreCount)) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
227 | self.failuresCountLabel.setText("{0:n}".format(self.__statistics.failureCount)) |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
228 | self.processedCountLabel.setText( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
229 | "{0:n}".format(self.__statistics.processedCount) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
230 | ) |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
231 | self.reformattedCountLabel.setText( |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
232 | "{0:n}".format(self.__statistics.changeCount) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
233 | ) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
234 | self.unchangedCountLabel.setText("{0:n}".format(self.__statistics.sameCount)) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
235 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
236 | self.statisticsGroup.setVisible(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
237 | |
9214 | 238 | @pyqtSlot(QAbstractButton) |
239 | def on_buttonBox_clicked(self, button): | |
240 | """ | |
241 | 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
|
242 | |
9214 | 243 | @param button reference to the pressed button |
244 | @type QAbstractButton | |
245 | """ | |
246 | if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel): | |
247 | self.__cancelled = True | |
248 | elif button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close): | |
249 | self.accept() | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
250 | elif button is self.__formatButton: |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
251 | self.__formatButtonClicked() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
252 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
253 | @pyqtSlot() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
254 | def __formatButtonClicked(self): |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
255 | """ |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
256 | Private slot handling the selection of the 'Format Code' button. |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
257 | """ |
9460
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
258 | files = [] |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
259 | for row in range(self.resultsList.topLevelItemCount()): |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
260 | itm = self.resultsList.topLevelItem(row) |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
261 | if itm.data(0, BlackFormattingDialog.StatusRole) == "changed": |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
262 | files.append(itm.data(0, BlackFormattingDialog.FileNameRole)) |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
263 | if files: |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
264 | self.__filesList = files |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
265 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
266 | self.__config["__action__"] = BlackFormattingAction.Format |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
267 | self.__performAction() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
268 | |
9214 | 269 | @pyqtSlot(QTreeWidgetItem, int) |
270 | def on_resultsList_itemDoubleClicked(self, item, column): | |
271 | """ | |
272 | 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
|
273 | |
9214 | 274 | @param item reference to the double clicked item |
275 | @type QTreeWidgetItem | |
276 | @param column column number that was double clicked | |
277 | @type int | |
278 | """ | |
279 | dataType = item.data(0, BlackFormattingDialog.DataTypeRole) | |
280 | if dataType == "error": | |
281 | EricMessageBox.critical( | |
282 | self, | |
283 | self.tr("Formatting Failure"), | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
284 | 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
|
285 | item.data(0, BlackFormattingDialog.DataRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
286 | ), |
9214 | 287 | ) |
288 | elif dataType == "diff": | |
289 | if self.__diffDialog is None: | |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
290 | self.__diffDialog = FormattingDiffWidget() |
9214 | 291 | 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
|
292 | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
293 | def __formatManyFiles(self, files): |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
294 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
295 | Private method to format the list of files according the configuration using |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
296 | multiple processes in parallel. |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
297 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
298 | @param files list of files to be processed |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
299 | @type list of str |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
300 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
301 | maxProcesses = Preferences.getUI("BackgroundServiceProcesses") |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
302 | if maxProcesses == 0: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
303 | # determine based on CPU count |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
304 | try: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
305 | NumberOfProcesses = multiprocessing.cpu_count() |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
306 | if NumberOfProcesses >= 1: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
307 | NumberOfProcesses -= 1 |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
308 | except NotImplementedError: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
309 | NumberOfProcesses = 1 |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
310 | else: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
311 | NumberOfProcesses = maxProcesses |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
312 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
313 | # Create queues |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
314 | taskQueue = multiprocessing.Queue() |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
315 | doneQueue = multiprocessing.Queue() |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
316 | |
9289
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
317 | # Submit tasks (initially two times the number of processes) |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
318 | tasks = len(files) |
9292
a5c8a0213fe3
Fixed an issue in the multiprocessing usage causing a traceback when then number of tasks is smaller than the number of worker processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9289
diff
changeset
|
319 | initialTasks = min(2 * NumberOfProcesses, tasks) |
9289
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
320 | for _ in range(initialTasks): |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
321 | file = files.pop(0) |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
322 | relSrc = self.__project.getRelativePath(str(file)) if self.__project else "" |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
323 | taskQueue.put((file, relSrc)) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
324 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
325 | # Start worker processes |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
326 | workers = [ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
327 | multiprocessing.Process( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
328 | target=self.formattingWorkerTask, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
329 | args=(taskQueue, doneQueue, self.__config), |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
330 | ) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
331 | for _ in range(NumberOfProcesses) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
332 | ] |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
333 | for worker in workers: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
334 | worker.start() |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
335 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
336 | # Get the results from the worker tasks |
9289
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
337 | for _ in range(tasks): |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
338 | result = doneQueue.get() |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
339 | self.__handleBlackFormattingResult( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
340 | result.status, result.filename, result.data |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
341 | ) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
342 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
343 | if self.__cancelled: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
344 | break |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
345 | |
9289
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
346 | if files: |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
347 | file = files.pop(0) |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
348 | relSrc = ( |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
349 | self.__project.getRelativePath(str(file)) if self.__project else "" |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
350 | ) |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
351 | taskQueue.put((file, relSrc)) |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
352 | |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
353 | # Tell child processes to stop |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
354 | for _ in range(NumberOfProcesses): |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
355 | taskQueue.put("STOP") |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
356 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
357 | for worker in workers: |
9348
f61d71d95cb1
Changed the multiprocessing start method to 'spawn' because 'fork' (on *nix) seems to be unreliable with respect to queues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9344
diff
changeset
|
358 | worker.join() |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
359 | worker.close() |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
360 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
361 | taskQueue.close() |
9348
f61d71d95cb1
Changed the multiprocessing start method to 'spawn' because 'fork' (on *nix) seems to be unreliable with respect to queues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9344
diff
changeset
|
362 | doneQueue.close() |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
363 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
364 | self.__finish() |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
365 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
366 | @staticmethod |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
367 | def formattingWorkerTask(inputQueue, outputQueue, config): |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
368 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
369 | Static method acting as the parallel worker for the formatting task. |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
370 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
371 | @param inputQueue input queue |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
372 | @type multiprocessing.Queue |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
373 | @param outputQueue output queue |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
374 | @type multiprocessing.Queue |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
375 | @param config dictionary containing the configuration parameters |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
376 | @type dict |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
377 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
378 | report = BlackMultiprocessingReport(outputQueue) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
379 | report.check = config["__action__"] is BlackFormattingAction.Check |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
380 | report.diff = config["__action__"] is BlackFormattingAction.Diff |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
381 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
382 | versions = ( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
383 | {black.TargetVersion[target.upper()] for target in config["target-version"]} |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
384 | if config["target-version"] |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
385 | else set() |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
386 | ) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
387 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
388 | mode = black.Mode( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
389 | target_versions=versions, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
390 | line_length=int(config["line-length"]), |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
391 | string_normalization=not config["skip-string-normalization"], |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
392 | magic_trailing_comma=not config["skip-magic-trailing-comma"], |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
393 | ) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
394 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
395 | if config["__action__"] is BlackFormattingAction.Diff: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
396 | for file, relSrc in iter(inputQueue.get, "STOP"): |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
397 | BlackFormattingDialog.__diffFormatFile( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
398 | pathlib.Path(file), |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
399 | fast=False, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
400 | mode=mode, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
401 | report=report, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
402 | relSrc=relSrc, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
403 | ) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
404 | else: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
405 | writeBack = black.WriteBack.from_configuration( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
406 | check=config["__action__"] is BlackFormattingAction.Check, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
407 | diff=config["__action__"] is BlackFormattingAction.Diff, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
408 | ) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
409 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
410 | for file, _relSrc in iter(inputQueue.get, "STOP"): |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
411 | black.reformat_one( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
412 | pathlib.Path(file), |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
413 | fast=False, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
414 | write_back=writeBack, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
415 | mode=mode, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
416 | report=report, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
417 | ) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
418 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
419 | def __formatOneFile(self, file): |
9214 | 420 | """ |
421 | Private method to format the list of files according the configuration. | |
9284
3b3a4f659782
"Blacked" the sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9283
diff
changeset
|
422 | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
423 | @param file name of the file to be processed |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
424 | @type str |
9214 | 425 | """ |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
426 | report = BlackReport(self) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
427 | report.check = self.__config["__action__"] is BlackFormattingAction.Check |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
428 | report.diff = self.__config["__action__"] is BlackFormattingAction.Diff |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
429 | report.result.connect(self.__handleBlackFormattingResult) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
430 | |
9214 | 431 | writeBack = black.WriteBack.from_configuration( |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
432 | check=self.__config["__action__"] is BlackFormattingAction.Check, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
433 | diff=self.__config["__action__"] is BlackFormattingAction.Diff, |
9214 | 434 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
435 | |
9214 | 436 | versions = ( |
437 | { | |
438 | black.TargetVersion[target.upper()] | |
439 | for target in self.__config["target-version"] | |
440 | } | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
441 | if self.__config["target-version"] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
442 | else set() |
9214 | 443 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
444 | |
9214 | 445 | mode = black.Mode( |
446 | target_versions=versions, | |
447 | line_length=int(self.__config["line-length"]), | |
448 | 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
|
449 | magic_trailing_comma=not self.__config["skip-magic-trailing-comma"], |
9214 | 450 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
451 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
452 | if self.__config["__action__"] is BlackFormattingAction.Diff: |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
453 | relSrc = self.__project.getRelativePath(str(file)) if self.__project else "" |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
454 | self.__diffFormatFile( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
455 | pathlib.Path(file), fast=False, mode=mode, report=report, relSrc=relSrc |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
456 | ) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
457 | else: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
458 | black.reformat_one( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
459 | pathlib.Path(file), |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
460 | fast=False, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
461 | write_back=writeBack, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
462 | mode=mode, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
463 | report=report, |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
464 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
465 | |
9214 | 466 | self.__finish() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
467 | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
468 | @staticmethod |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
469 | def __diffFormatFile(src, fast, mode, report, relSrc=""): |
9214 | 470 | """ |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
471 | Static method to check, if the given files need to be reformatted, and generate |
9214 | 472 | a unified diff. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
473 | |
9214 | 474 | @param src path of file to be checked |
475 | @type pathlib.Path | |
476 | @param fast flag indicating fast operation | |
477 | @type bool | |
478 | @param mode code formatting options | |
479 | @type black.Mode | |
480 | @param report reference to the report object | |
481 | @type BlackReport | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
482 | @param relSrc name of the file relative to the project (defaults to "") |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
483 | @type str (optional) |
9214 | 484 | """ |
485 | then = datetime.datetime.utcfromtimestamp(src.stat().st_mtime) | |
486 | with open(src, "rb") as buf: | |
487 | srcContents, _, _ = black.decode_bytes(buf.read()) | |
488 | try: | |
489 | dstContents = black.format_file_contents(srcContents, fast=fast, mode=mode) | |
490 | except black.NothingChanged: | |
491 | report.done(src, black.Changed.NO) | |
492 | return | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
493 | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
494 | fileName = relSrc if bool(relSrc) else str(src) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
495 | |
9214 | 496 | now = datetime.datetime.utcnow() |
497 | srcName = f"{fileName}\t{then} +0000" | |
498 | dstName = f"{fileName}\t{now} +0000" | |
499 | diffContents = black.diff(srcContents, dstContents, srcName, dstName) | |
500 | 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
|
501 | |
9214 | 502 | def closeEvent(self, evt): |
503 | """ | |
504 | 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
|
505 | |
9214 | 506 | @param evt reference to the close event |
507 | @type QCloseEvent | |
508 | """ | |
509 | if self.__diffDialog is not None: | |
510 | self.__diffDialog.close() | |
511 | evt.accept() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
512 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
513 | @pyqtSlot(str) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
514 | def on_statusFilterComboBox_currentTextChanged(self, status): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
515 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
516 | 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
|
517 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
518 | @param status selected status |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
519 | @type str |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
520 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
521 | for row in range(self.resultsList.topLevelItemCount()): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
522 | itm = self.resultsList.topLevelItem(row) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
523 | itm.setHidden( |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
524 | status != self.__allFilter |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
525 | and itm.text(BlackFormattingDialog.StatusColumn) != status |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
526 | ) |
9214 | 527 | |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
528 | @pyqtSlot(str, str, str) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
529 | def __handleBlackFormattingResult(self, status, filename, data): |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
530 | """ |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
531 | Private slot to handle the result of a black reformatting action. |
9214 | 532 | |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
533 | @param status status of the performed action (one of 'changed', 'failed', |
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
534 | 'ignored', 'unchanged' or 'unmodified') |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
535 | @type str |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
536 | @param filename name of the processed file |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
537 | @type str |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
538 | @param data action data (error message or unified diff) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
539 | @type str |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
540 | """ |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
541 | isError = False |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
542 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
543 | if status == "changed": |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
544 | statusMsg = ( |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
545 | self.tr("would reformat") |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
546 | if self.__config["__action__"] |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
547 | in (BlackFormattingAction.Check, BlackFormattingAction.Diff) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
548 | else self.tr("reformatted") |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
549 | ) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
550 | self.__statistics.changeCount += 1 |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
551 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
552 | elif status == "unchanged": |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
553 | statusMsg = self.tr("unchanged") |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
554 | self.__statistics.sameCount += 1 |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
555 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
556 | elif status == "unmodified": |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
557 | statusMsg = self.tr("unmodified") |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
558 | self.__statistics.sameCount += 1 |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
559 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
560 | elif status == "ignored": |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
561 | statusMsg = self.tr("ignored") |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
562 | self.__statistics.ignoreCount += 1 |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
563 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
564 | elif status == "failed": |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
565 | statusMsg = self.tr("failed") |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
566 | self.__statistics.failureCount += 1 |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
567 | isError = True |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
568 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
569 | else: |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
570 | statusMsg = self.tr("invalid status ({0})").format(status) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
571 | self.__statistics.failureCount += 1 |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
572 | isError = True |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
573 | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
574 | if status != "ignored": |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
575 | self.__statistics.processedCount += 1 |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
576 | |
9460
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
577 | itm = QTreeWidgetItem( |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
578 | self.resultsList, |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
579 | [ |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
580 | statusMsg, |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
581 | self.__project.getRelativePath(filename) |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
582 | if self.__project |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
583 | else filename, |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
584 | ], |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
585 | ) |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
586 | itm.setData(0, BlackFormattingDialog.StatusRole, status) |
0d1b5d0fd815
Modified the Black and Isort dialogs such, that only files that need a change are processed after a diff or check run by pressing the relevant button.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9453
diff
changeset
|
587 | itm.setData(0, BlackFormattingDialog.FileNameRole, filename) |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
588 | if data: |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
589 | itm.setData( |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
590 | 0, BlackFormattingDialog.DataTypeRole, "error" if isError else "diff" |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
591 | ) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
592 | itm.setData(0, BlackFormattingDialog.DataRole, data) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
593 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
594 | self.progressBar.setValue(self.progressBar.value() + 1) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
595 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
596 | QCoreApplication.processEvents() |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
597 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
598 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
599 | @dataclass |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
600 | class BlackStatistics: |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
601 | """ |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
602 | Class containing the reformatting statistic data. |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
603 | """ |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
604 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
605 | ignoreCount: int = 0 |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
606 | changeCount: int = 0 |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
607 | sameCount: int = 0 |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
608 | failureCount: int = 0 |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
609 | processedCount: int = 0 |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
610 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
611 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
612 | class BlackReport(QObject, black.Report): |
9214 | 613 | """ |
614 | Class extending the black Report to work with our dialog. | |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
615 | |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
616 | @signal result(status, file name, data) emitted to signal the reformatting result |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
617 | as three strings giving the status (one of 'changed', 'unchanged', 'unmodified', |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
618 | 'failed' or 'ignored'), the file name and data related to the result |
9214 | 619 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
620 | |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
621 | result = pyqtSignal(str, str, str) |
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
622 | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
623 | def __init__(self, parent=None): |
9214 | 624 | """ |
625 | Constructor | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
626 | |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
627 | @param parent reference to the parent object (defaults to None |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
628 | @type QObject (optional) |
9214 | 629 | """ |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
630 | QObject.__init__(self, parent) |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
631 | black.Report.__init__(self) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
632 | |
9214 | 633 | def done(self, src, changed, diff=""): |
634 | """ | |
635 | 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
|
636 | |
9214 | 637 | @param src name of the processed file |
638 | @type pathlib.Path | |
639 | @param changed change status | |
640 | @type black.Changed | |
641 | @param diff unified diff of potential changes (defaults to "") | |
642 | @type str | |
643 | """ | |
644 | if changed is black.Changed.YES: | |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
645 | status = "changed" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
646 | |
9214 | 647 | elif changed is black.Changed.NO: |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
648 | status = "unchanged" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
649 | |
9214 | 650 | elif changed is black.Changed.CACHED: |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
651 | status = "unmodified" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
652 | |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
653 | self.result.emit(status, str(src), diff) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
654 | |
9214 | 655 | def failed(self, src, message): |
656 | """ | |
657 | 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
|
658 | |
9214 | 659 | @param src name of the processed file |
660 | @type pathlib.Path | |
661 | @param message error message | |
662 | @type str | |
663 | """ | |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
664 | self.result.emit("failed", str(src), message) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
665 | |
9214 | 666 | def path_ignored(self, src, message=""): |
667 | """ | |
668 | 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
|
669 | |
9214 | 670 | @param src name of the processed file |
671 | @type pathlib.Path or str | |
672 | @param message ignore message (default to "") | |
673 | @type str (optional) | |
674 | """ | |
9281
76caf27cb8a8
Changed the code reformatting dialog to work with signals and slots and do the statistics calculation in the dialog class (prepare for multi processing).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
675 | self.result.emit("ignored", str(src), "") |
9283
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
676 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
677 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
678 | @dataclass |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
679 | class BlackMultiprocessingResult: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
680 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
681 | Class containing the reformatting result data. |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
682 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
683 | This class is used when reformatting multiple files in parallel using processes. |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
684 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
685 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
686 | status: str = "" |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
687 | filename: str = "" |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
688 | data: str = "" |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
689 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
690 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
691 | class BlackMultiprocessingReport(black.Report): |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
692 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
693 | Class extending the black Report to work with multiprocessing. |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
694 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
695 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
696 | def __init__(self, resultQueue): |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
697 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
698 | Constructor |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
699 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
700 | @param resultQueue reference to the queue to put the results into |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
701 | @type multiprocessing.Queue |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
702 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
703 | super().__init__() |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
704 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
705 | self.__queue = resultQueue |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
706 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
707 | def done(self, src, changed, diff=""): |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
708 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
709 | Public method to handle the end of a reformat. |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
710 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
711 | @param src name of the processed file |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
712 | @type pathlib.Path |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
713 | @param changed change status |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
714 | @type black.Changed |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
715 | @param diff unified diff of potential changes (defaults to "") |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
716 | @type str |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
717 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
718 | if changed is black.Changed.YES: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
719 | status = "changed" |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
720 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
721 | elif changed is black.Changed.NO: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
722 | status = "unchanged" |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
723 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
724 | elif changed is black.Changed.CACHED: |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
725 | status = "unmodified" |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
726 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
727 | self.__queue.put( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
728 | BlackMultiprocessingResult(status=status, filename=str(src), data=diff) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
729 | ) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
730 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
731 | def failed(self, src, message): |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
732 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
733 | Public method to handle a reformat failure. |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
734 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
735 | @param src name of the processed file |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
736 | @type pathlib.Path |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
737 | @param message error message |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
738 | @type str |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
739 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
740 | self.__queue.put( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
741 | BlackMultiprocessingResult(status="failed", filename=str(src), data=message) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
742 | ) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
743 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
744 | def path_ignored(self, src, message=""): |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
745 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
746 | Public method handling an ignored path. |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
747 | |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
748 | @param src name of the processed file |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
749 | @type pathlib.Path or str |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
750 | @param message ignore message (default to "") |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
751 | @type str (optional) |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
752 | """ |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
753 | self.__queue.put( |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
754 | BlackMultiprocessingResult(status="ignored", filename=str(src), data="") |
0e9d2c4e379e
Changed the code reformatting dialog such, that it uses multiple processes to reformat files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9281
diff
changeset
|
755 | ) |