Fix game title sorting

This commit is contained in:
DanielSvoboda 2025-01-30 12:47:00 -03:00
parent 19bbbf994c
commit 06ec10497d
2 changed files with 59 additions and 35 deletions

View File

@ -1,6 +1,8 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <algorithm> // std::transform
#include <cctype> // std::tolower
#include <QToolTip> #include <QToolTip>
#include "common/config.h" #include "common/config.h"
#include "common/logging/log.h" #include "common/logging/log.h"
@ -108,52 +110,73 @@ void GameListFrame::PopulateGameList() {
this->setColumnHidden(2, !Config::getCompatibilityEnabled()); this->setColumnHidden(2, !Config::getCompatibilityEnabled());
this->setColumnHidden(6, !Config::GetLoadGameSizeEnabled()); this->setColumnHidden(6, !Config::GetLoadGameSizeEnabled());
// Update the row count in the table based on the number of games
this->setRowCount(m_game_info->m_games.size()); this->setRowCount(m_game_info->m_games.size());
ResizeIcons(icon_size); ResizeIcons(icon_size);
// Populate the columns with data for each game
for (int i = 0; i < m_game_info->m_games.size(); i++) { for (int i = 0; i < m_game_info->m_games.size(); i++) {
SetTableItem(i, 1, QString::fromStdString(m_game_info->m_games[i].name)); FillRowData(i);
SetTableItem(i, 3, QString::fromStdString(m_game_info->m_games[i].serial)); }
SetRegionFlag(i, 4, QString::fromStdString(m_game_info->m_games[i].region));
SetTableItem(i, 5, QString::fromStdString(m_game_info->m_games[i].fw));
SetTableItem(i, 6, QString::fromStdString(m_game_info->m_games[i].size));
SetTableItem(i, 7, QString::fromStdString(m_game_info->m_games[i].version));
m_game_info->m_games[i].compatibility = std::sort(
m_compat_info->GetCompatibilityInfo(m_game_info->m_games[i].serial); m_game_info->m_games.begin(), m_game_info->m_games.end(),
SetCompatibilityItem(i, 2, m_game_info->m_games[i].compatibility); [this](const GameInfo& a, const GameInfo& b) { return CompareStringsAscending(a, b, 1); });
QString playTime = GetPlayTime(m_game_info->m_games[i].serial); ResizeIcons(icon_size);
if (playTime.isEmpty()) {
m_game_info->m_games[i].play_time = "0:00:00";
SetTableItem(i, 8, tr("Never Played"));
} else {
QStringList timeParts = playTime.split(':');
int hours = timeParts[0].toInt();
int minutes = timeParts[1].toInt();
int seconds = timeParts[2].toInt();
QString formattedPlayTime; // Update the table with the sorted data , Refill the row after sorting
if (hours > 0) { for (int i = 0; i < m_game_info->m_games.size(); i++) {
formattedPlayTime += QString("%1").arg(hours) + tr("h"); FillRowData(i);
} }
if (minutes > 0) { }
formattedPlayTime += QString("%1").arg(minutes) + tr("m");
}
formattedPlayTime = formattedPlayTime.trimmed(); void GameListFrame::FillRowData(int i) {
m_game_info->m_games[i].play_time = playTime.toStdString(); // Fill columns with game data
if (formattedPlayTime.isEmpty()) { SetTableItem(i, 1, QString::fromStdString(m_game_info->m_games[i].name));
SetTableItem(i, 8, QString("%1").arg(seconds) + tr("s")); SetTableItem(i, 3, QString::fromStdString(m_game_info->m_games[i].serial));
} else { SetRegionFlag(i, 4, QString::fromStdString(m_game_info->m_games[i].region));
SetTableItem(i, 8, formattedPlayTime); SetTableItem(i, 5, QString::fromStdString(m_game_info->m_games[i].fw));
} SetTableItem(i, 6, QString::fromStdString(m_game_info->m_games[i].size));
SetTableItem(i, 7, QString::fromStdString(m_game_info->m_games[i].version));
// Fill compatibility column
m_game_info->m_games[i].compatibility =
m_compat_info->GetCompatibilityInfo(m_game_info->m_games[i].serial);
SetCompatibilityItem(i, 2, m_game_info->m_games[i].compatibility);
// Fill playtime column
QString playTime = GetPlayTime(m_game_info->m_games[i].serial);
if (playTime.isEmpty()) {
m_game_info->m_games[i].play_time = "0:00:00";
SetTableItem(i, 8, tr("Never Played"));
} else {
QStringList timeParts = playTime.split(':');
int hours = timeParts[0].toInt();
int minutes = timeParts[1].toInt();
int seconds = timeParts[2].toInt();
QString formattedPlayTime;
if (hours > 0) {
formattedPlayTime += QString("%1").arg(hours) + tr("h");
}
if (minutes > 0) {
formattedPlayTime += QString("%1").arg(minutes) + tr("m");
} }
QString path; formattedPlayTime = formattedPlayTime.trimmed();
Common::FS::PathToQString(path, m_game_info->m_games[i].path); m_game_info->m_games[i].play_time = playTime.toStdString();
SetTableItem(i, 9, path); if (formattedPlayTime.isEmpty()) {
SetTableItem(i, 8, QString("%1").arg(seconds) + tr("s"));
} else {
SetTableItem(i, 8, formattedPlayTime);
}
} }
// Fill path column
QString path;
Common::FS::PathToQString(path, m_game_info->m_games[i].path);
SetTableItem(i, 9, path);
} }
void GameListFrame::SetListBackgroundImage(QTableWidgetItem* item) { void GameListFrame::SetListBackgroundImage(QTableWidgetItem* item) {

View File

@ -47,6 +47,7 @@ private:
public: public:
void PopulateGameList(); void PopulateGameList();
void FillRowData(int i);
void ResizeIcons(int iconSize); void ResizeIcons(int iconSize);
QImage backgroundImage; QImage backgroundImage;