Say "failed", not "succeeded" if extract fails
This commit is contained in:
Pk11
parent
b04cc24b1d
commit
33c4688991
4 changed files with 191 additions and 190 deletions
|
|
@ -108,241 +108,234 @@ void QueueSystem::QueueHandle() {
|
|||
queueEntries[0]->total = queueEntries[0]->obj.size();
|
||||
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++;
|
||||
|
||||
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()) {
|
||||
type = queueEntries[0]->obj[i]["type"];
|
||||
|
||||
} else {
|
||||
ret = SYNTAX_ERROR;
|
||||
}
|
||||
|
||||
/* Deleting a file. */
|
||||
if (type == "deleteFile") {
|
||||
bool missing = false;
|
||||
std::string file = "";
|
||||
queueEntries[0]->status = QueueStatus::Deleting;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) {
|
||||
file = queueEntries[0]->obj[i]["file"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) ret = ScriptUtils::removeFile(file, "");
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Downloading from a URL. */
|
||||
} else if (type == "downloadFile") {
|
||||
bool missing = false;
|
||||
std::string file = "", output = "";
|
||||
|
||||
queueEntries[0]->status = QueueStatus::Downloading;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) {
|
||||
file = queueEntries[0]->obj[i]["file"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("output") && queueEntries[0]->obj[i]["output"].is_string()) {
|
||||
output = queueEntries[0]->obj[i]["output"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) ret = ScriptUtils::downloadFile(file, output, "", false);
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Download from a GitHub Release. */
|
||||
} else if (type == "downloadRelease") {
|
||||
bool missing = false, includePrereleases = false;
|
||||
std::string repo = "", file = "", output = "";
|
||||
|
||||
queueEntries[0]->status = QueueStatus::Downloading;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("repo") && queueEntries[0]->obj[i]["repo"].is_string()) {
|
||||
repo = queueEntries[0]->obj[i]["repo"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) {
|
||||
file = queueEntries[0]->obj[i]["file"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("output") && queueEntries[0]->obj[i]["output"].is_string()) {
|
||||
output = queueEntries[0]->obj[i]["output"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("includePrereleases") && queueEntries[0]->obj[i]["includePrereleases"].is_boolean())
|
||||
includePrereleases = queueEntries[0]->obj[i]["includePrereleases"];
|
||||
|
||||
if (!missing) ret = ScriptUtils::downloadRelease(repo, file, output, includePrereleases, "", false);
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Extracting files. */
|
||||
} else if (type == "extractFile") {
|
||||
bool missing = false;
|
||||
std::string file = "", input = "", output = "";
|
||||
queueEntries[0]->status = QueueStatus::Extracting;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) {
|
||||
file = queueEntries[0]->obj[i]["file"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("input") && queueEntries[0]->obj[i]["input"].is_string()) {
|
||||
input = queueEntries[0]->obj[i]["input"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("output") && queueEntries[0]->obj[i]["output"].is_string()) {
|
||||
output = queueEntries[0]->obj[i]["output"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) ScriptUtils::extractFile(file, input, output, "", false);
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Installing CIAs. */
|
||||
} else if (type == "installCia") {
|
||||
bool missing = false, updateSelf = false;
|
||||
std::string file = "";
|
||||
queueEntries[0]->status = QueueStatus::Installing;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) {
|
||||
file = queueEntries[0]->obj[i]["file"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("updateSelf") && queueEntries[0]->obj[i]["updateSelf"].is_boolean()) {
|
||||
updateSelf = queueEntries[0]->obj[i]["updateSelf"];
|
||||
}
|
||||
|
||||
if (!missing) ScriptUtils::installFile(file, updateSelf, "");
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
} else if (type == "mkdir") {
|
||||
bool missing = false;
|
||||
std::string directory = "";
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("directory") && queueEntries[0]->obj[i]["directory"].is_string()) {
|
||||
directory = queueEntries[0]->obj[i]["directory"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) makeDirs(directory.c_str());
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Request Type 1. */
|
||||
} else if (type == "rmdir") {
|
||||
bool missing = false;
|
||||
std::string directory = "", message = "", promptmsg = "";
|
||||
queueEntries[0]->status = QueueStatus::Request;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("directory") && queueEntries[0]->obj[i]["directory"].is_string()) {
|
||||
directory = queueEntries[0]->obj[i]["directory"];
|
||||
} else missing = true;
|
||||
|
||||
promptmsg = Lang::get("DELETE_PROMPT") + "\n" + directory;
|
||||
|
||||
if (!missing && directory != "") {
|
||||
if (access(directory.c_str(), F_OK) != 0) ret = DELETE_ERROR;
|
||||
else {
|
||||
if (QueueSystem::RequestNeeded == RMDIR_REQUEST) {
|
||||
/* There we already did it. :) */
|
||||
queueEntries[0]->status = QueueStatus::Deleting;
|
||||
if (QueueSystem::RequestAnswer == 1) removeDirRecursive(directory.c_str());
|
||||
/* Reset. */
|
||||
QueueSystem::RequestNeeded = NO_REQUEST;
|
||||
QueueSystem::RequestAnswer = NO_REQUEST;
|
||||
QueueSystem::RequestMsg = "";
|
||||
|
||||
} else {
|
||||
/* We are in the process of the need of an answer. */
|
||||
QueueSystem::RequestNeeded = RMDIR_REQUEST; // Type 1.
|
||||
QueueSystem::RequestMsg = promptmsg;
|
||||
QueueSystem::LastElement = i; // So we know, where we go again after the Request.
|
||||
ret = PROMPT_RET;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Request Type 2. */
|
||||
} else if (type == "promptMessage" || type == "promptMsg") {
|
||||
std::string Message = "";
|
||||
int skipCount = -1;
|
||||
queueEntries[0]->status = QueueStatus::Request;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("message") && queueEntries[0]->obj[i]["message"].is_string()) {
|
||||
Message = queueEntries[0]->obj[i]["message"];
|
||||
}
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("count") && queueEntries[0]->obj[i]["count"].is_number()) {
|
||||
skipCount = queueEntries[0]->obj[i]["count"];
|
||||
}
|
||||
|
||||
if (QueueSystem::RequestNeeded == PROMPT_REQUEST) {
|
||||
if ((skipCount > -1) && (QueueSystem::RequestAnswer == SCRIPT_CANCELED)) {
|
||||
i += skipCount; // Skip.
|
||||
queueEntries[0]->current += skipCount;
|
||||
}
|
||||
|
||||
/* Reset. */
|
||||
QueueSystem::RequestAnswer = NO_REQUEST;
|
||||
QueueSystem::RequestNeeded = NO_REQUEST;
|
||||
QueueSystem::RequestMsg = "";
|
||||
|
||||
} else {
|
||||
QueueSystem::RequestNeeded = PROMPT_REQUEST; // Type 2.
|
||||
QueueSystem::RequestMsg = Message;
|
||||
QueueSystem::LastElement = i; // So we know, where we go again after the Request.
|
||||
ret = PROMPT_RET;
|
||||
}
|
||||
|
||||
} else if (type == "exit") {
|
||||
ret = SCRIPT_CANCELED;
|
||||
|
||||
} else if (type == "copy") {
|
||||
std::string source = "", destination = "";
|
||||
bool missing = false;
|
||||
queueEntries[0]->status = QueueStatus::Copying;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("source") && queueEntries[0]->obj[i]["source"].is_string()) {
|
||||
source = queueEntries[0]->obj[i]["source"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("destination") && queueEntries[0]->obj[i]["destination"].is_string()) {
|
||||
destination = queueEntries[0]->obj[i]["destination"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) ret = ScriptUtils::copyFile(source, destination, "");
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
} else if (type == "move") {
|
||||
std::string oldFile = "", newFile = "";
|
||||
bool missing = false;
|
||||
queueEntries[0]->status = QueueStatus::Moving;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("old") && queueEntries[0]->obj[i]["old"].is_string()) {
|
||||
oldFile = queueEntries[0]->obj[i]["old"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("new") && queueEntries[0]->obj[i]["new"].is_string()) {
|
||||
newFile = queueEntries[0]->obj[i]["new"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) ret = ScriptUtils::renameFile(oldFile, newFile, "");
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
} else if (type == "skip") {
|
||||
int skipCount = -1;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("count") && queueEntries[0]->obj[i]["count"].is_number()) {
|
||||
skipCount = queueEntries[0]->obj[i]["count"];
|
||||
}
|
||||
|
||||
if (skipCount > 0) i += skipCount; // Skip.
|
||||
}
|
||||
if (queueEntries[0]->obj[i].contains("type") && queueEntries[0]->obj[i]["type"].is_string()) {
|
||||
type = queueEntries[0]->obj[i]["type"];
|
||||
|
||||
} else {
|
||||
queueEntries[0]->current = queueEntries[0]->total; // Set to total.
|
||||
ret = SYNTAX_ERROR;
|
||||
}
|
||||
|
||||
/* Deleting a file. */
|
||||
if (type == "deleteFile") {
|
||||
bool missing = false;
|
||||
std::string file = "";
|
||||
queueEntries[0]->status = QueueStatus::Deleting;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) {
|
||||
file = queueEntries[0]->obj[i]["file"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) ret = ScriptUtils::removeFile(file, "");
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Downloading from a URL. */
|
||||
} else if (type == "downloadFile") {
|
||||
bool missing = false;
|
||||
std::string file = "", output = "";
|
||||
|
||||
queueEntries[0]->status = QueueStatus::Downloading;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) {
|
||||
file = queueEntries[0]->obj[i]["file"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("output") && queueEntries[0]->obj[i]["output"].is_string()) {
|
||||
output = queueEntries[0]->obj[i]["output"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) ret = ScriptUtils::downloadFile(file, output, "", false);
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Download from a GitHub Release. */
|
||||
} else if (type == "downloadRelease") {
|
||||
bool missing = false, includePrereleases = false;
|
||||
std::string repo = "", file = "", output = "";
|
||||
|
||||
queueEntries[0]->status = QueueStatus::Downloading;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("repo") && queueEntries[0]->obj[i]["repo"].is_string()) {
|
||||
repo = queueEntries[0]->obj[i]["repo"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) {
|
||||
file = queueEntries[0]->obj[i]["file"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("output") && queueEntries[0]->obj[i]["output"].is_string()) {
|
||||
output = queueEntries[0]->obj[i]["output"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("includePrereleases") && queueEntries[0]->obj[i]["includePrereleases"].is_boolean())
|
||||
includePrereleases = queueEntries[0]->obj[i]["includePrereleases"];
|
||||
|
||||
if (!missing) ret = ScriptUtils::downloadRelease(repo, file, output, includePrereleases, "", false);
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Extracting files. */
|
||||
} else if (type == "extractFile") {
|
||||
bool missing = false;
|
||||
std::string file = "", input = "", output = "";
|
||||
queueEntries[0]->status = QueueStatus::Extracting;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) {
|
||||
file = queueEntries[0]->obj[i]["file"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("input") && queueEntries[0]->obj[i]["input"].is_string()) {
|
||||
input = queueEntries[0]->obj[i]["input"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("output") && queueEntries[0]->obj[i]["output"].is_string()) {
|
||||
output = queueEntries[0]->obj[i]["output"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) ret = ScriptUtils::extractFile(file, input, output, "", false);
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Installing CIAs. */
|
||||
} else if (type == "installCia") {
|
||||
bool missing = false, updateSelf = false;
|
||||
std::string file = "";
|
||||
queueEntries[0]->status = QueueStatus::Installing;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("file") && queueEntries[0]->obj[i]["file"].is_string()) {
|
||||
file = queueEntries[0]->obj[i]["file"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("updateSelf") && queueEntries[0]->obj[i]["updateSelf"].is_boolean()) {
|
||||
updateSelf = queueEntries[0]->obj[i]["updateSelf"];
|
||||
}
|
||||
|
||||
if (!missing) ScriptUtils::installFile(file, updateSelf, "");
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
} else if (type == "mkdir") {
|
||||
bool missing = false;
|
||||
std::string directory = "";
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("directory") && queueEntries[0]->obj[i]["directory"].is_string()) {
|
||||
directory = queueEntries[0]->obj[i]["directory"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) makeDirs(directory.c_str());
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Request Type 1. */
|
||||
} else if (type == "rmdir") {
|
||||
bool missing = false;
|
||||
std::string directory = "", message = "", promptmsg = "";
|
||||
queueEntries[0]->status = QueueStatus::Request;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("directory") && queueEntries[0]->obj[i]["directory"].is_string()) {
|
||||
directory = queueEntries[0]->obj[i]["directory"];
|
||||
} else missing = true;
|
||||
|
||||
promptmsg = Lang::get("DELETE_PROMPT") + "\n" + directory;
|
||||
|
||||
if (!missing && directory != "") {
|
||||
if (access(directory.c_str(), F_OK) != 0) ret = DELETE_ERROR;
|
||||
else {
|
||||
if (QueueSystem::RequestNeeded == RMDIR_REQUEST) {
|
||||
/* There we already did it. :) */
|
||||
queueEntries[0]->status = QueueStatus::Deleting;
|
||||
if (QueueSystem::RequestAnswer == 1) removeDirRecursive(directory.c_str());
|
||||
/* Reset. */
|
||||
QueueSystem::RequestNeeded = NO_REQUEST;
|
||||
QueueSystem::RequestAnswer = NO_REQUEST;
|
||||
QueueSystem::RequestMsg = "";
|
||||
|
||||
} else {
|
||||
/* We are in the process of the need of an answer. */
|
||||
QueueSystem::RequestNeeded = RMDIR_REQUEST; // Type 1.
|
||||
QueueSystem::RequestMsg = promptmsg;
|
||||
QueueSystem::LastElement = i; // So we know, where we go again after the Request.
|
||||
ret = PROMPT_RET;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
/* Request Type 2. */
|
||||
} else if (type == "promptMessage" || type == "promptMsg") {
|
||||
std::string Message = "";
|
||||
int skipCount = -1;
|
||||
queueEntries[0]->status = QueueStatus::Request;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("message") && queueEntries[0]->obj[i]["message"].is_string()) {
|
||||
Message = queueEntries[0]->obj[i]["message"];
|
||||
}
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("count") && queueEntries[0]->obj[i]["count"].is_number()) {
|
||||
skipCount = queueEntries[0]->obj[i]["count"];
|
||||
}
|
||||
|
||||
if (QueueSystem::RequestNeeded == PROMPT_REQUEST) {
|
||||
if ((skipCount > -1) && (QueueSystem::RequestAnswer == SCRIPT_CANCELED)) {
|
||||
i += skipCount; // Skip.
|
||||
queueEntries[0]->current += skipCount;
|
||||
}
|
||||
|
||||
/* Reset. */
|
||||
QueueSystem::RequestAnswer = NO_REQUEST;
|
||||
QueueSystem::RequestNeeded = NO_REQUEST;
|
||||
QueueSystem::RequestMsg = "";
|
||||
|
||||
} else {
|
||||
QueueSystem::RequestNeeded = PROMPT_REQUEST; // Type 2.
|
||||
QueueSystem::RequestMsg = Message;
|
||||
QueueSystem::LastElement = i; // So we know, where we go again after the Request.
|
||||
ret = PROMPT_RET;
|
||||
}
|
||||
|
||||
} else if (type == "exit") {
|
||||
ret = SCRIPT_CANCELED;
|
||||
break;
|
||||
|
||||
} else if (type == "copy") {
|
||||
std::string source = "", destination = "";
|
||||
bool missing = false;
|
||||
queueEntries[0]->status = QueueStatus::Copying;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("source") && queueEntries[0]->obj[i]["source"].is_string()) {
|
||||
source = queueEntries[0]->obj[i]["source"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("destination") && queueEntries[0]->obj[i]["destination"].is_string()) {
|
||||
destination = queueEntries[0]->obj[i]["destination"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) ret = ScriptUtils::copyFile(source, destination, "");
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
} else if (type == "move") {
|
||||
std::string oldFile = "", newFile = "";
|
||||
bool missing = false;
|
||||
queueEntries[0]->status = QueueStatus::Moving;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("old") && queueEntries[0]->obj[i]["old"].is_string()) {
|
||||
oldFile = queueEntries[0]->obj[i]["old"];
|
||||
} else missing = true;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("new") && queueEntries[0]->obj[i]["new"].is_string()) {
|
||||
newFile = queueEntries[0]->obj[i]["new"];
|
||||
} else missing = true;
|
||||
|
||||
if (!missing) ret = ScriptUtils::renameFile(oldFile, newFile, "");
|
||||
else ret = SYNTAX_ERROR;
|
||||
|
||||
} else if (type == "skip") {
|
||||
int skipCount = -1;
|
||||
|
||||
if (queueEntries[0]->obj[i].contains("count") && queueEntries[0]->obj[i]["count"].is_number()) {
|
||||
skipCount = queueEntries[0]->obj[i]["count"];
|
||||
}
|
||||
|
||||
if (skipCount > 0) i += skipCount; // Skip.
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue