summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt21
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt34
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt33
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt10
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameVerificationResult.kt15
-rw-r--r--src/android/app/src/main/jni/native.cpp37
-rw-r--r--src/android/app/src/main/res/layout/fragment_game_info.xml8
-rw-r--r--src/android/app/src/main/res/values/strings.xml11
-rw-r--r--src/frontend_common/content_manager.h155
-rw-r--r--src/yuzu/main.cpp138
10 files changed, 335 insertions, 127 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
index 1c9fb0675..c408485c6 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
@@ -23,6 +23,7 @@ import org.yuzu.yuzu_emu.utils.Log
import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable
import org.yuzu.yuzu_emu.model.InstallResult
import org.yuzu.yuzu_emu.model.Patch
+import org.yuzu.yuzu_emu.model.GameVerificationResult
/**
* Class which contains methods that interact
@@ -565,6 +566,26 @@ object NativeLibrary {
external fun removeMod(programId: String, name: String)
/**
+ * Verifies all installed content
+ * @param callback UI callback for verification progress. Return true in the callback to cancel.
+ * @return Array of content that failed verification. Successful if empty.
+ */
+ external fun verifyInstalledContents(
+ callback: (max: Long, progress: Long) -> Boolean
+ ): Array<String>
+
+ /**
+ * Verifies the contents of a game
+ * @param path String path to a game
+ * @param callback UI callback for verification progress. Return true in the callback to cancel.
+ * @return Int that is meant to be converted to a [GameVerificationResult]
+ */
+ external fun verifyGameContents(
+ path: String,
+ callback: (max: Long, progress: Long) -> Boolean
+ ): Int
+
+ /**
* Gets the save location for a specific game
*
* @param programId String representation of a game's program ID
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt
index fa2a4c9f9..5aa3f453f 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt
@@ -21,8 +21,10 @@ import androidx.fragment.app.activityViewModels
import androidx.navigation.findNavController
import androidx.navigation.fragment.navArgs
import com.google.android.material.transition.MaterialSharedAxis
+import org.yuzu.yuzu_emu.NativeLibrary
import org.yuzu.yuzu_emu.R
import org.yuzu.yuzu_emu.databinding.FragmentGameInfoBinding
+import org.yuzu.yuzu_emu.model.GameVerificationResult
import org.yuzu.yuzu_emu.model.HomeViewModel
import org.yuzu.yuzu_emu.utils.GameMetadata
@@ -101,6 +103,38 @@ class GameInfoFragment : Fragment() {
""".trimIndent()
copyToClipboard(args.game.title, details)
}
+
+ buttonVerifyIntegrity.setOnClickListener {
+ ProgressDialogFragment.newInstance(
+ requireActivity(),
+ R.string.verifying,
+ true
+ ) { progressCallback, _ ->
+ val result = GameVerificationResult.from(
+ NativeLibrary.verifyGameContents(
+ args.game.path,
+ progressCallback
+ )
+ )
+ return@newInstance when (result) {
+ GameVerificationResult.Success ->
+ MessageDialogFragment.newInstance(
+ titleId = R.string.verify_success,
+ descriptionId = R.string.operation_completed_successfully
+ )
+ GameVerificationResult.Failed ->
+ MessageDialogFragment.newInstance(
+ titleId = R.string.verify_failure,
+ descriptionId = R.string.verify_failure_description
+ )
+ GameVerificationResult.NotImplemented ->
+ MessageDialogFragment.newInstance(
+ titleId = R.string.verify_no_result,
+ descriptionId = R.string.verify_no_result_description
+ )
+ }
+ }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+ }
}
setInsets()
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
index 6ddd758e6..aefae2938 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
@@ -32,6 +32,7 @@ import org.yuzu.yuzu_emu.BuildConfig
import org.yuzu.yuzu_emu.HomeNavigationDirections
import org.yuzu.yuzu_emu.NativeLibrary
import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.YuzuApplication
import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter
import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
import org.yuzu.yuzu_emu.features.DocumentProvider
@@ -142,6 +143,38 @@ class HomeSettingsFragment : Fragment() {
)
add(
HomeSetting(
+ R.string.verify_installed_content,
+ R.string.verify_installed_content_description,
+ R.drawable.ic_check_circle,
+ {
+ ProgressDialogFragment.newInstance(
+ requireActivity(),
+ titleId = R.string.verifying,
+ cancellable = true
+ ) { progressCallback, _ ->
+ val result = NativeLibrary.verifyInstalledContents(progressCallback)
+ return@newInstance if (result.isEmpty()) {
+ MessageDialogFragment.newInstance(
+ titleId = R.string.verify_success,
+ descriptionId = R.string.operation_completed_successfully
+ )
+ } else {
+ val failedNames = result.joinToString("\n")
+ val errorMessage = YuzuApplication.appContext.getString(
+ R.string.verification_failed_for,
+ failedNames
+ )
+ MessageDialogFragment.newInstance(
+ titleId = R.string.verify_failure,
+ descriptionString = errorMessage
+ )
+ }
+ }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+ }
+ )
+ )
+ add(
+ HomeSetting(
R.string.share_log,
R.string.share_log_description,
R.drawable.ic_log,
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
index 32062b6fe..620d8db7c 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
@@ -69,7 +69,7 @@ class MessageDialogFragment : DialogFragment() {
private const val HELP_LINK = "Link"
fun newInstance(
- activity: FragmentActivity,
+ activity: FragmentActivity? = null,
titleId: Int = 0,
titleString: String = "",
descriptionId: Int = 0,
@@ -86,9 +86,11 @@ class MessageDialogFragment : DialogFragment() {
putString(DESCRIPTION_STRING, descriptionString)
putInt(HELP_LINK, helpLinkId)
}
- ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply {
- clear()
- this.positiveAction = positiveAction
+ if (activity != null) {
+ ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply {
+ clear()
+ this.positiveAction = positiveAction
+ }
}
dialog.arguments = bundle
return dialog
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameVerificationResult.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameVerificationResult.kt
new file mode 100644
index 000000000..804637fb8
--- /dev/null
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameVerificationResult.kt
@@ -0,0 +1,15 @@
+// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.model
+
+enum class GameVerificationResult(val int: Int) {
+ Success(0),
+ Failed(1),
+ NotImplemented(2);
+
+ companion object {
+ fun from(int: Int): GameVerificationResult =
+ entries.firstOrNull { it.int == int } ?: Success
+ }
+}
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index be0a723b1..963f57380 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -829,6 +829,43 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj,
program_id, GetJString(env, jname));
}
+jobject Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env, jobject jobj,
+ jobject jcallback) {
+ auto jlambdaClass = env->GetObjectClass(jcallback);
+ auto jlambdaInvokeMethod = env->GetMethodID(
+ jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+ const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) {
+ auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod,
+ ToJDouble(env, max), ToJDouble(env, progress));
+ return GetJBoolean(env, jwasCancelled);
+ };
+
+ auto& session = EmulationSession::GetInstance();
+ std::vector<std::string> result = ContentManager::VerifyInstalledContents(
+ &session.System(), session.GetContentProvider(), callback);
+ jobjectArray jresult =
+ env->NewObjectArray(result.size(), IDCache::GetStringClass(), ToJString(env, ""));
+ for (size_t i = 0; i < result.size(); ++i) {
+ env->SetObjectArrayElement(jresult, i, ToJString(env, result[i]));
+ }
+ return jresult;
+}
+
+jint Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobject jobj,
+ jstring jpath, jobject jcallback) {
+ auto jlambdaClass = env->GetObjectClass(jcallback);
+ auto jlambdaInvokeMethod = env->GetMethodID(
+ jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+ const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) {
+ auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod,
+ ToJDouble(env, max), ToJDouble(env, progress));
+ return GetJBoolean(env, jwasCancelled);
+ };
+ auto& session = EmulationSession::GetInstance();
+ return static_cast<jint>(
+ ContentManager::VerifyGameContents(&session.System(), GetJString(env, jpath), callback));
+}
+
jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,
jstring jprogramId) {
auto program_id = EmulationSession::GetProgramId(env, jprogramId);
diff --git a/src/android/app/src/main/res/layout/fragment_game_info.xml b/src/android/app/src/main/res/layout/fragment_game_info.xml
index 80ede8a8c..53af15787 100644
--- a/src/android/app/src/main/res/layout/fragment_game_info.xml
+++ b/src/android/app/src/main/res/layout/fragment_game_info.xml
@@ -118,6 +118,14 @@
android:layout_marginTop="16dp"
android:text="@string/copy_details" />
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/button_verify_integrity"
+ style="@style/Widget.Material3.Button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:text="@string/verify_integrity" />
+
</LinearLayout>
</androidx.core.widget.NestedScrollView>
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index bfcbb5812..eefcc3ff4 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -142,6 +142,8 @@
<item quantity="other">Successfully imported %d saves</item>
</plurals>
<string name="no_save_data_found">No save data found</string>
+ <string name="verify_installed_content">Verify installed content</string>
+ <string name="verify_installed_content_description">Checks all installed content for corruption</string>
<!-- Applet launcher strings -->
<string name="applets">Applet launcher</string>
@@ -288,6 +290,7 @@
<string name="import_complete">Import complete</string>
<string name="more_options">More options</string>
<string name="use_global_setting">Use global setting</string>
+ <string name="operation_completed_successfully">The operation completed successfully</string>
<!-- GPU driver installation -->
<string name="select_gpu_driver">Select GPU driver</string>
@@ -352,6 +355,14 @@
<string name="content_install_notice_description">The content that you selected does not match this game.\nInstall anyway?</string>
<string name="confirm_uninstall">Confirm uninstall</string>
<string name="confirm_uninstall_description">Are you sure you want to uninstall this addon?</string>
+ <string name="verify_integrity">Verify integrity</string>
+ <string name="verifying">Verifying…</string>
+ <string name="verify_success">Integrity verification succeeded!</string>
+ <string name="verify_failure">Integrity verification failed!</string>
+ <string name="verify_failure_description">File contents may be corrupt</string>
+ <string name="verify_no_result">Integrity verification couldn\'t be performed</string>
+ <string name="verify_no_result_description">File contents were not checked for validity</string>
+ <string name="verification_failed_for">Verification failed for the following files:\n%1$s</string>
<!-- ROM loading errors -->
<string name="loader_error_encrypted">Your ROM is encrypted</string>
diff --git a/src/frontend_common/content_manager.h b/src/frontend_common/content_manager.h
index 23f2979db..0b0fee73e 100644
--- a/src/frontend_common/content_manager.h
+++ b/src/frontend_common/content_manager.h
@@ -11,10 +11,12 @@
#include "core/file_sys/content_archive.h"
#include "core/file_sys/mode.h"
#include "core/file_sys/nca_metadata.h"
+#include "core/file_sys/patch_manager.h"
#include "core/file_sys/registered_cache.h"
#include "core/file_sys/submission_package.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/loader/loader.h"
+#include "core/loader/nca.h"
namespace ContentManager {
@@ -25,6 +27,12 @@ enum class InstallResult {
BaseInstallAttempted,
};
+enum class GameVerificationResult {
+ Success,
+ Failed,
+ NotImplemented,
+};
+
/**
* \brief Removes a single installed DLC
* \param fs_controller [FileSystemController] reference from the Core::System instance
@@ -119,14 +127,14 @@ inline bool RemoveMod(const Service::FileSystem::FileSystemController& fs_contro
* \param system Raw pointer to the system instance
* \param vfs Raw pointer to the VfsFilesystem instance in Core::System
* \param filename Path to the NSP file
- * \param callback Optional callback to report the progress of the installation. The first size_t
+ * \param callback Callback to report the progress of the installation. The first size_t
* parameter is the total size of the virtual file and the second is the current progress. If you
- * return false to the callback, it will cancel the installation as soon as possible.
+ * return true to the callback, it will cancel the installation as soon as possible.
* \return [InstallResult] representing how the installation finished
*/
-inline InstallResult InstallNSP(
- Core::System* system, FileSys::VfsFilesystem* vfs, const std::string& filename,
- const std::function<bool(size_t, size_t)>& callback = std::function<bool(size_t, size_t)>()) {
+inline InstallResult InstallNSP(Core::System* system, FileSys::VfsFilesystem* vfs,
+ const std::string& filename,
+ const std::function<bool(size_t, size_t)>& callback) {
const auto copy = [callback](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
std::size_t block_size) {
if (src == nullptr || dest == nullptr) {
@@ -184,15 +192,15 @@ inline InstallResult InstallNSP(
* \param filename Path to the NCA file
* \param registered_cache Raw pointer to the registered cache that the NCA will be installed to
* \param title_type Type of NCA package to install
- * \param callback Optional callback to report the progress of the installation. The first size_t
+ * \param callback Callback to report the progress of the installation. The first size_t
* parameter is the total size of the virtual file and the second is the current progress. If you
- * return false to the callback, it will cancel the installation as soon as possible.
+ * return true to the callback, it will cancel the installation as soon as possible.
* \return [InstallResult] representing how the installation finished
*/
-inline InstallResult InstallNCA(
- FileSys::VfsFilesystem* vfs, const std::string& filename,
- FileSys::RegisteredCache* registered_cache, const FileSys::TitleType title_type,
- const std::function<bool(size_t, size_t)>& callback = std::function<bool(size_t, size_t)>()) {
+inline InstallResult InstallNCA(FileSys::VfsFilesystem* vfs, const std::string& filename,
+ FileSys::RegisteredCache* registered_cache,
+ const FileSys::TitleType title_type,
+ const std::function<bool(size_t, size_t)>& callback) {
const auto copy = [callback](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
std::size_t block_size) {
if (src == nullptr || dest == nullptr) {
@@ -235,4 +243,129 @@ inline InstallResult InstallNCA(
}
}
+/**
+ * \brief Verifies the installed contents for a given ManualContentProvider
+ * \param system Raw pointer to the system instance
+ * \param provider Raw pointer to the content provider that's tracking indexed games
+ * \param callback Callback to report the progress of the installation. The first size_t
+ * parameter is the total size of the installed contents and the second is the current progress. If
+ * you return true to the callback, it will cancel the installation as soon as possible.
+ * \return A list of entries that failed to install. Returns an empty vector if successful.
+ */
+inline std::vector<std::string> VerifyInstalledContents(
+ Core::System* system, FileSys::ManualContentProvider* provider,
+ const std::function<bool(size_t, size_t)>& callback) {
+ // Get content registries.
+ auto bis_contents = system->GetFileSystemController().GetSystemNANDContents();
+ auto user_contents = system->GetFileSystemController().GetUserNANDContents();
+
+ std::vector<FileSys::RegisteredCache*> content_providers;
+ if (bis_contents) {
+ content_providers.push_back(bis_contents);
+ }
+ if (user_contents) {
+ content_providers.push_back(user_contents);
+ }
+
+ // Get associated NCA files.
+ std::vector<FileSys::VirtualFile> nca_files;
+
+ // Get all installed IDs.
+ size_t total_size = 0;
+ for (auto nca_provider : content_providers) {
+ const auto entries = nca_provider->ListEntriesFilter();
+
+ for (const auto& entry : entries) {
+ auto nca_file = nca_provider->GetEntryRaw(entry.title_id, entry.type);
+ if (!nca_file) {
+ continue;
+ }
+
+ total_size += nca_file->GetSize();
+ nca_files.push_back(std::move(nca_file));
+ }
+ }
+
+ // Declare a list of file names which failed to verify.
+ std::vector<std::string> failed;
+
+ size_t processed_size = 0;
+ bool cancelled = false;
+ auto nca_callback = [&](size_t nca_processed, size_t nca_total) {
+ cancelled = callback(total_size, processed_size + nca_processed);
+ return !cancelled;
+ };
+
+ // Using the NCA loader, determine if all NCAs are valid.
+ for (auto& nca_file : nca_files) {
+ Loader::AppLoader_NCA nca_loader(nca_file);
+
+ auto status = nca_loader.VerifyIntegrity(nca_callback);
+ if (cancelled) {
+ break;
+ }
+ if (status != Loader::ResultStatus::Success) {
+ FileSys::NCA nca(nca_file);
+ const auto title_id = nca.GetTitleId();
+ std::string title_name = "unknown";
+
+ const auto control = provider->GetEntry(FileSys::GetBaseTitleID(title_id),
+ FileSys::ContentRecordType::Control);
+ if (control && control->GetStatus() == Loader::ResultStatus::Success) {
+ const FileSys::PatchManager pm{title_id, system->GetFileSystemController(),
+ *provider};
+ const auto [nacp, logo] = pm.ParseControlNCA(*control);
+ if (nacp) {
+ title_name = nacp->GetApplicationName();
+ }
+ }
+
+ if (title_id > 0) {
+ failed.push_back(
+ fmt::format("{} ({:016X}) ({})", nca_file->GetName(), title_id, title_name));
+ } else {
+ failed.push_back(fmt::format("{} (unknown)", nca_file->GetName()));
+ }
+ }
+
+ processed_size += nca_file->GetSize();
+ }
+ return failed;
+}
+
+/**
+ * \brief Verifies the contents of a given game
+ * \param system Raw pointer to the system instance
+ * \param game_path Patch to the game file
+ * \param callback Callback to report the progress of the installation. The first size_t
+ * parameter is the total size of the installed contents and the second is the current progress. If
+ * you return true to the callback, it will cancel the installation as soon as possible.
+ * \return GameVerificationResult representing how the verification process finished
+ */
+inline GameVerificationResult VerifyGameContents(
+ Core::System* system, const std::string& game_path,
+ const std::function<bool(size_t, size_t)>& callback) {
+ const auto loader = Loader::GetLoader(
+ *system, system->GetFilesystem()->OpenFile(game_path, FileSys::Mode::Read));
+ if (loader == nullptr) {
+ return GameVerificationResult::NotImplemented;
+ }
+
+ bool cancelled = false;
+ auto loader_callback = [&](size_t processed, size_t total) {
+ cancelled = callback(total, processed);
+ return !cancelled;
+ };
+
+ const auto status = loader->VerifyIntegrity(loader_callback);
+ if (cancelled || status == Loader::ResultStatus::ErrorIntegrityVerificationNotImplemented) {
+ return GameVerificationResult::NotImplemented;
+ }
+
+ if (status == Loader::ResultStatus::ErrorIntegrityVerificationFailed) {
+ return GameVerificationResult::Failed;
+ }
+ return GameVerificationResult::Success;
+}
+
} // namespace ContentManager
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 05bd4174c..d8b0beadf 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -2786,16 +2786,6 @@ void GMainWindow::OnGameListVerifyIntegrity(const std::string& game_path) {
QMessageBox::warning(this, tr("Integrity verification couldn't be performed!"),
tr("File contents were not checked for validity."));
};
- const auto Failed = [this] {
- QMessageBox::critical(this, tr("Integrity verification failed!"),
- tr("File contents may be corrupt."));
- };
-
- const auto loader = Loader::GetLoader(*system, vfs->OpenFile(game_path, FileSys::Mode::Read));
- if (loader == nullptr) {
- NotImplemented();
- return;
- }
QProgressDialog progress(tr("Verifying integrity..."), tr("Cancel"), 0, 100, this);
progress.setWindowModality(Qt::WindowModal);
@@ -2803,30 +2793,26 @@ void GMainWindow::OnGameListVerifyIntegrity(const std::string& game_path) {
progress.setAutoClose(false);
progress.setAutoReset(false);
- const auto QtProgressCallback = [&](size_t processed_size, size_t total_size) {
- if (progress.wasCanceled()) {
- return false;
- }
-
+ const auto QtProgressCallback = [&](size_t total_size, size_t processed_size) {
progress.setValue(static_cast<int>((processed_size * 100) / total_size));
- return true;
+ return progress.wasCanceled();
};
- const auto status = loader->VerifyIntegrity(QtProgressCallback);
- if (progress.wasCanceled() ||
- status == Loader::ResultStatus::ErrorIntegrityVerificationNotImplemented) {
+ const auto result =
+ ContentManager::VerifyGameContents(system.get(), game_path, QtProgressCallback);
+ progress.close();
+ switch (result) {
+ case ContentManager::GameVerificationResult::Success:
+ QMessageBox::information(this, tr("Integrity verification succeeded!"),
+ tr("The operation completed successfully."));
+ break;
+ case ContentManager::GameVerificationResult::Failed:
+ QMessageBox::critical(this, tr("Integrity verification failed!"),
+ tr("File contents may be corrupt."));
+ break;
+ case ContentManager::GameVerificationResult::NotImplemented:
NotImplemented();
- return;
- }
-
- if (status == Loader::ResultStatus::ErrorIntegrityVerificationFailed) {
- Failed();
- return;
}
-
- progress.close();
- QMessageBox::information(this, tr("Integrity verification succeeded!"),
- tr("The operation completed successfully."));
}
void GMainWindow::OnGameListCopyTID(u64 program_id) {
@@ -4121,10 +4107,6 @@ void GMainWindow::OnOpenYuzuFolder() {
}
void GMainWindow::OnVerifyInstalledContents() {
- // Declare sizes.
- size_t total_size = 0;
- size_t processed_size = 0;
-
// Initialize a progress dialog.
QProgressDialog progress(tr("Verifying integrity..."), tr("Cancel"), 0, 100, this);
progress.setWindowModality(Qt::WindowModal);
@@ -4132,93 +4114,25 @@ void GMainWindow::OnVerifyInstalledContents() {
progress.setAutoClose(false);
progress.setAutoReset(false);
- // Declare a list of file names which failed to verify.
- std::vector<std::string> failed;
-
// Declare progress callback.
- auto QtProgressCallback = [&](size_t nca_processed, size_t nca_total) {
- if (progress.wasCanceled()) {
- return false;
- }
- progress.setValue(static_cast<int>(((processed_size + nca_processed) * 100) / total_size));
- return true;
+ auto QtProgressCallback = [&](size_t total_size, size_t processed_size) {
+ progress.setValue(static_cast<int>((processed_size * 100) / total_size));
+ return progress.wasCanceled();
};
- // Get content registries.
- auto bis_contents = system->GetFileSystemController().GetSystemNANDContents();
- auto user_contents = system->GetFileSystemController().GetUserNANDContents();
-
- std::vector<FileSys::RegisteredCache*> content_providers;
- if (bis_contents) {
- content_providers.push_back(bis_contents);
- }
- if (user_contents) {
- content_providers.push_back(user_contents);
- }
-
- // Get associated NCA files.
- std::vector<FileSys::VirtualFile> nca_files;
-
- // Get all installed IDs.
- for (auto nca_provider : content_providers) {
- const auto entries = nca_provider->ListEntriesFilter();
-
- for (const auto& entry : entries) {
- auto nca_file = nca_provider->GetEntryRaw(entry.title_id, entry.type);
- if (!nca_file) {
- continue;
- }
-
- total_size += nca_file->GetSize();
- nca_files.push_back(std::move(nca_file));
- }
- }
-
- // Using the NCA loader, determine if all NCAs are valid.
- for (auto& nca_file : nca_files) {
- Loader::AppLoader_NCA nca_loader(nca_file);
-
- auto status = nca_loader.VerifyIntegrity(QtProgressCallback);
- if (progress.wasCanceled()) {
- break;
- }
- if (status != Loader::ResultStatus::Success) {
- FileSys::NCA nca(nca_file);
- const auto title_id = nca.GetTitleId();
- std::string title_name = "unknown";
-
- const auto control = provider->GetEntry(FileSys::GetBaseTitleID(title_id),
- FileSys::ContentRecordType::Control);
- if (control && control->GetStatus() == Loader::ResultStatus::Success) {
- const FileSys::PatchManager pm{title_id, system->GetFileSystemController(),
- *provider};
- const auto [nacp, logo] = pm.ParseControlNCA(*control);
- if (nacp) {
- title_name = nacp->GetApplicationName();
- }
- }
-
- if (title_id > 0) {
- failed.push_back(
- fmt::format("{} ({:016X}) ({})", nca_file->GetName(), title_id, title_name));
- } else {
- failed.push_back(fmt::format("{} (unknown)", nca_file->GetName()));
- }
- }
-
- processed_size += nca_file->GetSize();
- }
-
+ const std::vector<std::string> result =
+ ContentManager::VerifyInstalledContents(system.get(), provider.get(), QtProgressCallback);
progress.close();
- if (failed.size() > 0) {
- auto failed_names = QString::fromStdString(fmt::format("{}", fmt::join(failed, "\n")));
+ if (result.empty()) {
+ QMessageBox::information(this, tr("Integrity verification succeeded!"),
+ tr("The operation completed successfully."));
+ } else {
+ const auto failed_names =
+ QString::fromStdString(fmt::format("{}", fmt::join(result, "\n")));
QMessageBox::critical(
this, tr("Integrity verification failed!"),
tr("Verification failed for the following files:\n\n%1").arg(failed_names));
- } else {
- QMessageBox::information(this, tr("Integrity verification succeeded!"),
- tr("The operation completed successfully."));
}
}