283375/arcaea-offline-pyside-ui
1
0
Fork 0
mirror of https://github.com/283375/arcaea-offline-pyside-ui.git synced 2025-04-21 18:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip: ChartSelector

Browse Source
This commit is contained in:
283375 2023-09-01 05:04:06 +08:00
parent 6329421339
commit af178744b8
4 changed files with 206 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
ui/designer/components/chartSelector.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>671</width> <width>476</width>
<height>295</height> <height>347</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -25,7 +25,68 @@
<property name="title"> <property name="title">
<string>songIdSelector.title</string> <string>songIdSelector.title</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QGroupBox" name="songIdSelectorQuickActionsGroupBox">
<property name="title">
<string>songIdSelector.quickActions</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="nextPackageButton">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>songIdSelector.quickActions.nextPackageButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="nextSongIdButton">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>songIdSelector.quickActions.nextSongIdButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="previousSongIdButton">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>songIdSelector.quickActions.previousSongIdButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="previousPackageButton">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>songIdSelector.quickActions.previousPackageButton</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widget" native="true">
<property name="minimumSize"> <property name="minimumSize">
@ -48,12 +109,12 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLineEdit" name="fuzzySearchLineEdit"> <widget class="QLineEdit" name="searchLineEdit">
<property name="frame"> <property name="frame">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="placeholderText"> <property name="placeholderText">
<string>fuzzySearch.lineEdit.placeholder</string> <string>search.lineEdit.placeholder</string>
</property> </property>
<property name="clearButtonEnabled"> <property name="clearButtonEnabled">
<bool>true</bool> <bool>true</bool>
@ -74,7 +135,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QComboBox" name="packageComboBox"/> <widget class="QComboBox" name="packComboBox"/>
</item> </item>
<item> <item>
<widget class="QComboBox" name="songIdComboBox"/> <widget class="QComboBox" name="songIdComboBox"/>
@ -82,67 +143,12 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="songIdSelectorQuickActionsGroupBox">
<property name="title">
<string>songIdSelector.quickActions</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QPushButton" name="previousPackageButton">
<property name="text">
<string>songIdSelector.quickActions.previousPackageButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="previousSongIdButton">
<property name="text">
<string>songIdSelector.quickActions.previousSongIdButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="nextSongIdButton">
<property name="text">
<string>songIdSelector.quickActions.nextSongIdButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="nextPackageButton">
<property name="text">
<string>songIdSelector.quickActions.nextPackageButton</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="ratingClassGroupBox">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>ratingClassSelector.title</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<item> <item>
<widget class="RatingClassSelector" name="ratingClassSelector" native="true"/> <widget class="RatingClassSelector" name="ratingClassSelector" native="true"/>
</item> </item>
</layout>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="resultsHorizontalLayout"> <layout class="QHBoxLayout" name="resultsHorizontalLayout">
<item> <item>

102
ui/designer/components/chartSelector_ui.py
View File

