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

Remove "message" from scripts

Browse Source 
It's already almost completely unused, only used for 3dsx shortcuts, and basically always used for exactly this so better to just put it in UU since then it can be translated
This commit is contained in:
Pk11
2022-03-18 07:30:09 -05:00
committed by Dark98
parent 65d8ae7043
commit 1ed2403a11
4 changed files with 35 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/utils/scriptUtils.hpp
+3 -3
View File
@@ -45,11 +45,11 @@ enum ScriptState {
namespace ScriptUtils { namespace ScriptUtils {
bool matchPattern(const std::string &pattern, const std::string &tested); bool matchPattern(const std::string &pattern, const std::string &tested);
Result removeFile(const std::string &file, const std::string &message, bool isARG = false); Result removeFile(const std::string &file, bool isARG = false);
void bootTitle(const std::string &TitleID, bool isNAND, const std::string &message, bool isARG = false); void bootTitle(const std::string &TitleID, bool isNAND, bool isARG = false);
Result prompt(const std::string &message); Result prompt(const std::string &message);
Result copyFile(const std::string &source, const std::string &destination, const std::string &message, bool isARG = false); Result copyFile(const std::string &source, const std::string &destination, const std::string &message, bool isARG = false);
Result renameFile(const std::string &oldName, const std::string &newName, const std::string &message, bool isARG = false); Result renameFile(const std::string &oldName, const std::string &newName, 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 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);
romfs/lang/en/app.json
+4 -1
View File
@@ -41,7 +41,6 @@
"CUSTOM_FONT_DESC": "If enabled, 'sdmc:/3ds/DarkStore/font.bcfnt' will be used instead of the system font, if found.", "CUSTOM_FONT_DESC": "If enabled, 'sdmc:/3ds/DarkStore/font.bcfnt' will be used instead of the system font, if found.",
"DELETE_ERROR": "Delete Error!", "DELETE_ERROR": "Delete Error!",
"DELETE_PROMPT": "Are you sure you want to delete this Directory?", "DELETE_PROMPT": "Are you sure you want to delete this Directory?",
"DELETE_UNNEEDED_FILE": "Deleting unneeded file...",
"DELETING": "Deleting...", "DELETING": "Deleting...",
"DESCENDING": "Descending", "DESCENDING": "Descending",
"DIRECTION": "Direction", "DIRECTION": "Direction",
@@ -125,6 +124,10 @@
"SETTINGS": "Settings", "SETTINGS": "Settings",
"SHEET_SLASH": "Seems like a '/' is included, which is not supported.\nPlease change 'sheet' to filename only.", "SHEET_SLASH": "Seems like a '/' is included, which is not supported.\nPlease change 'sheet' to filename only.",
"SHORTCUT_CREATED": "Shortcut created!", "SHORTCUT_CREATED": "Shortcut created!",
"SHORTCUT_COPYING": "Copying %s...",
"SHORTCUT_DOWNLOADING": "Downloading %s...",
"SHORTCUT_EXTRACTING": "Extracting %s...",
"SHORTCUT_INSTALLING": "Installing %s...",
"SIZE": "Size", "SIZE": "Size",
"SORT_BY": "Sort By", "SORT_BY": "Sort By",
"SORTING": "Sorting", "SORTING": "Sorting",
source/utils/download.cpp
+2 -2
View File
@@ -914,8 +914,8 @@ void UpdateAction() {
return; return;
} }
ScriptUtils::installFile("sdmc:/DarkStore.cia", false, Lang::get("INSTALL_DARKSTORE"), true); ScriptUtils::installFile("sdmc:/DarkStore.cia", false, Lang::get("INSTALL_UNIVERSAL_UPDATER"), true);
ScriptUtils::removeFile("sdmc:/DarkStore.cia", Lang::get("DELETE_UNNEEDED_FILE"), true); ScriptUtils::removeFile("sdmc:/DarkStore.cia", true);
Msg::waitMsg(Lang::get("UPDATE_DONE")); Msg::waitMsg(Lang::get("UPDATE_DONE"));
exiting = true; exiting = true;
} }
source/utils/scriptUtils.cpp
+25 -42
View File
@@ -48,7 +48,7 @@ bool ScriptUtils::matchPattern(const std::string &pattern, const std::string &te
} }
/* Remove a File. */ /* Remove a File. */
Result ScriptUtils::removeFile(const std::string &file, const std::string &message, bool isARG) { Result ScriptUtils::removeFile(const std::string &file, bool isARG) {
std::string out; std::string out;
out = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); out = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath());
out = std::regex_replace(out, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); out = std::regex_replace(out, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2"));
@@ -59,13 +59,12 @@ Result ScriptUtils::removeFile(const std::string &file, const std::string &messa
Result ret = NONE; Result ret = NONE;
if (access(out.c_str(), F_OK) != 0) return DELETE_ERROR; if (access(out.c_str(), F_OK) != 0) return DELETE_ERROR;
if (isARG) Msg::DisplayMsg(message);
deleteFile(out.c_str()); deleteFile(out.c_str());
return ret; return ret;
} }
/* Boot a title. */ /* Boot a title. */
void ScriptUtils::bootTitle(const std::string &TitleID, bool isNAND, const std::string &message, bool isARG) { void ScriptUtils::bootTitle(const std::string &TitleID, bool isNAND, bool isARG) {
std::string MSG = Lang::get("BOOT_TITLE") + "\n\n"; std::string MSG = Lang::get("BOOT_TITLE") + "\n\n";
if (isNAND) MSG += Lang::get("MEDIATYPE_NAND") + "\n" + TitleID; if (isNAND) MSG += Lang::get("MEDIATYPE_NAND") + "\n" + TitleID;
else MSG += Lang::get("MEDIATYPE_SD") + "\n" + TitleID; else MSG += Lang::get("MEDIATYPE_SD") + "\n" + TitleID;
@@ -73,7 +72,6 @@ void ScriptUtils::bootTitle(const std::string &TitleID, bool isNAND, const std::
const u64 ID = std::stoull(TitleID, 0, 16); const u64 ID = std::stoull(TitleID, 0, 16);
if (isARG) { if (isARG) {
if (Msg::promptMsg(MSG)) { if (Msg::promptMsg(MSG)) {
Msg::DisplayMsg(message);
Title::Launch(ID, isNAND ? MEDIATYPE_NAND : MEDIATYPE_SD); Title::Launch(ID, isNAND ? MEDIATYPE_NAND : MEDIATYPE_SD);
} }
@@ -135,7 +133,7 @@ Result ScriptUtils::copyFile(const std::string &source, const std::string &desti
} }
/* Rename / Move a file. */ /* Rename / Move a file. */
Result ScriptUtils::renameFile(const std::string &oldName, const std::string &newName, const std::string &message, bool isARG) { Result ScriptUtils::renameFile(const std::string &oldName, const std::string &newName, bool isARG) {
Result ret = NONE; Result ret = NONE;
if (access(oldName.c_str(), F_OK) != 0) return MOVE_ERROR; if (access(oldName.c_str(), F_OK) != 0) return MOVE_ERROR;
@@ -152,8 +150,6 @@ Result ScriptUtils::renameFile(const std::string &oldName, const std::string &ne
_new = std::regex_replace(_new, std::regex("%NDS%"), config->ndsPath()); _new = std::regex_replace(_new, std::regex("%NDS%"), config->ndsPath());
_new = std::regex_replace(_new, std::regex("%FIRM%"), config->firmPath()); _new = std::regex_replace(_new, std::regex("%FIRM%"), config->firmPath());
if (isARG) Msg::DisplayMsg(message);
/* TODO: Kinda avoid that? */ /* TODO: Kinda avoid that? */
makeDirs(_new.c_str()); makeDirs(_new.c_str());
rename(old.c_str(), _new.c_str()); rename(old.c_str(), _new.c_str());
@@ -361,7 +357,7 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
if (type == "deleteFile") { if (type == "deleteFile") {
bool missing = false; bool missing = false;
std::string file = "", message = ""; std::string file = "";
if (Script[i].contains("file") && Script[i]["file"].is_string()) { if (Script[i].contains("file") && Script[i]["file"].is_string()) {
@@ -369,16 +365,12 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
} }
else missing = true; else missing = true;
if (Script[i].contains("message") && Script[i]["message"].is_string()) { if (!missing) ret = ScriptUtils::removeFile(file, true);
message = Script[i]["message"];
}
if (!missing) ret = ScriptUtils::removeFile(file, message, true);
else ret = SYNTAX_ERROR; else ret = SYNTAX_ERROR;
} else if (type == "downloadFile") { } else if (type == "downloadFile") {
bool missing = false; bool missing = false;
std::string file = "", output = "", message = ""; std::string file = "", output = "";
if (Script[i].contains("file") && Script[i]["file"].is_string()) { if (Script[i].contains("file") && Script[i]["file"].is_string()) {
file = Script[i]["file"]; file = Script[i]["file"];
@@ -390,16 +382,15 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
} }
else missing = true; else missing = true;
if (Script[i].contains("message") && Script[i]["message"].is_string()) { char message[256];
message = Script[i]["message"]; snprintf(message, sizeof(message), Lang::get("SHORTCUT_DOWNLOADING").c_str(), output.substr(output.find_first_of("/") + 1).c_str());
}
if (!missing) ret = ScriptUtils::downloadFile(file, output, message, true); if (!missing) ret = ScriptUtils::downloadFile(file, output, message, true);
else ret = SYNTAX_ERROR; else ret = SYNTAX_ERROR;
} else if (type == "downloadRelease") { } else if (type == "downloadRelease") {
bool missing = false, includePrereleases = false; bool missing = false, includePrereleases = false;
std::string repo = "", file = "", output = "", message = ""; std::string repo = "", file = "", output = "";
if (Script[i].contains("repo") && Script[i]["repo"].is_string()) { if (Script[i].contains("repo") && Script[i]["repo"].is_string()) {
repo = Script[i]["repo"]; repo = Script[i]["repo"];
@@ -419,16 +410,15 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
if (Script[i].contains("includePrereleases") && Script[i]["includePrereleases"].is_boolean()) if (Script[i].contains("includePrereleases") && Script[i]["includePrereleases"].is_boolean())
includePrereleases = Script[i]["includePrereleases"]; includePrereleases = Script[i]["includePrereleases"];
if (Script[i].contains("message") && Script[i]["message"].is_string()) { char message[256];
message = Script[i]["message"]; snprintf(message, sizeof(message), Lang::get("SHORTCUT_DOWNLOADING").c_str(), output.substr(output.find_first_of("/") + 1).c_str());
}
if (!missing) ret = ScriptUtils::downloadRelease(repo, file, output, includePrereleases, message, true); if (!missing) ret = ScriptUtils::downloadRelease(repo, file, output, includePrereleases, message, true);
else ret = SYNTAX_ERROR; else ret = SYNTAX_ERROR;
} else if (type == "extractFile") { } else if (type == "extractFile") {
bool missing = false; bool missing = false;
std::string file = "", input = "", output = "", message = ""; std::string file = "", input = "", output = "";
if (Script[i].contains("file") && Script[i]["file"].is_string()) { if (Script[i].contains("file") && Script[i]["file"].is_string()) {
file = Script[i]["file"]; file = Script[i]["file"];
@@ -445,16 +435,15 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
} }
else missing = true; else missing = true;
if (Script[i].contains("message") && Script[i]["message"].is_string()) { char message[256];
message = Script[i]["message"]; snprintf(message, sizeof(message), Lang::get("SHORTCUT_EXTRACTING").c_str(), file.substr(file.find_first_of("/") + 1).c_str());
}
if (!missing) ret = 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") {
bool missing = false, updateSelf = false; bool missing = false, updateSelf = false;
std::string file = "", message = ""; std::string file = "";
if (Script[i].contains("file") && Script[i]["file"].is_string()) { if (Script[i].contains("file") && Script[i]["file"].is_string()) {
file = Script[i]["file"]; file = Script[i]["file"];
@@ -465,16 +454,15 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
updateSelf = Script[i]["updateSelf"]; updateSelf = Script[i]["updateSelf"];
} }
if (Script[i].contains("message") && Script[i]["message"].is_string()) { char message[256];
message = Script[i]["message"]; snprintf(message, sizeof(message), Lang::get("SHORTCUT_INSTALLING").c_str(), file.substr(file.find_first_of("/") + 1).c_str());
}
if (!missing) ScriptUtils::installFile(file, updateSelf, message, true); if (!missing) ScriptUtils::installFile(file, updateSelf, message, true);
else ret = SYNTAX_ERROR; else ret = SYNTAX_ERROR;
} else if (type == "mkdir") { } else if (type == "mkdir") {
bool missing = false; bool missing = false;
std::string directory = "", message = ""; std::string directory = "";
if (Script[i].contains("directory") && Script[i]["directory"].is_string()) { if (Script[i].contains("directory") && Script[i]["directory"].is_string()) {
directory = Script[i]["directory"]; directory = Script[i]["directory"];
@@ -486,7 +474,7 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
} else if (type == "rmdir") { } else if (type == "rmdir") {
bool missing = false; bool missing = false;
std::string directory = "", message = "", promptmsg = ""; std::string directory = "", promptmsg = "";
if (Script[i].contains("directory") && Script[i]["directory"].is_string()) { if (Script[i].contains("directory") && Script[i]["directory"].is_string()) {
directory = Script[i]["directory"]; directory = Script[i]["directory"];
@@ -526,7 +514,7 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
break; break;
} else if (type == "copy") { } else if (type == "copy") {
std::string Message = "", source = "", destination = ""; std::string source = "", destination = "";
bool missing = false; bool missing = false;
if (Script[i].contains("source") && Script[i]["source"].is_string()) { if (Script[i].contains("source") && Script[i]["source"].is_string()) {
@@ -539,15 +527,14 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
} }
else missing = true; else missing = true;
if (Script[i].contains("message") && Script[i]["message"].is_string()) { char message[256];
Message = Script[i]["message"]; snprintf(message, sizeof(message), Lang::get("SHORTCUT_COPYING").c_str(), source.substr(source.find_first_of("/") + 1).c_str());
}
if (!missing) ret = ScriptUtils::copyFile(source, destination, Message, true); if (!missing) ret = ScriptUtils::copyFile(source, destination, message, true);
else ret = SYNTAX_ERROR; else ret = SYNTAX_ERROR;
} else if (type == "move") { } else if (type == "move") {
std::string Message = "", oldFile = "", newFile = ""; std::string oldFile = "", newFile = "";
bool missing = false; bool missing = false;
if (Script[i].contains("old") && Script[i]["old"].is_string()) { if (Script[i].contains("old") && Script[i]["old"].is_string()) {
@@ -560,11 +547,7 @@ Result ScriptUtils::runFunctions(nlohmann::json storeJson, int selection, const
} }
else missing = true; else missing = true;
if (Script[i].contains("message") && Script[i]["message"].is_string()) { if (!missing) ret = ScriptUtils::renameFile(oldFile, newFile, true);
Message = Script[i]["message"];
}
if (!missing) ret = ScriptUtils::renameFile(oldFile, newFile, Message, true);
else ret = SYNTAX_ERROR; else ret = SYNTAX_ERROR;
} else if (type == "skip") { } else if (type == "skip") {