From acfd05576999209a389084bbf34e33b016725894 Mon Sep 17 00:00:00 2001 From: Collecting Date: Wed, 10 Dec 2025 01:27:08 +0000 Subject: [PATCH] feat: New Autoloader & Rebrand Current to "Update Manager" Signed-off-by: Collecting --- .../configuration/configure_filesystem.cpp | 264 ++++++++++-------- 1 file changed, 146 insertions(+), 118 deletions(-) diff --git a/src/citron/configuration/configure_filesystem.cpp b/src/citron/configuration/configure_filesystem.cpp index a62c00201..691bce311 100644 --- a/src/citron/configuration/configure_filesystem.cpp +++ b/src/citron/configuration/configure_filesystem.cpp @@ -2,155 +2,183 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "citron/configuration/configure_filesystem.h" #include #include +#include +#include +#include +#include +#include "citron/main.h" +#include "citron/uisettings.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" +#include "common/literals.h" #include "common/settings.h" +#include "frontend_common/content_manager.h" #include "ui_configure_filesystem.h" -#include "citron/configuration/configure_filesystem.h" -#include "citron/uisettings.h" + +static constexpr size_t CopyBufferSize = 0x400000; ConfigureFilesystem::ConfigureFilesystem(QWidget* parent) : QWidget(parent), ui(std::make_unique()) { ui->setupUi(this); SetConfiguration(); - connect(ui->nand_directory_button, &QToolButton::pressed, this, - [this] { SetDirectory(DirectoryTarget::NAND, ui->nand_directory_edit); }); - connect(ui->sdmc_directory_button, &QToolButton::pressed, this, - [this] { SetDirectory(DirectoryTarget::SD, ui->sdmc_directory_edit); }); - connect(ui->gamecard_path_button, &QToolButton::pressed, this, - [this] { SetDirectory(DirectoryTarget::Gamecard, ui->gamecard_path_edit); }); - connect(ui->dump_path_button, &QToolButton::pressed, this, - [this] { SetDirectory(DirectoryTarget::Dump, ui->dump_path_edit); }); - connect(ui->load_path_button, &QToolButton::pressed, this, - [this] { SetDirectory(DirectoryTarget::Load, ui->load_path_edit); }); + connect(ui->run_autoloader_button, &QPushButton::clicked, this, &ConfigureFilesystem::OnRunAutoloader); + connect(ui->nand_directory_button, &QToolButton::pressed, this, [this] { SetDirectory(DirectoryTarget::NAND, ui->nand_directory_edit); }); + connect(ui->sdmc_directory_button, &QToolButton::pressed, this, [this] { SetDirectory(DirectoryTarget::SD, ui->sdmc_directory_edit); }); + connect(ui->gamecard_path_button, &QToolButton::pressed, this, [this] { SetDirectory(DirectoryTarget::Gamecard, ui->gamecard_path_edit); }); + connect(ui->dump_path_button, &QToolButton::pressed, this, [this] { SetDirectory(DirectoryTarget::Dump, ui->dump_path_edit); }); + connect(ui->load_path_button, &QToolButton::pressed, this, [this] { SetDirectory(DirectoryTarget::Load, ui->load_path_edit); }); + connect(ui->reset_game_list_cache, &QPushButton::pressed, this, &ConfigureFilesystem::ResetMetadata); + connect(ui->gamecard_inserted, &QCheckBox::checkStateChanged, this, &ConfigureFilesystem::UpdateEnabledControls); + connect(ui->gamecard_current_game, &QCheckBox::checkStateChanged, this, &ConfigureFilesystem::UpdateEnabledControls); - connect(ui->reset_game_list_cache, &QPushButton::pressed, this, - &ConfigureFilesystem::ResetMetadata); - - connect(ui->gamecard_inserted, &QCheckBox::checkStateChanged, this, - &ConfigureFilesystem::UpdateEnabledControls); - connect(ui->gamecard_current_game, &QCheckBox::checkStateChanged, this, - &ConfigureFilesystem::UpdateEnabledControls); + connect(this, &ConfigureFilesystem::UpdateInstallProgress, this, &ConfigureFilesystem::OnUpdateInstallProgress); } ConfigureFilesystem::~ConfigureFilesystem() = default; -void ConfigureFilesystem::changeEvent(QEvent* event) { - if (event->type() == QEvent::LanguageChange) { - RetranslateUI(); - } +void ConfigureFilesystem::changeEvent(QEvent* event) { if (event->type() == QEvent::LanguageChange) { RetranslateUI(); } QWidget::changeEvent(event); } +void ConfigureFilesystem::SetConfiguration() { ui->nand_directory_edit->setText(QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::NANDDir))); ui->sdmc_directory_edit->setText(QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::SDMCDir))); ui->gamecard_path_edit->setText(QString::fromStdString(Settings::values.gamecard_path.GetValue())); ui->dump_path_edit->setText(QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::DumpDir))); ui->load_path_edit->setText(QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::LoadDir))); ui->gamecard_inserted->setChecked(Settings::values.gamecard_inserted.GetValue()); ui->gamecard_current_game->setChecked(Settings::values.gamecard_current_game.GetValue()); ui->dump_exefs->setChecked(Settings::values.dump_exefs.GetValue()); ui->dump_nso->setChecked(Settings::values.dump_nso.GetValue()); ui->cache_game_list->setChecked(UISettings::values.cache_game_list.GetValue()); ui->prompt_for_autoloader->setChecked(UISettings::values.prompt_for_autoloader.GetValue()); UpdateEnabledControls(); } +void ConfigureFilesystem::ApplyConfiguration() { Common::FS::SetCitronPath(Common::FS::CitronPath::NANDDir, ui->nand_directory_edit->text().toStdString()); Common::FS::SetCitronPath(Common::FS::CitronPath::SDMCDir, ui->sdmc_directory_edit->text().toStdString()); Common::FS::SetCitronPath(Common::FS::CitronPath::DumpDir, ui->dump_path_edit->text().toStdString()); Common::FS::SetCitronPath(Common::FS::CitronPath::LoadDir, ui->load_path_edit->text().toStdString()); Settings::values.gamecard_inserted = ui->gamecard_inserted->isChecked(); Settings::values.gamecard_current_game = ui->gamecard_current_game->isChecked(); Settings::values.dump_exefs = ui->dump_exefs->isChecked(); Settings::values.dump_nso = ui->dump_nso->isChecked(); UISettings::values.cache_game_list = ui->cache_game_list->isChecked(); UISettings::values.prompt_for_autoloader = ui->prompt_for_autoloader->isChecked(); } +void ConfigureFilesystem::SetDirectory(DirectoryTarget target, QLineEdit* edit) { QString caption; switch (target) { case DirectoryTarget::NAND: caption = tr("Select Emulated NAND Directory..."); break; case DirectoryTarget::SD: caption = tr("Select Emulated SD Directory..."); break; case DirectoryTarget::Gamecard: caption = tr("Select Gamecard Path..."); break; case DirectoryTarget::Dump: caption = tr("Select Dump Directory..."); break; case DirectoryTarget::Load: caption = tr("Select Mod Load Directory..."); break; } QString str; if (target == DirectoryTarget::Gamecard) { str = QFileDialog::getOpenFileName(this, caption, QFileInfo(edit->text()).dir().path(), QStringLiteral("NX Gamecard;*.xci")); } else { str = QFileDialog::getExistingDirectory(this, caption, edit->text()); } if (str.isNull() || str.isEmpty()) { return; } if (str.back() != QChar::fromLatin1('/')) { str.append(QChar::fromLatin1('/')); } edit->setText(str); } +void ConfigureFilesystem::ResetMetadata() { if (!Common::FS::Exists(Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list/")) { QMessageBox::information(this, tr("Reset Metadata Cache"), tr("The metadata cache is already empty.")); } else if (Common::FS::RemoveDirRecursively(Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list")) { QMessageBox::information(this, tr("Reset Metadata Cache"), tr("The operation completed successfully.")); UISettings::values.is_game_list_reload_pending.exchange(true); } else { QMessageBox::warning(this, tr("Reset Metadata Cache"), tr("The metadata cache couldn't be deleted. It might be in use or non-existent.")); } } +void ConfigureFilesystem::UpdateEnabledControls() { ui->gamecard_current_game->setEnabled(ui->gamecard_inserted->isChecked()); ui->gamecard_path_edit->setEnabled(ui->gamecard_inserted->isChecked() && !ui->gamecard_current_game->isChecked()); ui->gamecard_path_button->setEnabled(ui->gamecard_inserted->isChecked() && !ui->gamecard_current_game->isChecked()); } +void ConfigureFilesystem::RetranslateUI() { ui->retranslateUi(this); } - QWidget::changeEvent(event); +void ConfigureFilesystem::OnUpdateInstallProgress() { + if (install_progress) { + install_progress->setValue(install_progress->value() + 1); + } } -void ConfigureFilesystem::SetConfiguration() { - ui->nand_directory_edit->setText( - QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::NANDDir))); - ui->sdmc_directory_edit->setText( - QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::SDMCDir))); - ui->gamecard_path_edit->setText( - QString::fromStdString(Settings::values.gamecard_path.GetValue())); - ui->dump_path_edit->setText( - QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::DumpDir))); - ui->load_path_edit->setText( - QString::fromStdString(Common::FS::GetCitronPathString(Common::FS::CitronPath::LoadDir))); - - ui->gamecard_inserted->setChecked(Settings::values.gamecard_inserted.GetValue()); - ui->gamecard_current_game->setChecked(Settings::values.gamecard_current_game.GetValue()); - ui->dump_exefs->setChecked(Settings::values.dump_exefs.GetValue()); - ui->dump_nso->setChecked(Settings::values.dump_nso.GetValue()); - - ui->cache_game_list->setChecked(UISettings::values.cache_game_list.GetValue()); - - UpdateEnabledControls(); -} - -void ConfigureFilesystem::ApplyConfiguration() { - Common::FS::SetCitronPath(Common::FS::CitronPath::NANDDir, - ui->nand_directory_edit->text().toStdString()); - Common::FS::SetCitronPath(Common::FS::CitronPath::SDMCDir, - ui->sdmc_directory_edit->text().toStdString()); - Common::FS::SetCitronPath(Common::FS::CitronPath::DumpDir, - ui->dump_path_edit->text().toStdString()); - Common::FS::SetCitronPath(Common::FS::CitronPath::LoadDir, - ui->load_path_edit->text().toStdString()); - - Settings::values.gamecard_inserted = ui->gamecard_inserted->isChecked(); - Settings::values.gamecard_current_game = ui->gamecard_current_game->isChecked(); - Settings::values.dump_exefs = ui->dump_exefs->isChecked(); - Settings::values.dump_nso = ui->dump_nso->isChecked(); - - UISettings::values.cache_game_list = ui->cache_game_list->isChecked(); -} - -void ConfigureFilesystem::SetDirectory(DirectoryTarget target, QLineEdit* edit) { - QString caption; - - switch (target) { - case DirectoryTarget::NAND: - caption = tr("Select Emulated NAND Directory..."); - break; - case DirectoryTarget::SD: - caption = tr("Select Emulated SD Directory..."); - break; - case DirectoryTarget::Gamecard: - caption = tr("Select Gamecard Path..."); - break; - case DirectoryTarget::Dump: - caption = tr("Select Dump Directory..."); - break; - case DirectoryTarget::Load: - caption = tr("Select Mod Load Directory..."); - break; +void ConfigureFilesystem::OnRunAutoloader(bool skip_confirmation) { + if (!skip_confirmation) { + QMessageBox msgBox; + msgBox.setWindowTitle(tr("Begin Autoloader?")); + msgBox.setText(tr("The Autoloader will scan your Game Directories for all .nsp files " + "and attempt to install any found updates or DLC. This may take a while.")); + msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); + msgBox.setDefaultButton(QMessageBox::Ok); + if (msgBox.exec() != QMessageBox::Ok) { + return; + } } - QString str; - if (target == DirectoryTarget::Gamecard) { - str = QFileDialog::getOpenFileName(this, caption, QFileInfo(edit->text()).dir().path(), - QStringLiteral("NX Gamecard;*.xci")); - } else { - str = QFileDialog::getExistingDirectory(this, caption, edit->text()); + GMainWindow* main_window = qobject_cast(this->parent()); // Try direct parent first + if (!main_window) { + // Fallback for when it's nested in the config dialog + main_window = qobject_cast(this->window()->parent()); } - if (str.isNull() || str.isEmpty()) { + if (!main_window) { + QMessageBox::critical(this, tr("Error"), tr("Could not find the main window.")); + return; + } + Core::System* system = main_window->GetSystem(); + const auto& vfs = main_window->GetVFS(); + if (!system) { + QMessageBox::critical(this, tr("Error"), tr("System is not initialized.")); return; } - if (str.back() != QChar::fromLatin1('/')) { - str.append(QChar::fromLatin1('/')); + QStringList files_to_install; + for (const auto& game_dir : UISettings::values.game_dirs) { + Common::FS::IterateDirEntriesRecursively(game_dir.path, [&](const auto& entry) { + if (!entry.is_directory() && entry.path().extension() == ".nsp") { + files_to_install.append(QString::fromStdString(entry.path().string())); + } + return true; + }); } - edit->setText(str); -} + if (files_to_install.isEmpty()) { + QMessageBox::information(this, tr("Autoloader"), tr("No .nsp files found to install.")); + return; + } -void ConfigureFilesystem::ResetMetadata() { - if (!Common::FS::Exists(Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / - "game_list/")) { - QMessageBox::information(this, tr("Reset Metadata Cache"), - tr("The metadata cache is already empty.")); - } else if (Common::FS::RemoveDirRecursively( - Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list")) { - QMessageBox::information(this, tr("Reset Metadata Cache"), - tr("The operation completed successfully.")); - UISettings::values.is_game_list_reload_pending.exchange(true); + qint64 total_chunks = 0; + for (const QString& file : files_to_install) { + total_chunks += (QFileInfo(file).size() + CopyBufferSize - 1) / CopyBufferSize; + } + if (total_chunks == 0) { + QMessageBox::information(this, tr("Autoloader"), tr("Selected files are empty.")); + return; + } + + QStringList new_files{}, overwritten_files{}, failed_files{}; + bool detected_base_install{}; + bool was_cancelled = false; + + install_progress = new QProgressDialog(QString{}, tr("Cancel"), 0, static_cast(total_chunks), this); + install_progress->setWindowFlags(install_progress->windowFlags() & ~Qt::WindowContextHelpButtonHint); + install_progress->setAttribute(Qt::WA_DeleteOnClose, true); + install_progress->setFixedWidth(400); + // When the dialog is destroyed (e.g., user clicks X), set the pointer to nullptr + connect(install_progress, &QObject::destroyed, this, [this]() { install_progress = nullptr; }); + install_progress->show(); + + int remaining = files_to_install.size(); + for (const QString& file : files_to_install) { + if (!install_progress || install_progress->wasCanceled()) { + was_cancelled = true; + break; + } + + install_progress->setWindowTitle(tr("Autoloader - %n file(s) remaining", "", remaining)); + install_progress->setLabelText(tr("Installing: %1").arg(QFileInfo(file).fileName())); + + auto progress_callback = [this](size_t, size_t) { + emit UpdateInstallProgress(); + if (!install_progress) return true; + return install_progress->wasCanceled(); + }; + + QFuture future = + QtConcurrent::run([&] { return ContentManager::InstallNSP(*system, *vfs, file.toStdString(), progress_callback); }); + + while (!future.isFinished()) { + QCoreApplication::processEvents(); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + } + + ContentManager::InstallResult result = future.result(); + + switch (result) { + case ContentManager::InstallResult::Success: new_files.append(QFileInfo(file).fileName()); break; + case ContentManager::InstallResult::Overwrite: overwritten_files.append(QFileInfo(file).fileName()); break; + case ContentManager::InstallResult::Failure: failed_files.append(QFileInfo(file).fileName()); break; + case ContentManager::InstallResult::BaseInstallAttempted: + failed_files.append(QFileInfo(file).fileName()); + detected_base_install = true; + break; + } + --remaining; + } + + if (install_progress) { + install_progress->close(); + } + + if (detected_base_install) { + QMessageBox::warning(this, tr("Install Results"), tr("Warning: Base games were detected and skipped. The autoloader is intended for updates and DLC.")); + } + + if (new_files.isEmpty() && overwritten_files.isEmpty() && failed_files.isEmpty()) { + if (!was_cancelled) { + QMessageBox::information(this, tr("Autoloader"), tr("No new files were installed.")); + } } else { - QMessageBox::warning( - this, tr("Reset Metadata Cache"), - tr("The metadata cache couldn't be deleted. It might be in use or non-existent.")); + QString install_results = tr("Installation Complete!"); + install_results.append(QLatin1String("\n\n")); + if (!new_files.isEmpty()) install_results.append(tr("%n file(s) were newly installed.", nullptr, new_files.size())); + if (!overwritten_files.isEmpty()) install_results.append(tr("\n%n file(s) were overwritten.", nullptr, overwritten_files.size())); + if (!failed_files.isEmpty()) install_results.append(tr("\n%n file(s) failed to install.", nullptr, failed_files.size())); + QMessageBox::information(this, tr("Install Results"), install_results); } -} -void ConfigureFilesystem::UpdateEnabledControls() { - ui->gamecard_current_game->setEnabled(ui->gamecard_inserted->isChecked()); - ui->gamecard_path_edit->setEnabled(ui->gamecard_inserted->isChecked() && - !ui->gamecard_current_game->isChecked()); - ui->gamecard_path_button->setEnabled(ui->gamecard_inserted->isChecked() && - !ui->gamecard_current_game->isChecked()); -} - -void ConfigureFilesystem::RetranslateUI() { - ui->retranslateUi(this); + Common::FS::RemoveDirRecursively(Common::FS::GetCitronPath(Common::FS::CitronPath::CacheDir) / "game_list"); + emit RequestGameListRefresh(); }