@ -25,7 +25,7 @@ class Ui_ChartSelector(object):
def setupUi(self, ChartSelector): def setupUi(self, ChartSelector):
if not ChartSelector.objectName(): if not ChartSelector.objectName():
ChartSelector.setObjectName(u"ChartSelector") ChartSelector.setObjectName(u"ChartSelector")
ChartSelector.resize(671, 295) ChartSelector.resize(476, 347)
ChartSelector.setWindowTitle(u"ChartSelector") ChartSelector.setWindowTitle(u"ChartSelector")
self.mainVerticalLayout = QVBoxLayout(ChartSelector) self.mainVerticalLayout = QVBoxLayout(ChartSelector)
self.mainVerticalLayout.setObjectName(u"mainVerticalLayout") self.mainVerticalLayout.setObjectName(u"mainVerticalLayout")
@ -36,29 +36,60 @@ class Ui_ChartSelector(object):
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.songIdSelectorGroupBox.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.songIdSelectorGroupBox.sizePolicy().hasHeightForWidth())
self.songIdSelectorGroupBox.setSizePolicy(sizePolicy) self.songIdSelectorGroupBox.setSizePolicy(sizePolicy)
self.horizontalLayout = QHBoxLayout(self.songIdSelectorGroupBox) self.verticalLayout_3 = QVBoxLayout(self.songIdSelectorGroupBox)
self.verticalLayout_3.setObjectName(u"verticalLayout_3")
self.songIdSelectorQuickActionsGroupBox = QGroupBox(self.songIdSelectorGroupBox)
self.songIdSelectorQuickActionsGroupBox.setObjectName(u"songIdSelectorQuickActionsGroupBox")
self.horizontalLayout = QHBoxLayout(self.songIdSelectorQuickActionsGroupBox)
self.horizontalLayout.setObjectName(u"horizontalLayout") self.horizontalLayout.setObjectName(u"horizontalLayout")
self.nextPackageButton = QPushButton(self.songIdSelectorQuickActionsGroupBox)
self.nextPackageButton.setObjectName(u"nextPackageButton")
self.nextPackageButton.setMinimumSize(QSize(100, 0))
self.horizontalLayout.addWidget(self.nextPackageButton)
self.nextSongIdButton = QPushButton(self.songIdSelectorQuickActionsGroupBox)
self.nextSongIdButton.setObjectName(u"nextSongIdButton")
self.nextSongIdButton.setMinimumSize(QSize(100, 0))
self.horizontalLayout.addWidget(self.nextSongIdButton)
self.previousSongIdButton = QPushButton(self.songIdSelectorQuickActionsGroupBox)
self.previousSongIdButton.setObjectName(u"previousSongIdButton")
self.previousSongIdButton.setMinimumSize(QSize(100, 0))
self.horizontalLayout.addWidget(self.previousSongIdButton)
self.previousPackageButton = QPushButton(self.songIdSelectorQuickActionsGroupBox)
self.previousPackageButton.setObjectName(u"previousPackageButton")
self.previousPackageButton.setMinimumSize(QSize(100, 0))
self.horizontalLayout.addWidget(self.previousPackageButton)
self.verticalLayout_3.addWidget(self.songIdSelectorQuickActionsGroupBox)
self.widget = QWidget(self.songIdSelectorGroupBox) self.widget = QWidget(self.songIdSelectorGroupBox)
self.widget.setObjectName(u"widget") self.widget.setObjectName(u"widget")
self.widget.setMinimumSize(QSize(300, 0)) self.widget.setMinimumSize(QSize(300, 0))
self.verticalLayout = QVBoxLayout(self.widget) self.verticalLayout = QVBoxLayout(self.widget)
self.verticalLayout.setObjectName(u"verticalLayout") self.verticalLayout.setObjectName(u"verticalLayout")
self.verticalLayout.setContentsMargins(0, 0, 0, 0) self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.fuzzySearchLineEdit = QLineEdit(self.widget) self.searchLineEdit = QLineEdit(self.widget)
self.fuzzySearchLineEdit.setObjectName(u"fuzzySearchLineEdit") self.searchLineEdit.setObjectName(u"searchLineEdit")
self.fuzzySearchLineEdit.setFrame(True) self.searchLineEdit.setFrame(True)
self.fuzzySearchLineEdit.setClearButtonEnabled(True) self.searchLineEdit.setClearButtonEnabled(True)
self.verticalLayout.addWidget(self.fuzzySearchLineEdit) self.verticalLayout.addWidget(self.searchLineEdit)
self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding) self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
self.verticalLayout.addItem(self.verticalSpacer) self.verticalLayout.addItem(self.verticalSpacer)
self.packageComboBox = QComboBox(self.widget) self.packComboBox = QComboBox(self.widget)
self.packageComboBox.setObjectName(u"packageComboBox") self.packComboBox.setObjectName(u"packComboBox")
self.verticalLayout.addWidget(self.packageComboBox) self.verticalLayout.addWidget(self.packComboBox)
self.songIdComboBox = QComboBox(self.widget) self.songIdComboBox = QComboBox(self.widget)
self.songIdComboBox.setObjectName(u"songIdComboBox") self.songIdComboBox.setObjectName(u"songIdComboBox")
@ -66,51 +97,15 @@ class Ui_ChartSelector(object):
self.verticalLayout.addWidget(self.songIdComboBox) self.verticalLayout.addWidget(self.songIdComboBox)
self.horizontalLayout.addWidget(self.widget) self.verticalLayout_3.addWidget(self.widget)
self.songIdSelectorQuickActionsGroupBox = QGroupBox(self.songIdSelectorGroupBox)
self.songIdSelectorQuickActionsGroupBox.setObjectName(u"songIdSelectorQuickActionsGroupBox")
self.verticalLayout_2 = QVBoxLayout(self.songIdSelectorQuickActionsGroupBox)
self.verticalLayout_2.setObjectName(u"verticalLayout_2")
self.previousPackageButton = QPushButton(self.songIdSelectorQuickActionsGroupBox)
self.previousPackageButton.setObjectName(u"previousPackageButton")
self.verticalLayout_2.addWidget(self.previousPackageButton)
self.previousSongIdButton = QPushButton(self.songIdSelectorQuickActionsGroupBox)
self.previousSongIdButton.setObjectName(u"previousSongIdButton")
self.verticalLayout_2.addWidget(self.previousSongIdButton)
self.nextSongIdButton = QPushButton(self.songIdSelectorQuickActionsGroupBox)
self.nextSongIdButton.setObjectName(u"nextSongIdButton")
self.verticalLayout_2.addWidget(self.nextSongIdButton)
self.nextPackageButton = QPushButton(self.songIdSelectorQuickActionsGroupBox)
self.nextPackageButton.setObjectName(u"nextPackageButton")
self.verticalLayout_2.addWidget(self.nextPackageButton)
self.horizontalLayout.addWidget(self.songIdSelectorQuickActionsGroupBox)
self.mainVerticalLayout.addWidget(self.songIdSelectorGroupBox) self.mainVerticalLayout.addWidget(self.songIdSelectorGroupBox)
self.ratingClassGroupBox = QGroupBox(ChartSelector) self.ratingClassSelector = RatingClassSelector(ChartSelector)
self.ratingClassGroupBox.setObjectName(u"ratingClassGroupBox")
self.ratingClassGroupBox.setMinimumSize(QSize(200, 0))
self.horizontalLayout_2 = QHBoxLayout(self.ratingClassGroupBox)
self.horizontalLayout_2.setSpacing(0)
self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
self.ratingClassSelector = RatingClassSelector(self.ratingClassGroupBox)
self.ratingClassSelector.setObjectName(u"ratingClassSelector") self.ratingClassSelector.setObjectName(u"ratingClassSelector")
self.horizontalLayout_2.addWidget(self.ratingClassSelector) self.mainVerticalLayout.addWidget(self.ratingClassSelector)
self.mainVerticalLayout.addWidget(self.ratingClassGroupBox)
self.resultsHorizontalLayout = QHBoxLayout() self.resultsHorizontalLayout = QHBoxLayout()
self.resultsHorizontalLayout.setObjectName(u"resultsHorizontalLayout") self.resultsHorizontalLayout.setObjectName(u"resultsHorizontalLayout")
@ -142,13 +137,12 @@ class Ui_ChartSelector(object):
def retranslateUi(self, ChartSelector): def retranslateUi(self, ChartSelector):
self.songIdSelectorGroupBox.setTitle(QCoreApplication.translate("ChartSelector", u"songIdSelector.title", None)) self.songIdSelectorGroupBox.setTitle(QCoreApplication.translate("ChartSelector", u"songIdSelector.title", None))
self.fuzzySearchLineEdit.setPlaceholderText(QCoreApplication.translate("ChartSelector", u"fuzzySearch.lineEdit.placeholder", None))
self.songIdSelectorQuickActionsGroupBox.setTitle(QCoreApplication.translate("ChartSelector", u"songIdSelector.quickActions", None)) self.songIdSelectorQuickActionsGroupBox.setTitle(QCoreApplication.translate("ChartSelector", u"songIdSelector.quickActions", None))
self.previousPackageButton.setText(QCoreApplication.translate("ChartSelector", u"songIdSelector.quickActions.previousPackageButton", None))
self.previousSongIdButton.setText(QCoreApplication.translate("ChartSelector", u"songIdSelector.quickActions.previousSongIdButton", None))
self.nextSongIdButton.setText(QCoreApplication.translate("ChartSelector", u"songIdSelector.quickActions.nextSongIdButton", None))
self.nextPackageButton.setText(QCoreApplication.translate("ChartSelector", u"songIdSelector.quickActions.nextPackageButton", None)) self.nextPackageButton.setText(QCoreApplication.translate("ChartSelector", u"songIdSelector.quickActions.nextPackageButton", None))
self.ratingClassGroupBox.setTitle(QCoreApplication.translate("ChartSelector", u"ratingClassSelector.title", None)) self.nextSongIdButton.setText(QCoreApplication.translate("ChartSelector", u"songIdSelector.quickActions.nextSongIdButton", None))
self.previousSongIdButton.setText(QCoreApplication.translate("ChartSelector", u"songIdSelector.quickActions.previousSongIdButton", None))
self.previousPackageButton.setText(QCoreApplication.translate("ChartSelector", u"songIdSelector.quickActions.previousPackageButton", None))
self.searchLineEdit.setPlaceholderText(QCoreApplication.translate("ChartSelector", u"search.lineEdit.placeholder", None))
self.resetButton.setText(QCoreApplication.translate("ChartSelector", u"resetButton", None)) self.resetButton.setText(QCoreApplication.translate("ChartSelector", u"resetButton", None))
pass pass
# retranslateUi # retranslateUi

