DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-07 16:59:08 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Say "failed", not "succeeded" if extract fails

Browse Source
This commit is contained in:
Pk11
2021-03-13 16:16:33 -06:00
parent b04cc24b1d
commit 33c4688991
4 changed files with 235 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/utils/scriptUtils.hpp
+3 -2
View File
@@ -38,7 +38,8 @@ enum ScriptState {
SYNTAX_ERROR, SYNTAX_ERROR,
COPY_ERROR, COPY_ERROR,
MOVE_ERROR, MOVE_ERROR,
DELETE_ERROR DELETE_ERROR,
EXTRACT_ERROR
}; };
namespace ScriptUtils { namespace ScriptUtils {
@@ -52,7 +53,7 @@ namespace ScriptUtils {
Result downloadRelease(const std::string &repo, const std::string &file, const std::string &output, bool includePrereleases, const std::string &message, bool isARG = false); Result downloadRelease(const std::string &repo, const std::string &file, const std::string &output, bool includePrereleases, const std::string &message, bool isARG = false);
Result downloadFile(const std::string &file, const std::string &output, const std::string &message, bool isARG = false); Result downloadFile(const std::string &file, const std::string &output, const std::string &message, bool isARG = false);
void installFile(const std::string &file, bool updatingSelf, const std::string &message, bool isARG = false); void installFile(const std::string &file, bool updatingSelf, const std::string &message, bool isARG = false);
void extractFile(const std::string &file, const std::string &input, const std::string &output, const std::string &message, bool isARG = false); Result extractFile(const std::string &file, const std::string &input, const std::string &output, const std::string &message, bool isARG = false);
Result runFunctions(nlohmann::json storeJson, int selection, const std::string &entry); Result runFunctions(nlohmann::json storeJson, int selection, const std::string &entry);
}; };
romfs/lang/en/app.json
+1
View File
@@ -65,6 +65,7 @@
"EXECUTE_ENTRY": "Would you like to execute this entry?", "EXECUTE_ENTRY": "Would you like to execute this entry?",
"EXIT_APP": "Exit Universal-Updater", "EXIT_APP": "Exit Universal-Updater",
"EXTRACTING": "Extracting... %s / %s (%.2f%%)", "EXTRACTING": "Extracting... %s / %s (%.2f%%)",
"EXTRACT_ERROR": "Extract error!",
"FEATURE_SIDE_EFFECTS": "This Feature may have side effects while the Queue is running.\nAre you sure you want to continue?", "FEATURE_SIDE_EFFECTS": "This Feature may have side effects while the Queue is running.\nAre you sure you want to continue?",
"FETCHING_METADATA": "Fetching old metadata...", "FETCHING_METADATA": "Fetching old metadata...",
"FETCHING_RECOMMENDED_UNISTORES": "Fetching recommended UniStores...", "FETCHING_RECOMMENDED_UNISTORES": "Fetching recommended UniStores...",
source/utils/queueSystem.cpp
+2 -9
View File
@@ -108,10 +108,9 @@ void QueueSystem::QueueHandle() {
queueEntries[0]->total = queueEntries[0]->obj.size(); queueEntries[0]->total = queueEntries[0]->obj.size();
queueEntries[0]->current = QueueSystem::LastElement; queueEntries[0]->current = QueueSystem::LastElement;
for(int i = QueueSystem::LastElement; (ret != PROMPT_RET) && i < queueEntries[0]->total; i++) { for(int i = QueueSystem::LastElement; ret == NONE && i < queueEntries[0]->total && !QueueSystem::CancelCallback; i++) {
queueEntries[0]->current++; queueEntries[0]->current++;
if (ret == NONE && !QueueSystem::CancelCallback) {
std::string type = ""; std::string type = "";
if (queueEntries[0]->obj[i].contains("type") && queueEntries[0]->obj[i]["type"].is_string()) { if (queueEntries[0]->obj[i].contains("type") && queueEntries[0]->obj[i]["type"].is_string()) {
@@ -195,7 +194,7 @@ void QueueSystem::QueueHandle() {
output = queueEntries[0]->obj[i]["output"]; output = queueEntries[0]->obj[i]["output"];
} else missing = true; } else missing = true;
if (!missing) ScriptUtils::extractFile(file, input, output, "", false); if (!missing) ret = ScriptUtils::extractFile(file, input, output, "", false);
else ret = SYNTAX_ERROR; else ret = SYNTAX_ERROR;
/* Installing CIAs. */ /* Installing CIAs. */
@@ -338,12 +337,6 @@ void QueueSystem::QueueHandle() {
if (skipCount > 0) i += skipCount; // Skip. if (skipCount > 0) i += skipCount; // Skip.
} }
} else {
queueEntries[0]->current = queueEntries[0]->total; // Set to total.
ret = SCRIPT_CANCELED;
break;
}
} }
/* If we expect a prompt, we go to this. */ /* If we expect a prompt, we go to this. */
source/utils/scriptUtils.cpp
+9 -3
View File
@@ -276,8 +276,9 @@ void ScriptUtils::installFile(const std::string &file, bool updatingSelf, const
} }
/* Extract files. */ /* Extract files. */
void ScriptUtils::extractFile(const std::string &file, const std::string &input, const std::string &output, const std::string &message, bool isARG) { Result ScriptUtils::extractFile(const std::string &file, const std::string &input, const std::string &output, const std::string &message, bool isARG) {
extractFilesCount = 0; extractFilesCount = 0;
Result ret = NONE;
std::string out, in; std::string out, in;
in = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); in = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
@@ -305,13 +306,17 @@ void ScriptUtils::extractFile(const std::string &file, const std::string &input,
filesExtracted = 0; filesExtracted = 0;
getExtractedSize(in, input); getExtractedSize(in, input);
extractArchive(in, input, out); if(extractArchive(in, input, out) != EXTRACT_ERROR_NONE) {
ret = EXTRACT_ERROR;
}
if (isARG) { if (isARG) {
showProgressBar = false; showProgressBar = false;
threadJoin(thread, U64_MAX); threadJoin(thread, U64_MAX);
threadFree(thread); threadFree(thread);
} }
return ret;
} }
/* /*
@@ -442,7 +447,7 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
message = Script[i]["message"]; message = Script[i]["message"];
} }
if (!missing) ScriptUtils::extractFile(file, input, output, message, true); if (!missing) ret = ScriptUtils::extractFile(file, input, output, message, true);
else ret = SYNTAX_ERROR; else ret = SYNTAX_ERROR;
} else if (type == "installCia") { } else if (type == "installCia") {
@@ -580,5 +585,6 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
else if (ret == COPY_ERROR) Msg::waitMsg(Lang::get("COPY_ERROR")); else if (ret == COPY_ERROR) Msg::waitMsg(Lang::get("COPY_ERROR"));
else if (ret == MOVE_ERROR) Msg::waitMsg(Lang::get("MOVE_ERROR")); else if (ret == MOVE_ERROR) Msg::waitMsg(Lang::get("MOVE_ERROR"));
else if (ret == DELETE_ERROR) Msg::waitMsg(Lang::get("DELETE_ERROR")); else if (ret == DELETE_ERROR) Msg::waitMsg(Lang::get("DELETE_ERROR"));
else if (ret == EXTRACT_ERROR) Msg::waitMsg(Lang::get("EXTRACT_ERROR"));
return ret; return ret;
} }