preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Store: Perform uninstalls on a background thread, to avoid hanging the UI

Browse Source
This commit is contained in:
Henrik Rydgård
2023-12-08 13:10:26 +01:00
parent a929eb6c6d
commit 888b32e243
4 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Util/GameManager.cpp
+29 -18
View File
@@ -95,7 +95,7 @@ bool GameManager::DownloadAndInstall(std::string storeFileUrl) {
ERROR_LOG(HLE, "Can only process one download at a time");
return false;
}
if (installInProgress_) {
if (InstallInProgress()) {
ERROR_LOG(HLE, "Can't download when an install is in progress (yet)");
return false;
}
@@ -127,13 +127,9 @@ float GameManager::DownloadSpeedKBps() {
return 0.0f;
}
bool GameManager::Uninstall(std::string name) {
if (name.empty()) {
ERROR_LOG(HLE, "Cannot remove an empty-named game");
return false;
}
bool GameManager::UninstallGame(std::string name) {
Path gameDir = GetSysDirectory(DIRECTORY_GAME) / name;
INFO_LOG(HLE, "Deleting '%s'", gameDir.c_str());
INFO_LOG(HLE, "Uninstalling '%s'", gameDir.c_str());
if (!File::Exists(gameDir)) {
ERROR_LOG(HLE, "Game '%s' not installed, cannot uninstall", name.c_str());
return false;
@@ -141,11 +137,13 @@ bool GameManager::Uninstall(std::string name) {
bool success = File::DeleteDirRecursively(gameDir);
if (success) {
INFO_LOG(HLE, "Successfully deleted game '%s'", name.c_str());
g_Config.CleanRecent();
INFO_LOG(HLE, "Successfully uninstalled game '%s'", name.c_str());
InstallDone();
cleanRecentsAfter_ = true;
return true;
} else {
ERROR_LOG(HLE, "Failed to delete game '%s'", name.c_str());
ERROR_LOG(HLE, "Failed to uninstalled game '%s'", name.c_str());
InstallDone();
return false;
}
}
@@ -170,10 +168,13 @@ void GameManager::Update() {
curDownload_.reset();
}
if (installDonePending_) {
if (installThread_.joinable())
if (installDonePending_.exchange(false)) {
if (installThread_.joinable()) {
installThread_.join();
installDonePending_ = false;
}
if (cleanRecentsAfter_.exchange(false)) {
g_Config.CleanRecent();
}
}
}
@@ -278,7 +279,7 @@ ZipFileContents DetectZipFileContents(struct zip *z, ZipFileInfo *info) {
bool GameManager::InstallGame(Path url, Path fileName, bool deleteAfter) {
SetCurrentThreadName("InstallGame");
if (installInProgress_ || installDonePending_) {
if (installDonePending_) {
ERROR_LOG(HLE, "Cannot have two installs in progress at the same time");
return false;
}
@@ -299,7 +300,6 @@ bool GameManager::InstallGame(Path url, Path fileName, bool deleteAfter) {
}
auto sy = GetI18NCategory(I18NCat::SYSTEM);
installInProgress_ = true;
Path pspGame = GetSysDirectory(DIRECTORY_GAME);
Path dest = pspGame;
@@ -711,13 +711,25 @@ bool GameManager::InstallZippedISO(struct zip *z, int isoFileIndex, const Path &
}
bool GameManager::InstallGameOnThread(const Path &url, const Path &fileName, bool deleteAfter) {
if (installInProgress_ || installDonePending_) {
if (InstallInProgress() || installDonePending_) {
return false;
}
installThread_ = std::thread(std::bind(&GameManager::InstallGame, this, url, fileName, deleteAfter));
return true;
}
bool GameManager::UninstallGameOnThread(const std::string &name) {
if (name.empty()) {
ERROR_LOG(HLE, "Cannot uninstall an empty-named game");
return false;
}
if (InstallInProgress() || installDonePending_ || curDownload_.get() != nullptr) {
return false;
}
installThread_ = std::thread(std::bind(&GameManager::UninstallGame, this, name));
return true;
}
bool GameManager::InstallRawISO(const Path &file, const std::string &originalName, bool deleteAfter) {
Path destPath = Path(g_Config.currentDirectory) / originalName;
// TODO: To save disk space, we should probably attempt a move first.
@@ -733,12 +745,11 @@ bool GameManager::InstallRawISO(const Path &file, const std::string &originalNam
}
void GameManager::ResetInstallError() {
if (!installInProgress_) {
if (!InstallInProgress()) {
installError_.clear();
}
}
void GameManager::InstallDone() {
installDonePending_ = true;
installInProgress_ = false;
}