From a1fbab5de7f3171d04cd66f0e534963ea880f6d6 Mon Sep 17 00:00:00 2001 From: Live session user Date: Sat, 13 Jul 2024 16:19:02 -0700 Subject: [PATCH] Move game_data to RW directory inside user folder for linux --- src/core/file_format/trp.cpp | 4 ++-- src/qt_gui/game_grid_frame.cpp | 9 +++++---- src/qt_gui/game_list_frame.cpp | 8 ++++---- src/qt_gui/main.cpp | 2 +- src/qt_gui/trophy_viewer.cpp | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/core/file_format/trp.cpp b/src/core/file_format/trp.cpp index cb55af2e..b4d4c95e 100644 --- a/src/core/file_format/trp.cpp +++ b/src/core/file_format/trp.cpp @@ -48,7 +48,7 @@ bool TRP::Extract(std::filesystem::path trophyPath) { return false; s64 seekPos = sizeof(TrpHeader); - std::filesystem::path trpFilesPath(std::filesystem::current_path() / "game_data" / + std::filesystem::path trpFilesPath(std::filesystem::current_path() / "user/game_data" / title / "TrophyFiles" / it.path().stem()); std::filesystem::create_directories(trpFilesPath / "Icons"); std::filesystem::create_directory(trpFilesPath / "Xml"); @@ -88,4 +88,4 @@ bool TRP::Extract(std::filesystem::path trophyPath) { index++; } return true; -} \ No newline at end of file +} diff --git a/src/qt_gui/game_grid_frame.cpp b/src/qt_gui/game_grid_frame.cpp index ca28e9ce..80f4823b 100644 --- a/src/qt_gui/game_grid_frame.cpp +++ b/src/qt_gui/game_grid_frame.cpp @@ -114,8 +114,9 @@ void GameGridFrame::SetGridBackgroundImage(int row, int column) { if (item) { QString pic1Path = QString::fromStdString((*m_games_shared)[itemID].pic_path); QString blurredPic1Path = - qApp->applicationDirPath() + - QString::fromStdString("/game_data/" + (*m_games_shared)[itemID].serial + "/pic1.png"); + QDir::currentPath() + + QString::fromStdString("/user/game_data/" + (*m_games_shared)[itemID].serial + + "/pic1.png"); backgroundImage = QImage(blurredPic1Path); if (backgroundImage.isNull()) { @@ -123,7 +124,7 @@ void GameGridFrame::SetGridBackgroundImage(int row, int column) { backgroundImage = m_game_list_utils.BlurImage(image, image.rect(), 16); std::filesystem::path img_path = - std::filesystem::path("game_data/") / (*m_games_shared)[itemID].serial; + std::filesystem::path("user/game_data/") / (*m_games_shared)[itemID].serial; std::filesystem::create_directories(img_path); if (!backgroundImage.save(blurredPic1Path, "PNG")) { // qDebug() << "Error: Unable to save image."; @@ -142,4 +143,4 @@ void GameGridFrame::RefreshGridBackgroundImage() { palette.setColor(QPalette::Highlight, transparentColor); this->setPalette(palette); } -} \ No newline at end of file +} diff --git a/src/qt_gui/game_list_frame.cpp b/src/qt_gui/game_list_frame.cpp index 5bc00c7f..327da72f 100644 --- a/src/qt_gui/game_list_frame.cpp +++ b/src/qt_gui/game_list_frame.cpp @@ -99,8 +99,8 @@ void GameListFrame::SetListBackgroundImage(QTableWidgetItem* item) { QString pic1Path = QString::fromStdString(m_game_info->m_games[item->row()].pic_path); QString blurredPic1Path = - qApp->applicationDirPath() + - QString::fromStdString("/game_data/" + m_game_info->m_games[item->row()].serial + + QDir::currentPath() + + QString::fromStdString("/user/game_data/" + m_game_info->m_games[item->row()].serial + "/pic1.png"); backgroundImage = QImage(blurredPic1Path); @@ -109,7 +109,7 @@ void GameListFrame::SetListBackgroundImage(QTableWidgetItem* item) { backgroundImage = m_game_list_utils.BlurImage(image, image.rect(), 16); std::filesystem::path img_path = - std::filesystem::path("game_data/") / m_game_info->m_games[item->row()].serial; + std::filesystem::path("user/game_data/") / m_game_info->m_games[item->row()].serial; std::filesystem::create_directories(img_path); if (!backgroundImage.save(blurredPic1Path, "PNG")) { // qDebug() << "Error: Unable to save image."; @@ -206,4 +206,4 @@ void GameListFrame::SetRegionFlag(int row, int column, QString itemStr) { widget->setLayout(layout); this->setItem(row, column, item); this->setCellWidget(row, column, widget); -} \ No newline at end of file +} diff --git a/src/qt_gui/main.cpp b/src/qt_gui/main.cpp index 071e12b7..08c363b3 100644 --- a/src/qt_gui/main.cpp +++ b/src/qt_gui/main.cpp @@ -20,7 +20,7 @@ int main(int argc, char* argv[]) { // Load configurations and initialize Qt application const auto config_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir); Config::load(config_dir / "config.toml"); - QString gameDataPath = qApp->applicationDirPath() + "/game_data/"; + QString gameDataPath = QDir::currentPath() + "/user/game_data/"; std::string stdStr = gameDataPath.toStdString(); std::filesystem::path path(stdStr); #ifdef _WIN64 diff --git a/src/qt_gui/trophy_viewer.cpp b/src/qt_gui/trophy_viewer.cpp index 8c28019e..4293745e 100644 --- a/src/qt_gui/trophy_viewer.cpp +++ b/src/qt_gui/trophy_viewer.cpp @@ -19,7 +19,7 @@ TrophyViewer::TrophyViewer(QString trophyPath, QString gameTrpPath) : QMainWindo } void TrophyViewer::PopulateTrophyWidget(QString title) { - QString trophyDir = qApp->applicationDirPath() + "/game_data/" + title + "/TrophyFiles"; + QString trophyDir = QDir::currentPath() + "/user/game_data/" + title + "/TrophyFiles"; QDir dir(trophyDir); if (!dir.exists()) { std::filesystem::path path(gameTrpPath_.toStdString()); @@ -142,4 +142,4 @@ void TrophyViewer::SetTableItem(QTableWidget* parent, int row, int column, QStri widget->setLayout(layout); parent->setItem(row, column, item); parent->setCellWidget(row, column, widget); -} \ No newline at end of file +}