Fri, 18 Sep 2015 19:46:57 +0200
Changed the logic for the various code metrics calculations to be separate services and fine tuned the dialogs.
# -*- coding: utf-8 -*- # Copyright (c) 2015 Detlev Offenbach <detlev@die-offenbachs.de> # """ Module implementing a dialog to show maintainability indexes. """ from __future__ import unicode_literals try: str = unicode # __IGNORE_EXCEPTION __IGNORE_WARNING__ except NameError: pass import os import fnmatch from PyQt5.QtCore import pyqtSlot, qVersion, Qt, QTimer, QLocale from PyQt5.QtGui import QColor from PyQt5.QtWidgets import ( QDialog, QDialogButtonBox, QAbstractButton, QHeaderView, QTreeWidgetItem, QApplication ) from .Ui_MaintainabilityIndexDialog import Ui_MaintainabilityIndexDialog from E5Gui.E5Application import e5App import Preferences import Utilities class MaintainabilityIndexDialog(QDialog, Ui_MaintainabilityIndexDialog): """ Class implementing a dialog to show maintainability indexes. """ def __init__(self, radonService, parent=None): """ Constructor @param radonService reference to the service @type RadonMetricsPlugin @param parent reference to the parent widget @type QWidget """ super(MaintainabilityIndexDialog, self).__init__(parent) self.setupUi(self) self.setWindowFlags(Qt.Window) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) self.resultList.headerItem().setText(self.resultList.columnCount(), "") self.radonService = radonService self.radonService.maintainabilityIndexDone.connect( self.__processResult) self.radonService.error.connect(self.__processError) self.radonService.batchFinished.connect(self.__batchFinished) self.cancelled = False self.__project = e5App().getObject("Project") self.__locale = QLocale() self.__finished = True self.__errorItem = None self.__fileList = [] self.filterFrame.setVisible(False) self.explanationLabel.setText(self.tr( "<table>" "<tr><td colspan=2><b>Ranking:</b></td></tr>" "<tr><td><b>A</b></td><td>score > 19</td></tr>" "<tr><td><b>B</b></td><td>9 < score ≤ 19</td></tr>" "<tr><td><b>C</b></td><td>score ≤ 9</td></tr>" "</table>" )) self.__rankColors = { "A": Qt.green, "B": Qt.yellow, #QColor("orange"), "C": Qt.red, } def __resizeResultColumns(self): """ Private method to resize the list columns. """ self.resultList.header().resizeSections(QHeaderView.ResizeToContents) self.resultList.header().setStretchLastSection(True) def __createResultItem(self, filename, values): """ Private slot to create a new item in the result list. @param filename name of the file @type str @param values values to be displayed @type dict """ data = [self.__project.getRelativePath(filename)] try: data.append("{0:>6}".format( self.__locale.toString(float(values["mi"]), "f", 2))) except ValueError: data.append(values["mi"]) data.append(values["rank"]) itm = QTreeWidgetItem(self.resultList, data) itm.setTextAlignment(1, Qt.Alignment(Qt.AlignRight)) itm.setTextAlignment(2, Qt.Alignment(Qt.AlignHCenter)) if values["rank"] in ["A", "B", "C"]: itm.setBackground(2, self.__rankColors[values["rank"]]) if values["rank"] in ["A", "B", "C"]: self.__summary[values["rank"]] += 1 def __createErrorItem(self, filename, message): """ Private slot to create a new error item in the result list. @param filename name of the file @type str @param message error message @type str """ if self.__errorItem is None: self.__errorItem = QTreeWidgetItem(self.resultList, [ self.tr("Errors")]) self.__errorItem.setExpanded(True) self.__errorItem.setForeground(0, Qt.red) msg = "{0} ({1})".format(self.__project.getRelativePath(filename), message) if not self.resultList.findItems(msg, Qt.MatchExactly): itm = QTreeWidgetItem(self.__errorItem, [msg]) itm.setForeground(0, Qt.red) itm.setFirstColumnSpanned(True) def prepare(self, fileList, project): """ Public method to prepare the dialog with a list of filenames. @param fileList list of filenames @type list of str @param project reference to the project object @type Project """ self.__fileList = fileList[:] self.__project = project self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) self.filterFrame.setVisible(True) self.__data = self.__project.getData( "OTHERTOOLSPARMS", "RadonCodeMetrics") if self.__data is None or "ExcludeFiles" not in self.__data: self.__data = {"ExcludeFiles": ""} self.excludeFilesEdit.setText(self.__data["ExcludeFiles"]) def start(self, fn): """ Public slot to start the maintainability index determination. @param fn file or list of files or directory to show the maintainability index for @type str or list of str """ self.cancelled = False self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) QApplication.processEvents() if isinstance(fn, list): self.files = fn elif os.path.isdir(fn): self.files = [] extensions = set(Preferences.getPython("PythonExtensions") + Preferences.getPython("Python3Extensions")) for ext in extensions: self.files.extend( Utilities.direntries(fn, True, '*{0}'.format(ext), 0)) else: self.files = [fn] self.files.sort() # check for missing files for f in self.files[:]: if not os.path.exists(f): self.files.remove(f) self.__summary = { "A": 0, "B": 0, "C": 0, } if len(self.files) > 0: # disable updates of the list for speed self.resultList.setUpdatesEnabled(False) self.resultList.setSortingEnabled(False) self.checkProgress.setMaximum(len(self.files)) self.checkProgress.setVisible(len(self.files) > 1) self.checkProgressLabel.setVisible(len(self.files) > 1) QApplication.processEvents() # now go through all the files self.progress = 0 if len(self.files) == 1 or not self.radonService.hasBatch: self.__batch = False self.maintainabilityIndex() else: self.__batch = True self.maintainabilityIndexBatch() def maintainabilityIndex(self, codestring=''): """ Public method to start a maintainability index calculation for one Python file. The results are reported to the __processResult slot. @keyparam codestring optional sourcestring @type str """ if not self.files: self.checkProgressLabel.setPath("") self.checkProgress.setMaximum(1) self.checkProgress.setValue(1) self.__finish() return self.filename = self.files.pop(0) self.checkProgress.setValue(self.progress) self.checkProgressLabel.setPath(self.filename) QApplication.processEvents() if self.cancelled: return try: self.source = Utilities.readEncodedFile(self.filename)[0] self.source = Utilities.normalizeCode(self.source) except (UnicodeError, IOError) as msg: self.__createErrorItem(self.filename, str(msg).rstrip()) self.progress += 1 # Continue with next file self.rawMetrics() return self.__finished = False self.radonService.maintainabilityIndex( None, self.filename, self.source) def maintainabilityIndexBatch(self): """ Public method to start a maintainability index calculation batch job. The results are reported to the __processResult slot. """ self.__lastFileItem = None self.checkProgressLabel.setPath(self.tr("Preparing files...")) progress = 0 argumentsList = [] for filename in self.files: progress += 1 self.checkProgress.setValue(progress) QApplication.processEvents() try: source = Utilities.readEncodedFile(filename)[0] source = Utilities.normalizeCode(source) except (UnicodeError, IOError) as msg: self.__createErrorItem(filename, str(msg).rstrip()) continue argumentsList.append((filename, source)) # reset the progress bar to the checked files self.checkProgress.setValue(self.progress) QApplication.processEvents() self.__finished = False self.radonService.maintainabilityIndexBatch(argumentsList) def __batchFinished(self, type_): """ Private slot handling the completion of a batch job. @param type_ type of the calculated metrics @type str, one of ["raw", "mi", "cc"] """ if type_ == "mi": self.checkProgressLabel.setPath("") self.checkProgress.setMaximum(1) self.checkProgress.setValue(1) self.__finish() def __processError(self, type_, fn, msg): """ Private slot to process an error indication from the service. @param type_ type of the calculated metrics @type str, one of ["raw", "mi", "cc"] @param fn filename of the file @type str @param msg error message @type str """ if type_ == "mi": self.__createErrorItem(fn, msg) def __processResult(self, fn, result): """ Private slot called after perfoming a maintainability index calculation on one file. @param fn filename of the file @type str @param result result dict @type dict """ if self.__finished: return # Check if it's the requested file, otherwise ignore signal if not # in batch mode if not self.__batch and fn != self.filename: return if "error" in result: self.__createErrorItem(fn, result["error"]) else: self.__createResultItem(fn, result) self.progress += 1 self.checkProgress.setValue(self.progress) self.checkProgressLabel.setPath(self.__project.getRelativePath(fn)) QApplication.processEvents() if not self.__batch: self.maintainabilityIndex() def __finish(self): """ Private slot called when the action or the user pressed the button. """ if not self.__finished: self.__finished = True # reenable updates of the list self.resultList.setSortingEnabled(True) self.resultList.setUpdatesEnabled(True) self.cancelled = True self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) self.resultList.header().resizeSections( QHeaderView.ResizeToContents) self.resultList.header().setStretchLastSection(True) if qVersion() >= "5.0.0": self.resultList.header().setSectionResizeMode( QHeaderView.Interactive) else: self.resultList.header().setResizeMode(QHeaderView.Interactive) self.summaryLabel.setText(self.tr( "<table>" "<tr><td colspan=2><b>Summary:</b></td></tr>" "<tr><td><b>A</b></td><td>{0} files</td></tr>" "<tr><td><b>B</b></td><td>{1} files</td></tr>" "<tr><td><b>C</b></td><td>{2} files</td></tr>" "</table>" ).format(self.__summary["A"], self.__summary["B"], self.__summary["C"]) ) self.checkProgress.setVisible(False) self.checkProgressLabel.setVisible(False) @pyqtSlot(QAbstractButton) def on_buttonBox_clicked(self, button): """ Private slot called by a button of the button box clicked. @param button button that was clicked @type QAbstractButton """ if button == self.buttonBox.button(QDialogButtonBox.Close): self.close() elif button == self.buttonBox.button(QDialogButtonBox.Cancel): if self.__batch: self.radonService.cancelMaintainabilityIndexBatch() QTimer.singleShot(1000, self.__finish) else: self.__finish() @pyqtSlot() def on_startButton_clicked(self): """ Private slot to start a maintainability index run. """ fileList = self.__fileList[:] filterString = self.excludeFilesEdit.text() if "ExcludeFiles" not in self.__data or \ filterString != self.__data["ExcludeFiles"]: self.__data["ExcludeFiles"] = filterString self.__project.setData( "OTHERTOOLSPARMS", "RadonCodeMetrics", self.__data) filterList = [f.strip() for f in filterString.split(",") if f.strip()] if filterList: for filter in filterList: fileList = \ [f for f in fileList if not fnmatch.fnmatch(f, filter)] self.__errorItem = None self.resultList.clear() self.cancelled = False self.start(fileList)