Tue, 10 Dec 2024 15:46:34 +0100
Updated copyright for 2025.
9214 | 1 | # -*- coding: utf-8 -*- |
2 | ||
11090
f5f5f5803935
Updated copyright for 2025.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11006
diff
changeset
|
3 | # Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> |
9214 | 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 | ||
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9460
diff
changeset
|
19 | from PyQt6.QtCore import QCoreApplication, QObject, Qt, pyqtSignal, pyqtSlot |
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 | ||
9624
b47dfa7a137d
Refactored the Utilities and Globals modules in order to enhance the maintainability.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9577
diff
changeset
|
28 | from eric7 import Preferences |
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
|
29 | from eric7.EricWidgets import EricMessageBox |
9624
b47dfa7a137d
Refactored the Utilities and Globals modules in order to enhance the maintainability.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9577
diff
changeset
|
30 | from eric7.SystemUtilities import FileSystemUtilities |
9214 | 31 | |
32 | from . import BlackUtilities | |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9460
diff
changeset
|
33 | from .BlackFormattingAction import BlackFormattingAction |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
34 | from .FormattingDiffWidget import FormattingDiffWidget |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9460
diff
changeset
|
35 | from .Ui_BlackFormattingDialog import Ui_BlackFormattingDialog |
9214 | 36 | |
37 | ||
38 | class BlackFormattingDialog(QDialog, Ui_BlackFormattingDialog): | |
39 | """ | |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
40 | 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
|
41 | results. |
9214 | 42 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
43 | |
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
|
44 | 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
|
45 | 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
|
46 | 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
|
47 | 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
|
48 | |
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
|
49 | FileNameColumn = 1 |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
50 | StatusColumn = 0 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
51 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
52 | def __init__( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
53 | self, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
54 | configuration, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
55 | filesList, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
56 | project=None, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
57 | action=BlackFormattingAction.Format, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
58 | parent=None, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
59 | ): |
9214 | 60 | """ |
61 | Constructor | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
62 | |
9214 | 63 | @param configuration dictionary containing the configuration parameters |
64 | @type dict | |
65 | @param filesList list of absolute file paths to be processed | |
66 | @type list of str | |
67 | @param project reference to the project object (defaults to None) | |
68 | @type Project (optional) | |
69 | @param action action to be performed (defaults to BlackFormattingAction.Format) | |
70 | @type BlackFormattingAction (optional) | |
71 | @param parent reference to the parent widget (defaults to None) | |
72 | @type QWidget (optional) | |
73 | """ | |
74 | super().__init__(parent) | |
75 | self.setupUi(self) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
76 | |
9214 | 77 | 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
|
78 | |
9214 | 79 | 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
|
80 | self.__config["__action__"] = action # needed by the workers |
9214 | 81 | self.__project = project |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
82 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
83 | self.__filesList = filesList[:] |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
84 | |
9214 | 85 | self.__diffDialog = None |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
86 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
87 | 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
|
88 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
89 | self.__formatButton = self.buttonBox.addButton( |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
90 | self.tr("Format Code"), QDialogButtonBox.ButtonRole.ActionRole |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
91 | ) |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
92 | self.__formatButton.setVisible(False) |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
93 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
94 | self.show() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
95 | QCoreApplication.processEvents() |
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.__performAction() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
98 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
99 | def __performAction(self): |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
100 | """ |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
101 | Private method to execute the requested formatting action. |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
102 | """ |
9577
a0600d883f9e
Corrected a little glitch in the BlackFormattingDialog widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
103 | self.progressBar.setMaximum(len(self.__filesList)) |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
104 | 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
|
105 | self.progressBar.setVisible(True) |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
106 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
107 | self.statisticsGroup.setVisible(False) |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
108 | self.__statistics = BlackStatistics() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
109 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
110 | self.__cancelled = False |
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.statusFilterComboBox.clear() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
113 | self.resultsList.clear() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
114 | |
9214 | 115 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(True) |
116 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) | |
117 | 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
|
118 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
119 | 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
|
120 | 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
|
121 | 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
|
122 | 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
|
123 | self.__formatOneFile(files[0]) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
124 | |
9214 | 125 | def __filterFiles(self, filesList): |
126 | """ | |
127 | Private method to filter the given list of files according the | |
128 | configuration parameters. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
129 | |
9214 | 130 | @param filesList list of files |
131 | @type list of str | |
132 | @return list of filtered files | |
133 | @rtype list of str | |
134 | """ | |
135 | filterRegExps = [ | |
136 | BlackUtilities.compileRegExp(self.__config[k]) | |
137 | 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
|
138 | if k in self.__config |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
139 | and bool(self.__config[k]) |
9214 | 140 | and BlackUtilities.validateRegExp(self.__config[k])[0] |
141 | ] | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
142 | |
9214 | 143 | files = [] |
144 | for file in filesList: | |
9624
b47dfa7a137d
Refactored the Utilities and Globals modules in order to enhance the maintainability.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9577
diff
changeset
|
145 | file = FileSystemUtilities.fromNativeSeparators(file) |
9214 | 146 | for filterRegExp in filterRegExps: |
147 | filterMatch = filterRegExp.search(file) | |
148 | 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
|
149 | self.__handleBlackFormattingResult("ignored", file, "") |
9214 | 150 | break |
151 | else: | |
152 | files.append(file) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
153 | |
9214 | 154 | return files |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
155 | |
9214 | 156 | def __resort(self): |
157 | """ | |
158 | Private method to resort the result list. | |
159 | """ | |
160 | self.resultsList.sortItems( | |
161 | self.resultsList.sortColumn(), | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
162 | self.resultsList.header().sortIndicatorOrder(), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
163 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
164 | |
9214 | 165 | def __resizeColumns(self): |
166 | """ | |
167 | Private method to resize the columns of the result list. | |
168 | """ | |
169 | self.resultsList.header().resizeSections( | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
170 | QHeaderView.ResizeMode.ResizeToContents |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
171 | ) |
9214 | 172 | 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
|
173 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
174 | def __populateStatusFilterCombo(self): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
175 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
176 | 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
|
177 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
178 | allowedSelections = set() |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
179 | for row in range(self.resultsList.topLevelItemCount()): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
180 | allowedSelections.add( |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
181 | self.resultsList.topLevelItem(row).text( |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
182 | BlackFormattingDialog.StatusColumn |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
183 | ) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
184 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
185 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
186 | self.statusFilterComboBox.addItem(self.__allFilter) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
187 | 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
|
188 | |
9214 | 189 | def __finish(self): |
190 | """ | |
191 | Private method to perform some actions after the run was performed or canceled. | |
192 | """ | |
193 | self.__resort() | |
194 | self.__resizeColumns() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
195 | |
9214 | 196 | self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False) |
197 | self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True) | |
198 | 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
|
199 | |
9214 | 200 | self.progressBar.setVisible(False) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
201 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
202 | self.__formatButton.setVisible( |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
203 | self.__config["__action__"] is not BlackFormattingAction.Format |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
204 | and self.__statistics.changeCount > 0 |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
205 | ) |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
206 | |
9214 | 207 | self.__updateStatistics() |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
208 | self.__populateStatusFilterCombo() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
209 | |
9214 | 210 | def __updateStatistics(self): |
211 | """ | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
212 | 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
|
213 | make them visible. |
9214 | 214 | """ |
215 | 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
|
216 | self.tr("Reformatted:") |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
217 | 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
|
218 | else self.tr("Would Reformat:") |
9214 | 219 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
220 | |
9214 | 221 | total = self.progressBar.maximum() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
222 | |
9214 | 223 | 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
|
224 | 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
|
225 | 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
|
226 | 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
|
227 | "{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
|
228 | ) |
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
|
229 | 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
|
230 | "{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
|
231 | ) |
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 | 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
|
233 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
234 | self.statisticsGroup.setVisible(True) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
235 | |
9214 | 236 | @pyqtSlot(QAbstractButton) |
237 | def on_buttonBox_clicked(self, button): | |
238 | """ | |
239 | 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
|
240 | |
9214 | 241 | @param button reference to the pressed button |
242 | @type QAbstractButton | |
243 | """ | |
244 | if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel): | |
245 | self.__cancelled = True | |
246 | elif button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close): | |
11006
a671918232f3
Modified modal dialog usage to always include a valid parent (needed for Wayland).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10689
diff
changeset
|
247 | if self.__diffDialog is not None: |
a671918232f3
Modified modal dialog usage to always include a valid parent (needed for Wayland).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10689
diff
changeset
|
248 | self.__diffDialog.close() |
a671918232f3
Modified modal dialog usage to always include a valid parent (needed for Wayland).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10689
diff
changeset
|
249 | self.__diffDialog = None |
9214 | 250 | self.accept() |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
251 | elif button is self.__formatButton: |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
252 | self.__formatButtonClicked() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
253 | |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
254 | @pyqtSlot() |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
255 | def __formatButtonClicked(self): |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
256 | """ |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
257 | Private slot handling the selection of the 'Format Code' button. |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
258 | """ |
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
|
259 | 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
|
260 | 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
|
261 | 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
|
262 | 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
|
263 | 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
|
264 | 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
|
265 | 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
|
266 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
267 | self.__config["__action__"] = BlackFormattingAction.Format |
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
268 | self.__performAction() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
269 | |
9214 | 270 | @pyqtSlot(QTreeWidgetItem, int) |
10689
3ede487187f2
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10683
diff
changeset
|
271 | def on_resultsList_itemDoubleClicked(self, item, _column): |
9214 | 272 | """ |
273 | 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
|
274 | |
9214 | 275 | @param item reference to the double clicked item |
276 | @type QTreeWidgetItem | |
10689
3ede487187f2
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10683
diff
changeset
|
277 | @param _column column number that was double clicked (unused) |
9214 | 278 | @type int |
279 | """ | |
280 | dataType = item.data(0, BlackFormattingDialog.DataTypeRole) | |
281 | if dataType == "error": | |
282 | EricMessageBox.critical( | |
283 | self, | |
284 | self.tr("Formatting Failure"), | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
285 | 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
|
286 | item.data(0, BlackFormattingDialog.DataRole) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
287 | ), |
9214 | 288 | ) |
289 | elif dataType == "diff": | |
290 | if self.__diffDialog is None: | |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
291 | self.__diffDialog = FormattingDiffWidget() |
9214 | 292 | 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
|
293 | |
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
|
294 | 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
|
295 | """ |
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 | 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
|
297 | 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
|
298 | |
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 | @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
|
300 | @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
|
301 | """ |
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 | 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
|
303 | 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
|
304 | # 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
|
305 | 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
|
306 | 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
|
307 | 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
|
308 | 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
|
309 | 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
|
310 | 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
|
311 | 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
|
312 | 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
|
313 | |
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 | # 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
|
315 | 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
|
316 | 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
|
317 | |
9289
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
318 | # 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
|
319 | 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
|
320 | initialTasks = min(2 * NumberOfProcesses, tasks) |
9289
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
321 | for _ in range(initialTasks): |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
322 | 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
|
323 | 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
|
324 | 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
|
325 | |
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 | # 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
|
327 | 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
|
328 | 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
|
329 | 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
|
330 | 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
|
331 | ) |
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 | 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
|
333 | ] |
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 | 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
|
335 | 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
|
336 | |
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
|
337 | # 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
|
338 | 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
|
339 | 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
|
340 | 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
|
341 | 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
|
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 | |
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 | 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
|
345 | 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
|
346 | |
9289
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
347 | if files: |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
348 | file = files.pop(0) |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
349 | relSrc = ( |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
350 | 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
|
351 | ) |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
352 | taskQueue.put((file, relSrc)) |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
353 | |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
354 | # Tell child processes to stop |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
355 | for _ in range(NumberOfProcesses): |
ba49c41e8f63
Did some optimizations in the multiprocessing code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9284
diff
changeset
|
356 | 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
|
357 | |
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
|
358 | 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
|
359 | 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
|
360 | 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
|
361 | |
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
|
362 | 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
|
363 | 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
|
364 | |
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 | 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
|
366 | |
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 | @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
|
368 | 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
|
369 | """ |
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 | 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
|
371 | |
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 | @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
|
373 | @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
|
374 | @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
|
375 | @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
|
376 | @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
|
377 | @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
|
378 | """ |
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 = 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
|
380 | 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
|
381 | 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
|
382 | |
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 | 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
|
384 | {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
|
385 | 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
|
386 | 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
|
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 | |
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 | 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
|
390 | 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
|
391 | 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
|
392 | 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
|
393 | 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
|
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 | |
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 | 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
|
397 | 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
|
398 | 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
|
399 | 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
|
400 | 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
|
401 | 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
|
402 | 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
|
403 | 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
|
404 | ) |
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 | 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
|
406 | 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
|
407 | 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
|
408 | 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
|
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 | |
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 | 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
|
412 | 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
|
413 | 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
|
414 | 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
|
415 | 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
|
416 | 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
|
417 | 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
|
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 | |
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
|
420 | def __formatOneFile(self, file): |
9214 | 421 | """ |
422 | 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
|
423 | |
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
|
424 | @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
|
425 | @type str |
9214 | 426 | """ |
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
|
427 | 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
|
428 | 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
|
429 | 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
|
430 | 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
|
431 | |
9214 | 432 | 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
|
433 | 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
|
434 | diff=self.__config["__action__"] is BlackFormattingAction.Diff, |
9214 | 435 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
436 | |
9214 | 437 | versions = ( |
438 | { | |
439 | black.TargetVersion[target.upper()] | |
440 | for target in self.__config["target-version"] | |
441 | } | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
442 | if self.__config["target-version"] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
443 | else set() |
9214 | 444 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
445 | |
9214 | 446 | mode = black.Mode( |
447 | target_versions=versions, | |
448 | line_length=int(self.__config["line-length"]), | |
449 | 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
|
450 | magic_trailing_comma=not self.__config["skip-magic-trailing-comma"], |
9214 | 451 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
452 | |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
453 | 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
|
454 | 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
|
455 | 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
|
456 | 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
|
457 | ) |
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 | 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
|
459 | 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
|
460 | 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
|
461 | 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
|
462 | 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
|
463 | 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
|
464 | 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
|
465 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
466 | |
9214 | 467 | self.__finish() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
468 | |
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
|
469 | @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
|
470 | def __diffFormatFile(src, fast, mode, report, relSrc=""): |
9214 | 471 | """ |
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
|
472 | Static method to check, if the given files need to be reformatted, and generate |
9214 | 473 | a unified diff. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
474 | |
9214 | 475 | @param src path of file to be checked |
476 | @type pathlib.Path | |
477 | @param fast flag indicating fast operation | |
478 | @type bool | |
479 | @param mode code formatting options | |
480 | @type black.Mode | |
481 | @param report reference to the report object | |
482 | @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
|
483 | @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
|
484 | @type str (optional) |
9214 | 485 | """ |
10192
f457742dd3d6
Modified the datetime.datetime methods to include the 'tz' argument.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10065
diff
changeset
|
486 | then = datetime.datetime.fromtimestamp( |
f457742dd3d6
Modified the datetime.datetime methods to include the 'tz' argument.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10065
diff
changeset
|
487 | src.stat().st_mtime, tz=datetime.timezone.utc |
f457742dd3d6
Modified the datetime.datetime methods to include the 'tz' argument.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10065
diff
changeset
|
488 | ) |
9214 | 489 | with open(src, "rb") as buf: |
490 | srcContents, _, _ = black.decode_bytes(buf.read()) | |
491 | try: | |
492 | dstContents = black.format_file_contents(srcContents, fast=fast, mode=mode) | |
493 | except black.NothingChanged: | |
494 | report.done(src, black.Changed.NO) | |
495 | return | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
496 | |
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
|
497 | 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
|
498 | |
10192
f457742dd3d6
Modified the datetime.datetime methods to include the 'tz' argument.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10065
diff
changeset
|
499 | now = datetime.datetime.now(tz=datetime.timezone.utc) |
9214 | 500 | srcName = f"{fileName}\t{then} +0000" |
501 | dstName = f"{fileName}\t{now} +0000" | |
502 | diffContents = black.diff(srcContents, dstContents, srcName, dstName) | |
503 | 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
|
504 | |
9214 | 505 | def closeEvent(self, evt): |
506 | """ | |
507 | 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
|
508 | |
9214 | 509 | @param evt reference to the close event |
510 | @type QCloseEvent | |
511 | """ | |
512 | if self.__diffDialog is not None: | |
513 | self.__diffDialog.close() | |
514 | evt.accept() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
515 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
516 | @pyqtSlot(str) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
517 | def on_statusFilterComboBox_currentTextChanged(self, status): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
518 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
519 | 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
|
520 | |
9220
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
521 | @param status selected status |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
522 | @type str |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
523 | """ |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
524 | for row in range(self.resultsList.topLevelItemCount()): |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
525 | itm = self.resultsList.topLevelItem(row) |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
526 | itm.setHidden( |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
527 | status != self.__allFilter |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
528 | and itm.text(BlackFormattingDialog.StatusColumn) != status |
e9e7eca7efee
Black Formatting Dialog
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9214
diff
changeset
|
529 | ) |
9214 | 530 | |
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
|
531 | @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
|
532 | 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
|
533 | """ |
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
|
534 | Private slot to handle the result of a black reformatting action. |
9214 | 535 | |
9453
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
536 | @param status status of the performed action (one of 'changed', 'failed', |
e5065dde905d
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
537 | '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
|
538 | @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
|
539 | @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
|
540 | @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
|
541 | @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
|
542 | @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
|
543 | """ |
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 | 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
|
545 | |
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
|
546 | 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
|
547 | 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
|
548 | self.tr("would reformat") |
9344
52990830b13f
Code Formatting
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9292
diff
changeset
|
549 | 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
|
550 | 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
|
551 | 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
|
552 | ) |
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 | 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
|
554 | |
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 | 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
|
556 | 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
|
557 | 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
|
558 | |
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 | 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
|
560 | 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
|
561 | 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
|
562 | |
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 | 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
|
564 | 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
|
565 | 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
|
566 | |
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 | 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
|
568 | 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
|
569 | 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
|
570 | 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
|
571 | |
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 | 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
|
573 | 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
|
574 | 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
|
575 | 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
|
576 | |
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
|
577 | 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
|
578 | 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
|
579 | |
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
|
580 | 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
|
581 | 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
|
582 | [ |
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 | statusMsg, |
10621
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
584 | ( |
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
585 | self.__project.getRelativePath(filename) |
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
586 | if self.__project |
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
587 | else filename |
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
588 | ), |
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
|
589 | ], |
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
|
590 | ) |
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
|
591 | 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
|
592 | 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
|
593 | 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
|
594 | 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
|
595 | 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
|
596 | ) |
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 | 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
|
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 | 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
|
600 | |
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 | 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
|
602 | |
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 | @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
|
605 | 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
|
606 | """ |
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 | 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
|
608 | """ |
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
|
609 | |
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 | 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
|
611 | 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
|
612 | 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
|
613 | 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
|
614 | 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
|
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 | |
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 | class BlackReport(QObject, black.Report): |
9214 | 618 | """ |
619 | 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
|
620 | |
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 | @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
|
622 | 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
|
623 | 'failed' or 'ignored'), the file name and data related to the result |
9214 | 624 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
625 | |
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
|
626 | 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
|
627 | |
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
|
628 | def __init__(self, parent=None): |
9214 | 629 | """ |
630 | Constructor | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
631 | |
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
|
632 | @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
|
633 | @type QObject (optional) |
9214 | 634 | """ |
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
|
635 | 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
|
636 | black.Report.__init__(self) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
637 | |
9214 | 638 | def done(self, src, changed, diff=""): |
639 | """ | |
640 | 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
|
641 | |
9214 | 642 | @param src name of the processed file |
643 | @type pathlib.Path | |
644 | @param changed change status | |
645 | @type black.Changed | |
646 | @param diff unified diff of potential changes (defaults to "") | |
647 | @type str | |
648 | """ | |
649 | 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
|
650 | status = "changed" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
651 | |
9214 | 652 | 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
|
653 | status = "unchanged" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
654 | |
9214 | 655 | 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
|
656 | status = "unmodified" |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9220
diff
changeset
|
657 | |
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
|
658 | 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
|
659 | |
9214 | 660 | def failed(self, src, message): |
661 | """ | |
662 | 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
|
663 | |
9214 | 664 | @param src name of the processed file |
665 | @type pathlib.Path | |
666 | @param message error message | |
667 | @type str | |
668 | """ | |
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
|
669 | 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
|
670 | |
10065
de4ae767b0e3
Corrected and checked some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
671 | def path_ignored(self, src, message=""): # noqa: U100 |
9214 | 672 | """ |
673 | 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
|
674 | |
9214 | 675 | @param src name of the processed file |
676 | @type pathlib.Path or str | |
10683
779cda568acb
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10621
diff
changeset
|
677 | @param message ignore message (default to "") (unused) |
9214 | 678 | @type str (optional) |
679 | """ | |
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
|
680 | 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
|
681 | |
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 | @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
|
684 | 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
|
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 | 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
|
687 | |
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 | 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
|
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 | 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
|
692 | 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
|
693 | 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
|
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 | 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
|
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 | 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
|
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 | |
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 | 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
|
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 | 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
|
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 | @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
|
706 | @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
|
707 | """ |
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 | 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
|
709 | |
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 | 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
|
711 | |
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 | 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
|
713 | """ |
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 | 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
|
715 | |
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 | @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
|
717 | @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
|
718 | @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
|
719 | @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
|
720 | @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
|
721 | @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
|
722 | """ |
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 | 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
|
724 | 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
|
725 | |
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 | 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
|
727 | 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
|
728 | |
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 | 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
|
730 | 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
|
731 | |
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 | 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
|
733 | 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
|
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 | |
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 | 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
|
737 | """ |
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 | 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
|
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 | @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
|
741 | @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
|
742 | @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
|
743 | @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
|
744 | """ |
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 | 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
|
746 | 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
|
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 | |
10065
de4ae767b0e3
Corrected and checked some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
749 | def path_ignored(self, src, message=""): # noqa: U100 |
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
|
750 | """ |
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 | 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
|
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 | @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
|
754 | @type pathlib.Path or str |
10683
779cda568acb
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10621
diff
changeset
|
755 | @param message ignore message (default to "") (unused) |
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
|
756 | @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
|
757 | """ |
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
|
758 | 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
|
759 | 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
|
760 | ) |