The-Homebrew-Cloud/WiiUPluginLoaderBackend
2
0
Fork 0
mirror of https://github.com/wiiu-env/WiiUPluginLoaderBackend.git synced 2024-11-22 12:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

StorageAPI: WUPS_STORAGE_ERROR_NOT_FOUND on StorageOpen is not an error anymoe

Browse Source
This commit is contained in:
Maschell 2024-02-23 11:06:53 +01:00
parent acc372c836
commit 8cc78de58c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/utils/storage/StorageUtils.cpp
View File

@ -176,7 +176,7 @@ namespace StorageUtils {
std::string filePath = getPluginPath() + "/config/" + plugin_id.data() + ".json"; std::string filePath = getPluginPath() + "/config/" + plugin_id.data() + ".json";
CFile file(filePath, CFile::ReadOnly); CFile file(filePath, CFile::ReadOnly);
if (!file.isOpen() || file.size() == 0) { if (!file.isOpen() || file.size() == 0) {
return WUPS_STORAGE_ERROR_IO_ERROR; return WUPS_STORAGE_ERROR_NOT_FOUND;
} }
auto *json_data = (uint8_t *) memalign(0x40, ROUNDUP(file.size() + 1, 0x40)); auto *json_data = (uint8_t *) memalign(0x40, ROUNDUP(file.size() + 1, 0x40));
if (!json_data) { if (!json_data) {
@ -236,12 +236,13 @@ namespace StorageUtils {
if (!forceSave) { if (!forceSave) {
nlohmann::json jsonFromFile; nlohmann::json jsonFromFile;
if (Helper::LoadFromFile(rootItem->getPluginId(), jsonFromFile) == WUPS_STORAGE_ERROR_SUCCESS) { WUPSStorageError loadErr;
if ((loadErr = Helper::LoadFromFile(rootItem->getPluginId(), jsonFromFile)) == WUPS_STORAGE_ERROR_SUCCESS) {
if (j == jsonFromFile) { if (j == jsonFromFile) {
DEBUG_FUNCTION_LINE_VERBOSE("Storage has no changes, avoid saving \"%s.json\"", rootItem->getPluginId().c_str()); DEBUG_FUNCTION_LINE_VERBOSE("Storage has no changes, avoid saving \"%s.json\"", rootItem->getPluginId().c_str());
return WUPS_STORAGE_ERROR_SUCCESS; return WUPS_STORAGE_ERROR_SUCCESS;
} }
} else { } else if (loadErr != WUPS_STORAGE_ERROR_NOT_FOUND) {
DEBUG_FUNCTION_LINE_WARN("Failed to load \"%s.json\"", rootItem->getPluginId().c_str()); DEBUG_FUNCTION_LINE_WARN("Failed to load \"%s.json\"", rootItem->getPluginId().c_str());
} }
DEBUG_FUNCTION_LINE_VERBOSE("Saving \"%s.json\"...", rootItem->getPluginId().c_str()); DEBUG_FUNCTION_LINE_VERBOSE("Saving \"%s.json\"...", rootItem->getPluginId().c_str());
@ -398,8 +399,12 @@ namespace StorageUtils {
return WUPS_STORAGE_ERROR_MALLOC_FAILED; return WUPS_STORAGE_ERROR_MALLOC_FAILED;
} }
WUPSStorageError err; WUPSStorageError err = Helper::LoadFromFile(plugin_id, *root);
if ((err = Helper::LoadFromFile(plugin_id, *root)) != WUPS_STORAGE_ERROR_SUCCESS) { if(err == WUPS_STORAGE_ERROR_NOT_FOUND) {
// Create new clean StorageItemRoot if no existing storage was found
root = make_unique_nothrow<StorageItemRoot>(plugin_id);
} else if (err != WUPS_STORAGE_ERROR_SUCCESS) {
// Return on any other error
return err; return err;
} }