Compare commits

..

No commits in common. "1ec302d98c5815474f9d06c8933ad9f501d60408" and "3d6e5f997e12cf6d786cac2d94b327fdf7912fb5" have entirely different histories.

2 changed files with 4 additions and 8 deletions

View File

@ -68,7 +68,7 @@ if __name__ == "__main__":
databaseChecker = DatabaseChecker() databaseChecker = DatabaseChecker()
databaseChecker.setWindowIcon(QIcon(":/images/icon.png")) databaseChecker.setWindowIcon(QIcon(":/images/icon.png"))
databaseCheckResult = databaseChecker.confirmDb() if Settings().databaseUrl() else 0 databaseCheckResult = databaseChecker.confirmDb()
if not databaseCheckResult & DatabaseCheckerResult.Initted: if not databaseCheckResult & DatabaseCheckerResult.Initted:
result = databaseChecker.exec() result = databaseChecker.exec()

View File

@ -28,21 +28,17 @@ class RemoveDuplicateScoresModel(QStandardItemModel):
chart = ( chart = (
session.query(Chart) session.query(Chart)
.where((Chart.song_id == songId) & (Chart.rating_class == ratingClass)) .where((Chart.song_id == songId) & (Chart.rating_class == ratingClass))
.first() .one()
) )
song = session.query(Song).where(Song.id == songId).first() song = session.query(Song).where(Song.id == songId).one()
difficulty = ( difficulty = (
session.query(Difficulty) session.query(Difficulty)
.where( .where(
(Difficulty.song_id == songId) (Difficulty.song_id == songId)
& (Difficulty.rating_class == ratingClass) & (Difficulty.rating_class == ratingClass)
) )
.first() .one()
) )
if chart is None and song is None and difficulty is None:
chart = Chart(song_id=songId, rating_class=ratingClass, set="unknown")
item.setData(chart, self.ChartRole) item.setData(chart, self.ChartRole)
item.setData(song, self.SongRole) item.setData(song, self.SongRole)
item.setData(difficulty, self.DifficultyRole) item.setData(difficulty, self.DifficultyRole)