24
ui/extends/components/chartSelector.py
View File

@ -1,27 +1,35 @@
from arcaea_offline.database import Database from arcaea_offline.database import Database
from arcaea_offline.models import Chart from arcaea_offline.models import Chart
from arcaea_offline.searcher import Searcher
from arcaea_offline.utils.rating import rating_class_to_short_text from arcaea_offline.utils.rating import rating_class_to_short_text
from PySide6.QtCore import Qt from PySide6.QtCore import Qt
from PySide6.QtGui import QStandardItem, QStandardItemModel from PySide6.QtGui import QStandardItem, QStandardItemModel
class FuzzySearchCompleterModel(QStandardItemModel): class SearchCompleterModel(QStandardItemModel):
def fillDbFuzzySearchResults(self, db: Database, kw: str): def __init__(self, parent=None):
super().__init__(parent)
self.searcher = Searcher()
self.db = Database()
def updateSearcherSongs(self):
with self.db.sessionmaker() as session:
self.searcher.import_songs(session)
def getSearchResult(self, kw: str):
self.clear() self.clear()
results = db.fuzzy_search_song_id(kw, limit=10) songIds = self.searcher.search(kw)
results = sorted(results, key=lambda r: r.confidence, reverse=True)
songIds = [r.song_id for r in results]
charts: list[Chart] = [] charts: list[Chart] = []
for songId in songIds: for songId in songIds:
dbChartRows = db.get_charts_by_song_id(songId) _charts = self.db.get_charts_by_song_id(songId)
_charts = [Chart.from_db_row(dbRow) for dbRow in dbChartRows]
_charts = sorted(_charts, key=lambda c: c.rating_class, reverse=True) _charts = sorted(_charts, key=lambda c: c.rating_class, reverse=True)
charts += _charts charts += _charts
for chart in charts: for chart in charts:
displayText = ( displayText = (
f"{chart.name_en} [{rating_class_to_short_text(chart.rating_class)}]" f"{chart.title} [{rating_class_to_short_text(chart.rating_class)}]"
) )
item = QStandardItem(kw) item = QStandardItem(kw)
item.setData(kw) item.setData(kw)

