283375/arcaea-offline-pyside-ui
1
0
Fork 0
mirror of https://github.com/283375/arcaea-offline-pyside-ui.git synced 2025-07-01 12:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: also import difficulties when importing songlist

Browse Source
This commit is contained in:
283375
2023-09-16 20:33:09 +08:00
parent b241ad36c6
commit 51e713d4c6
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ui/implements/tabs/tabDb/tabDb_Manage.py
View File

@ -6,6 +6,7 @@ import zipfile
from arcaea_offline.database import Database from arcaea_offline.database import Database
from arcaea_offline.external.arcaea import ( from arcaea_offline.external.arcaea import (
PacklistParser, PacklistParser,
SonglistDifficultiesParser,
SonglistParser, SonglistParser,
St3ScoreParser, St3ScoreParser,
) )
@ -46,7 +47,7 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
self, "Sync Error", "\n".join(traceback.format_exception(e)) self, "Sync Error", "\n".join(traceback.format_exception(e))
) )
def importFromArcaeaParser(self, parser: ArcaeaParser, logName, path): def importFromArcaeaParser(self, parser: ArcaeaParser, logName, path) -> int:
# extracted by sourcery # extracted by sourcery
db = Database() db = Database()
with db.sessionmaker() as session: with db.sessionmaker() as session:
@ -56,14 +57,20 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
logger.info(f"updated {itemNum} {logName} from {path}") logger.info(f"updated {itemNum} {logName} from {path}")
return itemNum return itemNum
def importPacklist(self, packlistPath) -> int: def importPacklist(self, packlistPath):
packlistParser = PacklistParser(packlistPath) packlistParser = PacklistParser(packlistPath)
return self.importFromArcaeaParser(packlistParser, "packs", packlistPath) return self.importFromArcaeaParser(packlistParser, "packs", packlistPath)
def importSonglist(self, songlistPath) -> int: def importSonglist(self, songlistPath):
songlistParser = SonglistParser(songlistPath) songlistParser = SonglistParser(songlistPath)
return self.importFromArcaeaParser(songlistParser, "songs", songlistPath) return self.importFromArcaeaParser(songlistParser, "songs", songlistPath)
def importSonglistDifficulties(self, songlistPath):
songlistDifficultiesParser = SonglistDifficultiesParser(songlistPath)
return self.importFromArcaeaParser(
songlistDifficultiesParser, "difficulties", songlistPath
)
@Slot() @Slot()
def on_importPacklistButton_clicked(self): def on_importPacklistButton_clicked(self):
try: try:
@ -95,8 +102,11 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
return return
songNum = self.importSonglist(songlistFile) songNum = self.importSonglist(songlistFile)
difficultyNum = self.importSonglistDifficulties(songlistFile)
QMessageBox.information( QMessageBox.information(
self, None, f"Updated {songNum} songs from<br>{songlistFile}" self,
None,
f"Updated {songNum} songs and {difficultyNum} difficulties from<br>{songlistFile}",
) )
except Exception as e: except Exception as e:
logger.exception("import songlist error") logger.exception("import songlist error")
@ -122,9 +132,10 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
packsNum = self.importPacklist(packlistPath) packsNum = self.importPacklist(packlistPath)
songsNum = self.importSonglist(songlistPath) songsNum = self.importSonglist(songlistPath)
difficultyNum = self.importSonglistDifficulties(songlistPath)
message = [ message = [
f"{packsNum} packs and {songsNum} songs updated from", f"{packsNum} packs, {songsNum} songs and {difficultyNum} difficulties updated from",
str(apkFile), str(apkFile),
] ]
QMessageBox.information(self, None, "<br>".join(message)) QMessageBox.information(self, None, "<br>".join(message))