From b2a10d02cef7ff40652fa7b0eb82b14087d0443d Mon Sep 17 00:00:00 2001 From: 283375 Date: Fri, 28 Jun 2024 20:20:26 +0800 Subject: [PATCH] change `# fmt:` labels to ruff compatible --- ui/extends/components/ocrQueue.py | 13 +++------- ui/extends/shared/models/tables/b30.py | 4 +-- ui/extends/shared/models/tables/score.py | 8 ++---- ui/implements/components/scoreEditor.py | 22 +++------------- .../tabs/tabDb/tabDb_ChartInfoEditor.py | 16 +++--------- .../tabs/tabDb/tabDb_RemoveDuplicateScores.py | 25 +++++++------------ ui/implements/tabs/tabOverview.py | 4 +-- .../tabs/tabTools/tabTools_Andreal.py | 7 ++---- .../tabs/tabTools/tabTools_StepCalculator.py | 4 +-- 9 files changed, 27 insertions(+), 76 deletions(-) diff --git a/ui/extends/components/ocrQueue.py b/ui/extends/components/ocrQueue.py index 39acbdf..920cbf2 100644 --- a/ui/extends/components/ocrQueue.py +++ b/ui/extends/components/ocrQueue.py @@ -5,7 +5,6 @@ from typing import Any, Callable, Optional, overload from arcaea_offline.calculate import calculate_score_range from arcaea_offline.database import Database from arcaea_offline.models import Chart, Score -from arcaea_offline_ocr.b30.shared import B30OcrResultItem from arcaea_offline_ocr.device.common import DeviceOcrResult from PIL import Image from PIL.ImageQt import ImageQt @@ -346,17 +345,11 @@ class OcrQueueTableProxyModel(QAbstractTableModel): def retranslateHeaders(self): self.__horizontalHeaders = [ - # fmt: off - QCoreApplication.translate( - "OcrTableModel", "horizontalHeader.title.select" - ), - QCoreApplication.translate( - "OcrTableModel", "horizontalHeader.title.imagePreview" - ), + QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.select"), + QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.imagePreview"), QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.chart"), QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.score"), - # fmt: on - ] + ] # fmt: skip def sourceModel(self) -> OcrQueueModel: return self.__sourceModel diff --git a/ui/extends/shared/models/tables/b30.py b/ui/extends/shared/models/tables/b30.py index 0509991..d2ab507 100644 --- a/ui/extends/shared/models/tables/b30.py +++ b/ui/extends/shared/models/tables/b30.py @@ -16,13 +16,11 @@ class DbB30TableModel(DbTableModel): def retranslateHeaders(self): self._horizontalHeaders = [ - # fmt: off QCoreApplication.translate("DbB30TableModel", "horizontalHeader.id"), QCoreApplication.translate("DbB30TableModel", "horizontalHeader.chart"), QCoreApplication.translate("DbB30TableModel", "horizontalHeader.score"), QCoreApplication.translate("DbB30TableModel", "horizontalHeader.potential"), - # fmt: on - ] + ] # fmt: skip def syncDb(self): self.beginResetModel() diff --git a/ui/extends/shared/models/tables/score.py b/ui/extends/shared/models/tables/score.py index cc3d0ee..f70986b 100644 --- a/ui/extends/shared/models/tables/score.py +++ b/ui/extends/shared/models/tables/score.py @@ -24,15 +24,11 @@ class DbScoreTableModel(DbTableModel): def retranslateHeaders(self): self._horizontalHeaders = [ - # fmt: off QCoreApplication.translate("DbScoreTableModel", "horizontalHeader.id"), QCoreApplication.translate("DbScoreTableModel", "horizontalHeader.chart"), QCoreApplication.translate("DbScoreTableModel", "horizontalHeader.score"), - QCoreApplication.translate( - "DbScoreTableModel", "horizontalHeader.potential" - ), - # fmt: on - ] + QCoreApplication.translate("DbScoreTableModel", "horizontalHeader.potential"), + ] # fmt: skip def syncDb(self): self.beginResetModel() diff --git a/ui/implements/components/scoreEditor.py b/ui/implements/components/scoreEditor.py index dbf7375..7441ba2 100644 --- a/ui/implements/components/scoreEditor.py +++ b/ui/implements/components/scoreEditor.py @@ -61,30 +61,22 @@ class ScoreEditor(Ui_ScoreEditor, QWidget): VALIDATION_ITEMS_TEXT = [ [ - # fmt: off lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.chartIncomplete.title"), lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.chartIncomplete.text"), - # fmt: on ], [ - # fmt: off lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreMismatch.title"), lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreMismatch.text"), - # fmt: on ], [ - # fmt: off lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.emptyScore.title"), lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.emptyScore.text"), - # fmt: on ], [ - # fmt: off lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreIncompleteForValidate.title"), lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreIncompleteForValidate.text"), - # fmt: on, ], - ] + ] # fmt: skip def __init__(self, parent=None): super().__init__(parent) @@ -208,20 +200,16 @@ class ScoreEditor(Ui_ScoreEditor, QWidget): if validate & ScoreValidateResult.ChartNotSet: self.__triggerMessageBox( "critical", - # fmt: off QCoreApplication.translate("ScoreEditor", "confirmDialog.chartNotSet.title"), QCoreApplication.translate("ScoreEditor", "confirmDialog.chartNotSet.text"), - # fmt: on - ) + ) # fmt: skip return False if validate & ScoreValidateResult.ScoreIncomplete: self.__triggerMessageBox( "critical", - # fmt: off QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreIncomplete.title"), QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreIncomplete.text"), - # fmt: on - ) + ) # fmt: skip return False # since validate may have multiple results @@ -347,10 +335,8 @@ class ScoreEditor(Ui_ScoreEditor, QWidget): ) if validate & ScoreValidateResult.ScoreIncompleteForValidate: texts.append( - # fmt: off QCoreApplication.translate("ScoreEditor", "validate.scoreIncompleteForValidate") - # fmt: on - ) + ) # fmt: skip if not texts: texts.append( diff --git a/ui/implements/tabs/tabDb/tabDb_ChartInfoEditor.py b/ui/implements/tabs/tabDb/tabDb_ChartInfoEditor.py index d3c32be..eb18c11 100644 --- a/ui/implements/tabs/tabDb/tabDb_ChartInfoEditor.py +++ b/ui/implements/tabs/tabDb/tabDb_ChartInfoEditor.py @@ -163,19 +163,15 @@ class TabDb_ChartInfoEditor(Ui_TabDb_ChartInfoEditor, QWidget): QMessageBox.critical( self, None, - # fmt: off QCoreApplication.translate("TabDb_ChartInfoEditor", "commit.chartNotSelected"), - # fmt: on - ) + ) # fmt: skip return if not self.constantLineEdit.hasAcceptableInput(): QMessageBox.critical( self, None, - # fmt: off QCoreApplication.translate("TabDb_ChartInfoEditor", "commit.constantRequired"), - # fmt: on - ) + ) # fmt: skip return constant = int(self.constantLineEdit.text()) @@ -202,10 +198,8 @@ class TabDb_ChartInfoEditor(Ui_TabDb_ChartInfoEditor, QWidget): QMessageBox.critical( self, None, - # fmt: off QCoreApplication.translate("TabDb_ChartInfoEditor", "commit.chartNotSelected"), - # fmt: on - ) + ) # fmt: skip return chartInfo = self.db.get_chart_info(chart.song_id, chart.rating_class) @@ -213,12 +207,10 @@ class TabDb_ChartInfoEditor(Ui_TabDb_ChartInfoEditor, QWidget): result = QMessageBox.warning( self, None, - # fmt: off QCoreApplication.translate("TabDb_ChartInfoEditor", "deleteConfirm"), - # fmt: on QMessageBox.StandardButton.Yes, QMessageBox.StandardButton.No, - ) + ) # fmt: skip if result == QMessageBox.StandardButton.Yes: with self.db.sessionmaker() as session: session.delete(chartInfo) diff --git a/ui/implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py b/ui/implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py index fb390bb..f40babd 100644 --- a/ui/implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py +++ b/ui/implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py @@ -154,23 +154,17 @@ class TabDb_RemoveDuplicateScores(Ui_TabDb_RemoveDuplicateScores, QWidget): self.treeView.setItemDelegateForColumn(1, self.treeViewProxyDelegate) self.quickSelect_comboBox.addItem( - # fmt: off QCoreApplication.translate("TabDb_RemoveDuplicateScores", "quickSelectComboBox.idEarlier"), - # fmt: on QuickSelectComboBoxValues.ID_EARLIER - ) + ) # fmt: skip self.quickSelect_comboBox.addItem( - # fmt: off QCoreApplication.translate("TabDb_RemoveDuplicateScores", "quickSelectComboBox.dateEarlier"), - # fmt: on QuickSelectComboBoxValues.DATE_EARLIER - ) + ) # fmt: skip self.quickSelect_comboBox.addItem( - # fmt: off QCoreApplication.translate("TabDb_RemoveDuplicateScores", "quickSelectComboBox.columnsIntegral"), - # fmt: on QuickSelectComboBoxValues.COLUMNS_INTEGRAL - ) + ) # fmt: skip def getQueryColumns(self): columns: list[InstrumentedAttribute] = [Score.song_id, Score.rating_class] @@ -291,12 +285,12 @@ class TabDb_RemoveDuplicateScores(Ui_TabDb_RemoveDuplicateScores, QWidget): confirm = QMessageBox.warning( self, None, - # fmt: off - QCoreApplication.translate("TabDb_RemoveDuplicateScores", "deleteSelectionDialog.content {}").format(len(selectedScores)), - # fmt: on + QCoreApplication.translate( + "TabDb_RemoveDuplicateScores", "deleteSelectionDialog.content {}" + ).format(len(selectedScores)), QMessageBox.StandardButton.Yes, QMessageBox.StandardButton.No, - ) + ) # fmt: skip if confirm != QMessageBox.StandardButton.Yes: return @@ -310,12 +304,11 @@ class TabDb_RemoveDuplicateScores(Ui_TabDb_RemoveDuplicateScores, QWidget): @Slot() def on_scan_scanButton_clicked(self): if len(self.getQueryColumns()) <= 2: + message = QCoreApplication.translate("TabDb_RemoveDuplicateScores", "scan_noColumnsDialog.content") # fmt: skip result = QMessageBox.warning( self, None, - # fmt: off - QCoreApplication.translate("TabDb_RemoveDuplicateScores", "scan_noColumnsDialog.content"), - # fmt: on + message, QMessageBox.StandardButton.Yes, QMessageBox.StandardButton.No, ) diff --git a/ui/implements/tabs/tabOverview.py b/ui/implements/tabs/tabOverview.py index 4c99b19..67448b9 100644 --- a/ui/implements/tabs/tabOverview.py +++ b/ui/implements/tabs/tabOverview.py @@ -50,6 +50,4 @@ class TabOverview(Ui_TabOverview, QWidget): def retranslateUi(self, *args): super().retranslateUi(self) - # fmt: off - self.describeFormatString = QCoreApplication.translate("TabOverview", "databaseDescribeLabel {} {} {} {} {} {}") - # fmt: on + self.describeFormatString = QCoreApplication.translate("TabOverview", "databaseDescribeLabel {} {} {} {} {} {}") # fmt: skip diff --git a/ui/implements/tabs/tabTools/tabTools_Andreal.py b/ui/implements/tabs/tabTools/tabTools_Andreal.py index e72ad78..fad800c 100644 --- a/ui/implements/tabs/tabTools/tabTools_Andreal.py +++ b/ui/implements/tabs/tabTools/tabTools_Andreal.py @@ -131,11 +131,8 @@ class TabTools_Andreal(Ui_TabTools_Andreal, QWidget): @Slot() def on_imageTypeWhatIsThisButton_clicked(self): - QMessageBox.information( - self, - None, - QCoreApplication.translate("TabTools_Andreal", "imageWhatIsThisDialog.description"), - ) # fmt: skip + message = QCoreApplication.translate("TabTools_Andreal", "imageWhatIsThisDialog.description") # fmt: skip + QMessageBox.information(self, None, message) def imageFormat(self): buttonId = self.imageFormatButtonGroup.checkedId() diff --git a/ui/implements/tabs/tabTools/tabTools_StepCalculator.py b/ui/implements/tabs/tabTools/tabTools_StepCalculator.py index 14cd30b..d641b7f 100644 --- a/ui/implements/tabs/tabTools/tabTools_StepCalculator.py +++ b/ui/implements/tabs/tabTools/tabTools_StepCalculator.py @@ -90,10 +90,8 @@ class PlayRatingCalculatorDialog(QDialog): self.acceptButton = QPushButton(self) self.acceptButton.setText( - # fmt: off QCoreApplication.translate("StepCalculator", "playRatingCalculatorDialog.acceptButton") - # fmt: on - ) + ) # fmt: skip self.acceptButton.setEnabled(False) self.verticalLayout.addWidget(self.acceptButton)