123
ui/implements/components/chartSelector.py
View File

@ -1,17 +1,19 @@
import logging
import re import re
from typing import Literal from typing import Literal
from arcaea_offline.database import Database from arcaea_offline.database import Database
from arcaea_offline.models import Chart, Pack from arcaea_offline.models import Chart
from arcaea_offline.utils.rating import rating_class_to_text from arcaea_offline.utils.rating import rating_class_to_text
from PySide6.QtCore import QModelIndex, Qt, Signal, Slot from PySide6.QtCore import QModelIndex, Qt, Signal, Slot
from PySide6.QtGui import QColor, QShowEvent from PySide6.QtGui import QShowEvent
from PySide6.QtWidgets import QCompleter, QWidget from PySide6.QtWidgets import QCompleter, QWidget
from ui.designer.components.chartSelector_ui import Ui_ChartSelector from ui.designer.components.chartSelector_ui import Ui_ChartSelector
from ui.extends.components.chartSelector import FuzzySearchCompleterModel from ui.extends.components.chartSelector import SearchCompleterModel
from ui.extends.shared.delegates.descriptionDelegate import DescriptionDelegate from ui.extends.shared.delegates.descriptionDelegate import DescriptionDelegate
from ui.implements.components.ratingClassRadioButton import RatingClassRadioButton
logger = logging.getLogger(__name__)
class ChartSelector(Ui_ChartSelector, QWidget): class ChartSelector(Ui_ChartSelector, QWidget):
@ -37,25 +39,25 @@ class ChartSelector(Ui_ChartSelector, QWidget):
self.valueChanged.connect(self.updateResultLabel) self.valueChanged.connect(self.updateResultLabel)
self.fillPackageComboBox() self.fillPackComboBox()
self.packageComboBox.setCurrentIndex(-1) self.packComboBox.setCurrentIndex(-1)
self.songIdComboBox.setCurrentIndex(-1) self.songIdComboBox.setCurrentIndex(-1)
self.fuzzySearchCompleterModel = FuzzySearchCompleterModel() self.searchCompleterModel = SearchCompleterModel()
self.fuzzySearchCompleter = QCompleter(self.fuzzySearchCompleterModel) self.searchCompleter = QCompleter(self.searchCompleterModel)
self.fuzzySearchCompleter.popup().setItemDelegate( self.searchCompleter.popup().setItemDelegate(
DescriptionDelegate(self.fuzzySearchCompleter.popup()) DescriptionDelegate(self.searchCompleter.popup())
) )
self.fuzzySearchCompleter.activated[QModelIndex].connect( self.searchCompleter.activated[QModelIndex].connect(
self.fuzzySearchCompleterSetSelection self.searchCompleterSetSelection
) )
self.fuzzySearchLineEdit.setCompleter(self.fuzzySearchCompleter) self.searchLineEdit.setCompleter(self.searchCompleter)
self.packageComboBox.setItemDelegate(DescriptionDelegate(self.packageComboBox)) self.packComboBox.setItemDelegate(DescriptionDelegate(self.packComboBox))
self.songIdComboBox.setItemDelegate(DescriptionDelegate(self.songIdComboBox)) self.songIdComboBox.setItemDelegate(DescriptionDelegate(self.songIdComboBox))
self.ratingClassSelector.valueChanged.connect(self.valueChanged) self.ratingClassSelector.valueChanged.connect(self.valueChanged)
self.packageComboBox.currentIndexChanged.connect(self.valueChanged) self.packComboBox.currentIndexChanged.connect(self.valueChanged)
self.songIdComboBox.currentIndexChanged.connect(self.valueChanged) self.songIdComboBox.currentIndexChanged.connect(self.valueChanged)
def quickSwitchSelection( def quickSwitchSelection(
@ -65,12 +67,12 @@ class ChartSelector(Ui_ChartSelector, QWidget):
): ):
minIndex = 0 minIndex = 0
if model == "package": if model == "package":
maxIndex = self.packageComboBox.count() - 1 maxIndex = self.packComboBox.count() - 1
currentIndex = self.packageComboBox.currentIndex() + ( currentIndex = self.packComboBox.currentIndex() + (
1 if direction == "next" else -1 1 if direction == "next" else -1
) )
currentIndex = max(min(maxIndex, currentIndex), minIndex) currentIndex = max(min(maxIndex, currentIndex), minIndex)
self.packageComboBox.setCurrentIndex(currentIndex) self.packComboBox.setCurrentIndex(currentIndex)
elif model == "songId": elif model == "songId":
maxIndex = self.songIdComboBox.count() - 1 maxIndex = self.songIdComboBox.count() - 1
currentIndex = self.songIdComboBox.currentIndex() + ( currentIndex = self.songIdComboBox.currentIndex() + (
@ -82,17 +84,31 @@ class ChartSelector(Ui_ChartSelector, QWidget):
return return
def value(self): def value(self):
packageId = self.packageComboBox.currentData() packId = self.packComboBox.currentData()
songId = self.songIdComboBox.currentData() songId = self.songIdComboBox.currentData()
ratingClass = self.ratingClassSelector.value() ratingClass = self.ratingClassSelector.value()
if packageId and songId and isinstance(ratingClass, int): if packId and songId and isinstance(ratingClass, int):
return self.db.get_chart(songId, ratingClass) return self.db.get_chart(songId, ratingClass)
return None return None
def showEvent(self, event: QShowEvent): def showEvent(self, event: QShowEvent):
# update database results when widget visible # update database results when widget visible
self.fillPackageComboBox() self.searchCompleterModel.updateSearcherSongs()
# remember selection and restore later
pack = self.packComboBox.currentData()
songId = self.songIdComboBox.currentData()
ratingClass = self.ratingClassSelector.value()
self.fillPackComboBox()
if pack:
self.selectPack(pack)
if songId:
self.selectSongId(songId)
if ratingClass is not None:
self.ratingClassSelector.select(ratingClass)
return super().showEvent(event) return super().showEvent(event)
@Slot() @Slot()
@ -116,8 +132,8 @@ class ChartSelector(Ui_ChartSelector, QWidget):
else: else:
self.resultLabel.setText("...") self.resultLabel.setText("...")
def fillPackageComboBox(self): def fillPackComboBox(self):
self.packageComboBox.clear() self.packComboBox.clear()
packs = self.db.get_packs() packs = self.db.get_packs()
for pack in packs: for pack in packs:
isAppendPack = re.search(r"_append_.*$", pack.id) isAppendPack = re.search(r"_append_.*$", pack.id)
@ -127,20 +143,20 @@ class ChartSelector(Ui_ChartSelector, QWidget):
packName = f"{basePackName} - {pack.name}" packName = f"{basePackName} - {pack.name}"
else: else:
packName = pack.name packName = pack.name
self.packageComboBox.addItem(f"{packName} ({pack.id})", pack.id) self.packComboBox.addItem(f"{packName} ({pack.id})", pack.id)
row = self.packageComboBox.count() - 1 row = self.packComboBox.count() - 1
self.packageComboBox.setItemData( self.packComboBox.setItemData(
row, packName, DescriptionDelegate.MainTextRole row, packName, DescriptionDelegate.MainTextRole
) )
self.packageComboBox.setItemData( self.packComboBox.setItemData(
row, pack.id, DescriptionDelegate.DescriptionTextRole row, pack.id, DescriptionDelegate.DescriptionTextRole
) )
self.packageComboBox.setCurrentIndex(-1) self.packComboBox.setCurrentIndex(-1)
def fillSongIdComboBox(self): def fillSongIdComboBox(self):
self.songIdComboBox.clear() self.songIdComboBox.clear()
packId = self.packageComboBox.currentData() packId = self.packComboBox.currentData()
if packId: if packId:
charts = self.db.get_charts_by_pack_id(packId) charts = self.db.get_charts_by_pack_id(packId)
inserted_song_ids = [] inserted_song_ids = []
@ -160,7 +176,7 @@ class ChartSelector(Ui_ChartSelector, QWidget):
self.songIdComboBox.setCurrentIndex(-1) self.songIdComboBox.setCurrentIndex(-1)
@Slot() @Slot()
def on_packageComboBox_activated(self): def on_packComboBox_activated(self):
self.fillSongIdComboBox() self.fillSongIdComboBox()
@Slot(int) @Slot(int)
@ -173,38 +189,49 @@ class ChartSelector(Ui_ChartSelector, QWidget):
@Slot() @Slot()
def on_resetButton_clicked(self): def on_resetButton_clicked(self):
self.packageComboBox.setCurrentIndex(-1) self.packComboBox.setCurrentIndex(-1)
self.songIdComboBox.setCurrentIndex(-1) self.songIdComboBox.setCurrentIndex(-1)
@Slot(str) @Slot(str)
def on_fuzzySearchLineEdit_textChanged(self, text: str): def on_searchLineEdit_textChanged(self, text: str):
if text: if text:
self.fuzzySearchCompleterModel.fillDbFuzzySearchResults(self.db, text) self.searchCompleterModel.getSearchResult(text)
else: else:
self.fuzzySearchCompleterModel.clear() self.searchCompleterModel.clear()
def selectChart(self, chart: Chart):
packageIdIndex = self.packageComboBox.findData(chart.set)
if packageIdIndex > -1:
self.packageComboBox.setCurrentIndex(packageIdIndex)
else:
# QMessageBox
return
def selectPack(self, packId: str) -> bool:
packIdIndex = self.packComboBox.findData(packId)
if packIdIndex > -1:
self.packComboBox.setCurrentIndex(packIdIndex)
self.fillSongIdComboBox() self.fillSongIdComboBox()
songIdIndex = self.songIdComboBox.findData(chart.song_id) return True
else:
logger.warning(f'Attempting to select an unknown pack "{packId}"')
return False
def selectSongId(self, songId: str) -> bool:
songIdIndex = self.songIdComboBox.findData(songId)
if songIdIndex > -1: if songIdIndex > -1:
self.songIdComboBox.setCurrentIndex(songIdIndex) self.songIdComboBox.setCurrentIndex(songIdIndex)
return True
else: else:
# QMessageBox logger.warning(
return f'Attempting to select an unknown song "{songId}", maybe try selecting a pack first?'
)
return False
def selectChart(self, chart: Chart):
if not self.selectPack(chart.set):
return False
if not self.selectSongId(chart.song_id):
return False
self.ratingClassSelector.select(chart.rating_class) self.ratingClassSelector.select(chart.rating_class)
return True
@Slot(QModelIndex) @Slot(QModelIndex)
def fuzzySearchCompleterSetSelection(self, index: QModelIndex): def searchCompleterSetSelection(self, index: QModelIndex):
chart = index.data(Qt.ItemDataRole.UserRole + 10) # type: Chart chart = index.data(Qt.ItemDataRole.UserRole + 10) # type: Chart
self.selectChart(chart) self.selectChart(chart)
self.fuzzySearchLineEdit.clear() self.searchLineEdit.clear()
self.fuzzySearchLineEdit.clearFocus() self.searchLineEdit.clearFocus()