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

WIP: Script-Creator!

Browse Source
This commit is contained in:
StackZ
2020-06-21 16:41:48 +02:00
parent 984d363533
commit 91615d7891
8 changed files with 131 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/screens/scriptCreator.hpp
+4
View File
@@ -28,6 +28,7 @@
#define SCRIPTCREATOR_HPP
#include "common.hpp"
#include "json.hpp"
#include "structs.hpp"
#include <vector>
@@ -38,6 +39,8 @@ public:
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
private:
std::string entryName = "";
// Screen draws.
void DrawSubMenu(void) const;
void DrawScriptScreen(void) const;
@@ -82,6 +85,7 @@ private:
void createEntry(const std::string &Entryname);
std::string jsonFileName;
nlohmann::json editScript;
// Main Pos.
const std::vector<Structs::ButtonPos> mainButtons = {
{90, 40, 140, 35}, // New Script.
include/screens/scriptlist.hpp
+1 -1
View File
@@ -64,7 +64,7 @@ private:
void SelectFunction(u32 hDown, u32 hHeld, touchPosition touch);
// This is for the Script Creator, so no one can access it for now, until it is stable or so.
bool isTesting = false;
bool isTesting = true;
// Other includes which get destructed automatically.
std::string choice;
source/screens/scriptCreator.cpp
+106 -97
View File
@@ -33,47 +33,50 @@
#include <unistd.h>
extern std::unique_ptr<Config> config;
// The to editing script.
nlohmann::json editScript;
std::string entryName = ""; // So we can set to *that* entry.
void ScriptCreator::openJson(std::string fileName) {
std::string scriptFile = config->scriptPath() + fileName;
std::string scriptFile = fileName;
FILE* file = fopen(scriptFile.c_str(), "r");
if (file) editScript = nlohmann::json::parse(file, nullptr, false);
fseek(file, 0, SEEK_END);
size_t size = ftell(file);
fseek (file, 0, SEEK_SET);
char data[size + 1];
fread(data, 1, size, file);
data[size] = '\0';
fclose(file);
this->editScript = nlohmann::json::parse((char*)data, nullptr, false);
}
// BOOL.
void ScriptCreator::setBool(const std::string &object, const std::string &key, bool v) {
editScript[object][key] = v;
this->editScript[object][key] = v;
}
void ScriptCreator::setBool2(const std::string &object, const std::string &key, const std::string &key2, bool v) {
editScript[object][key][key2] = v;
this->editScript[object][key][key2] = v;
}
// INT.
void ScriptCreator::setInt(const std::string &object, const std::string &key, int v) {
editScript[object][key] = v;
this->editScript[object][key] = v;
}
void ScriptCreator::setInt2(const std::string &object, const std::string &key, const std::string &key2, int v) {
editScript[object][key][key2] = v;
this->editScript[object][key][key2] = v;
}
// STRING
void ScriptCreator::setString(const std::string &object, const std::string &key, const std::string &v) {
editScript[object][key] = v;
this->editScript[object][key] = v;
}
void ScriptCreator::setString2(const std::string &object, const std::string &key, const std::string &key2, const std::string &v) {
editScript[object][key][key2] = v;
this->editScript[object][key][key2] = v;
}
void ScriptCreator::Draw(void) const {
if (mode == 0) {
DrawSubMenu();
} else if (mode == 1) {
DrawScriptScreen();
if (this->mode == 0) {
this->DrawSubMenu();
} else if (this->mode == 1) {
this->DrawScriptScreen();
}
}
@@ -89,7 +92,7 @@ void ScriptCreator::DrawSubMenu(void) const {
GFX::DrawBottom();
for (int i = 0; i < 2; i++) {
if (Selection == i) {
if (this->Selection == i) {
Gui::Draw_Rect(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, config->selectedColor());
} else {
Gui::Draw_Rect(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, config->unselectedColor());
@@ -114,14 +117,14 @@ void ScriptCreator::DrawScriptScreen(void) const {
// Draw Page.
for (int i = 0; i < 2; i++) {
if (i == page) {
Gui::DrawString(260, 3, 0.6f, config->textColor(), std::to_string(i+1) + " / 2", 140);
if (i == this->page) {
Gui::DrawStringCentered(0, 3, 0.6f, config->textColor(), std::to_string(i+1) + " | 2", 140);
}
}
if (page == 0) {
if (this->page == 0) {
for (int i = 0; i < 6; i++) {
if (Selection == i) {
if (this->Selection == i) {
Gui::Draw_Rect(creatorButtons[i].x, creatorButtons[i].y, creatorButtons[i].w, creatorButtons[i].h, config->selectedColor());
} else {
Gui::Draw_Rect(creatorButtons[i].x, creatorButtons[i].y, creatorButtons[i].w, creatorButtons[i].h, config->unselectedColor());
@@ -134,9 +137,9 @@ void ScriptCreator::DrawScriptScreen(void) const {
Gui::DrawString((320-Gui::GetStringWidth(0.6f, "extractFile"))/2+150-70, creatorButtons[3].y+10, 0.6f, config->textColor(), "extractFile", 140);
Gui::DrawString((320-Gui::GetStringWidth(0.6f, "installCia"))/2-150+70, creatorButtons[4].y+10, 0.6f, config->textColor(), "installCia", 140);
Gui::DrawString((320-Gui::GetStringWidth(0.6f, "mkdir"))/2+150-70, creatorButtons[5].y+10, 0.6f, config->textColor(), "mkdir", 140);
} else if (page == 1) {
} else if (this->page == 1) {
for (int i = 0; i < 3; i++) {
if (Selection == i) {
if (this->Selection == i) {
Gui::Draw_Rect(creatorButtons[i].x, creatorButtons[i].y, creatorButtons[i].w, creatorButtons[i].h, config->selectedColor());
} else {
Gui::Draw_Rect(creatorButtons[i].x, creatorButtons[i].y, creatorButtons[i].w, creatorButtons[i].h, config->unselectedColor());
@@ -171,7 +174,7 @@ void ScriptCreator::createDownloadRelease() {
// Message.
std::string message = Input::getString(50, "Enter the Message.");
editScript[entryName] = { {{"type", "downloadRelease"}, {"repo", repo}, {"file", file}, {"output", output}, {"includePrerelease", prerelease}, {"message", message}} };
this->editScript[this->entryName].push_back({{"type", "downloadRelease"}, {"repo", repo}, {"file", file}, {"output", output}, {"includePrerelease", prerelease}, {"message", message}});
Logging::writeToLog("Execute 'ScriptCreator::createDownloadRelease();'.");
}
@@ -185,7 +188,7 @@ void ScriptCreator::createDownloadFile() {
// Message.
std::string message = Input::getString(50, "Enter the Message.");
editScript[entryName] = { {{"type", "downloadFile"}, {"file", file}, {"output", output}, {"message", message}} };
this->editScript[this->entryName].push_back({{"type", "downloadFile"}, {"file", file}, {"output", output}, {"message", message}});
Logging::writeToLog("Execute 'ScriptCreator::createDownloadFile();'.");
}
@@ -196,7 +199,7 @@ void ScriptCreator::createDeleteFile() {
// Message.
std::string message = Input::getString(50, "Enter the Message.");
editScript[entryName] = { {{"type", "deleteFile"}, {"file", file}, {"message", message}} };
this->editScript[this->entryName].push_back({{"type", "deleteFile"}, {"file", file}, {"message", message}});
Logging::writeToLog("Execute 'ScriptCreator::createDeleteFile();'.");
}
@@ -211,7 +214,7 @@ void ScriptCreator::createExtractFile() {
// Message.
std::string message = Input::getString(50, "Enter the Message.");
editScript[entryName] = { {{"type", "extractFile"}, {"file", file}, {"input", input}, {"output", output}, {"message", message}} };
this->editScript[this->entryName].push_back({{"type", "extractFile"}, {"file", file}, {"input", input}, {"output", output}, {"message", message}});
Logging::writeToLog("Execute 'ScriptCreator::createExtractFile();'.");
}
@@ -222,7 +225,7 @@ void ScriptCreator::createInstallCia() {
// Message.
std::string message = Input::getString(50, "Enter the Message.");
editScript[entryName] = { {{"type", "installCia"}, {"file", file}, {"message", message}} };
this->editScript[this->entryName].push_back({{"type", "installCia"}, {"file", file}, {"message", message}});
Logging::writeToLog("Execute 'ScriptCreator::createInstallCia();'.");
}
@@ -231,7 +234,7 @@ void ScriptCreator::createMkDir() {
// Directory path.
std::string directory = Input::getString(50, "Enter the directory path.");
editScript[entryName] = { {{"type", "mkdir"}, {"directory", directory}} };
this->editScript[this->entryName].push_back({{"type", "mkdir"}, {"directory", directory}});
Logging::writeToLog("Execute 'ScriptCreator::createMkDir();'.");
}
@@ -239,7 +242,7 @@ void ScriptCreator::createRmDir() {
// Directory path.
std::string directory = Input::getString(50, "Enter the directory path.");
editScript[entryName] = { {{"type", "rmdir"}, {"directory", directory}} };
this->editScript[this->entryName].push_back({{"type", "rmdir"}, {"directory", directory}});
Logging::writeToLog("Execute 'ScriptCreator::createRmDir();'.");
}
@@ -247,7 +250,7 @@ void ScriptCreator::createMkFile() {
// File path.
std::string file = Input::getString(50, "Enter the path to the new File.");
editScript[entryName] = { {{"type", "mkfile"}, {"file", file}} };
this->editScript[this->entryName].push_back({{"type", "mkfile"}, {"file", file}});
Logging::writeToLog("Execute 'ScriptCreator::createMkFile();'.");
}
@@ -257,14 +260,15 @@ void ScriptCreator::createTimeMsg() {
// Seconds.
int seconds = Input::getUint(999, "Enter the Seconds for the Message to display.");
editScript[entryName] = { {{"type", "timeMsg"}, {"message", message}, {"seconds", seconds}} };
this->editScript[this->entryName].push_back({{"type", "timeMsg"}, {"message", message}, {"seconds", seconds}});
Logging::writeToLog("Execute 'ScriptCreator::createTimeMsg();'.");
}
void ScriptCreator::save() {
FILE* file = fopen(jsonFileName.c_str(), "w");
if(file) fwrite(editScript.dump(1, '\t').c_str(), 1, editScript.dump(1, '\t').size(), file);
FILE* file = fopen(this->jsonFileName.c_str(), "w");
std::string result = this->editScript.dump(1, '\t');
if (file) fwrite(result.c_str(), 1, this->editScript.dump(1, '\t').size(), file);
fclose(file);
Logging::writeToLog("Execute 'ScriptCreator::save();'.");
}
@@ -272,18 +276,18 @@ void ScriptCreator::save() {
// Important to make Scripts valid.
void ScriptCreator::setInfoStuff(void) {
// Get needed things.
const std::string &test = Input::getString(50, "Enter the Title of the script.");
const std::string &test2 = Input::getString(50, "Enter the Author name of the script.");
const std::string &test3 = Input::getString(80, "Enter the short description of the script.");
const std::string &test4 = Input::getString(300, "Enter the long description of the script.");
const std::string test = Input::getString(50, "Enter the Title of the script.");
const std::string test2 = Input::getString(50, "Enter the Author name of the script.");
const std::string test3 = Input::getString(80, "Enter the short description of the script.");
const std::string test4 = Input::getString(300, "Enter the long description of the script.");
int scriptRevision = Input::getUint(99, "Enter the script revision.");
// Set the real JSON stuff.
setString("info", "title", test);
setString("info", "author", test2);
setString("info", "shortDesc", test3);
setString("info", "description", test4);
setInt("info", "version", 2);
setInt("info", "revision", scriptRevision);
this->setString("info", "title", test);
this->setString("info", "author", test2);
this->setString("info", "shortDesc", test3);
this->setString("info", "description", test4);
this->setInt("info", "version", 3);
this->setInt("info", "revision", scriptRevision);
}
@@ -296,26 +300,31 @@ void ScriptCreator::SubMenuLogic(u32 hDown, u32 hHeld, touchPosition touch) {
if (hDown & KEY_A) {
switch(Selection) {
case 0:
jsonFileName = config->scriptPath();
jsonFileName += Input::getString(20, "Enter the name of the JSON file.");
if (jsonFileName != "") {
jsonFileName += ".json";
createNewJson(jsonFileName);
openJson(jsonFileName);
entryName = Input::getString(50, "Enter the EntryName.");
Selection = 0;
mode = 1;
this->jsonFileName = config->scriptPath();
this->jsonFileName += Input::getString(20, "Enter the name of the JSON file.");
if (this->jsonFileName != "") {
this->jsonFileName += ".json";
this->createNewJson(this->jsonFileName);
this->openJson(this->jsonFileName);
// If not included, create.
if (!this->editScript.contains("info")) {
this->setInfoStuff();
}
this->entryName = Input::getString(50, "Enter the EntryName.");
this->Selection = 0;
this->mode = 1;
}
break;
case 1:
std::string tempScript = selectFilePath("Select the Script file.", config->scriptPath(), {"json"}, 2);
if (tempScript != "") {
jsonFileName = tempScript;
if(access(jsonFileName.c_str(), F_OK) != -1 ) {
openJson(jsonFileName);
entryName = Input::getString(50, "Enter the EntryName.");
Selection = 0;
mode = 1;
this->jsonFileName = tempScript;
if (access(this->jsonFileName.c_str(), F_OK) == 0) {
this->openJson(this->jsonFileName);
this->entryName = Input::getString(50, "Enter the EntryName.");
this->Selection = 0;
this->mode = 1;
}
}
break;
@@ -324,118 +333,118 @@ void ScriptCreator::SubMenuLogic(u32 hDown, u32 hHeld, touchPosition touch) {
if (hDown & KEY_UP) {
if(Selection == 1) Selection = 0;
if (this->Selection == 1) this->Selection = 0;
}
if (hDown & KEY_DOWN) {
if (Selection == 0) Selection = 1;
if (this->Selection == 0) this->Selection = 1;
}
}
void ScriptCreator::scriptLogic(u32 hDown, u32 hHeld, touchPosition touch) {
if (hDown & KEY_B) {
save();
Selection = 0;
mode = 0;
this->save();
this->Selection = 0;
this->mode = 0;
}
// Page 1.
if (page == 0) {
if (this->page == 0) {
if (hDown & KEY_UP) {
if (Selection > 1) Selection -= 2;
if (this->Selection > 1) this->Selection -= 2;
}
if (hDown & KEY_DOWN) {
if (Selection < 4) Selection += 2;
if (this->Selection < 4) this->Selection += 2;
}
if (hDown & KEY_LEFT) {
if (Selection%2) Selection--;
if (this->Selection%2) this->Selection--;
}
if (hDown & KEY_RIGHT) {
if (!(Selection%2)) Selection++;
if (!(this->Selection%2)) this->Selection++;
}
} else if (page == 1) {
} else if (this->page == 1) {
if (hDown & KEY_UP) {
if (Selection == 2) Selection = 0;
if (this->Selection == 2) this->Selection = 0;
}
if (hDown & KEY_RIGHT) {
if (Selection == 0) Selection = 1;
if (this->Selection == 0) this->Selection = 1;
}
if (hDown & KEY_LEFT) {
if (Selection == 1) Selection = 0;
if (this->Selection == 1) this->Selection = 0;
}
if (hDown & KEY_DOWN) {
if (Selection == 0) Selection = 2;
if (this->Selection == 0) this->Selection = 2;
}
}
// Page 2.
if (hDown & KEY_R) {
if (page == 0) {
page = 1;
Selection = 0;
if (this->page == 0) {
this->page = 1;
this->Selection = 0;
}
}
if (hDown & KEY_L) {
if (page == 1) {
page = 0;
Selection = 0;
if (this->page == 1) {
this->page = 0;
this->Selection = 0;
}
}
if (hDown & KEY_A) {
if (page == 0) {
switch(Selection) {
if (this->page == 0) {
switch(this->Selection) {
case 0:
createDownloadRelease();
this->createDownloadRelease();
break;
case 1:
createDownloadFile();
this->createDownloadFile();
break;
case 2:
createDeleteFile();
this->createDeleteFile();
break;
case 3:
createExtractFile();
this->createExtractFile();
break;
case 4:
createInstallCia();
this->createInstallCia();
break;
case 5:
createMkDir();
this->createMkDir();
break;
}
} else if (page == 1) {
switch(Selection) {
} else if (this->page == 1) {
switch(this->Selection) {
case 0:
createRmDir();
this->createRmDir();
break;
case 1:
createMkFile();
this->createMkFile();
break;
case 2:
createTimeMsg();
this->createTimeMsg();
break;
}
}
}
if (hDown & KEY_X) {
setInfoStuff();
this->setInfoStuff(); // Probably not needed at all.
}
}
void ScriptCreator::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
if (mode == 0) {
SubMenuLogic(hDown, hHeld, touch);
} else if (mode == 1) {
scriptLogic(hDown, hHeld, touch);
if (this->mode == 0) {
this->SubMenuLogic(hDown, hHeld, touch);
} else if (this->mode == 1) {
this->scriptLogic(hDown, hHeld, touch);
}
}
source/screens/unistore_v2.cpp
+1 -1
View File
@@ -258,7 +258,7 @@ void UniStoreV2::DropDownMenu(void) const {
// DropDown Menu.
if (this->isDropDown) {
// Draw Operation Box.
Gui::Draw_Rect(5, 25, 140, 140, this->darkMode ? this->barColorDark : this->barColorLight);
Gui::Draw_Rect(5, 25, 140, 165, this->darkMode ? this->barColorDark : this->barColorLight);
for (int i = 0; i < 4; i++) {
Gui::Draw_Rect(dropPos[i].x, dropPos[i].y, dropPos[i].w, dropPos[i].h, this->darkMode ? this->boxColorDark : this->boxColorLight);
source/utils/files.c
+7 -35
View File
@@ -1,33 +1,11 @@
#include "files.h"
// Blacklist!
#define BLACKLIST_CTRNAND "ctrnand:/"
#define BLACKLIST_TWLP "twlp:/"
#define BLACKLIST_TWLN "twln:/"
#define BLACKLIST_SDROOT "sdmc:/"
#define BLACKLIST_ROOT "/"
#define BLACKLIST_NINTENDO3DS "sdmc:/Nintendo 3DS"
#define BLACKLIST_NINTENDO3DS2 "/Nintendo"
FS_Path getPathInfo(const char * path, FS_ArchiveID * archive)
{
FS_Path getPathInfo(const char * path, FS_ArchiveID * archive) {
*archive = ARCHIVE_SDMC;
FS_Path filePath = {0};
unsigned int prefixlen = 0;
/* if (!strncmp(path, "ctrnand:/", 9)) {
*archive = ARCHIVE_NAND_CTR_FS;
prefixlen = 8;
}
else if (!strncmp(path, "twlp:/", 6)) {
*archive = ARCHIVE_TWL_PHOTO;
prefixlen = 5;
}
else if (!strncmp(path, "twln:/", 6)) {
*archive = ARCHIVE_NAND_TWL_FS;
prefixlen = 5;
}*/
if (!strncmp(path, "sdmc:/", 6)) {
prefixlen = 5;
}
@@ -46,8 +24,7 @@ FS_Path getPathInfo(const char * path, FS_ArchiveID * archive)
return filePath;
}
Result makeDirs(const char * path)
{
Result makeDirs(const char * path) {
Result ret = 0;
FS_ArchiveID archiveID;
FS_Path filePath = getPathInfo(path, &archiveID);
@@ -61,10 +38,8 @@ Result makeDirs(const char * path)
Handle dirHandle;
ret = FSUSER_OpenDirectory(&dirHandle, archive, filePath);
if (R_SUCCEEDED(ret))
FSDIR_Close(dirHandle);
else
ret = FSUSER_CreateDirectory(archive, filePath, FS_ATTRIBUTE_DIRECTORY);
if (R_SUCCEEDED(ret)) FSDIR_Close(dirHandle);
else ret = FSUSER_CreateDirectory(archive, filePath, FS_ATTRIBUTE_DIRECTORY);
*(slashpos) = bak;
}
@@ -74,8 +49,7 @@ Result makeDirs(const char * path)
return ret;
}
Result openFile(Handle* fileHandle, const char * path, bool write)
{
Result openFile(Handle* fileHandle, const char * path, bool write) {
FS_ArchiveID archive;
FS_Path filePath = getPathInfo(path, &archive);
u32 flags = (write ? (FS_OPEN_CREATE | FS_OPEN_WRITE) : FS_OPEN_READ);
@@ -83,14 +57,12 @@ Result openFile(Handle* fileHandle, const char * path, bool write)
Result ret = 0;
ret = makeDirs(strdup(path));
ret = FSUSER_OpenFileDirectly(fileHandle, archive, fsMakePath(PATH_EMPTY, ""), filePath, flags, 0);
if (write)
ret = FSFILE_SetSize(*fileHandle, 0); //truncate the file to remove previous contents before writing
if (write) ret = FSFILE_SetSize(*fileHandle, 0); //truncate the file to remove previous contents before writing
return ret;
}
Result deleteFile(const char * path)
{
Result deleteFile(const char * path) {
FS_ArchiveID archiveID;
FS_Path filePath = getPathInfo(path, &archiveID);
source/utils/formatting.cpp
+3 -3
View File
@@ -29,11 +29,11 @@
// adapted from GM9i's byte parsing.
std::string formatBytes(int bytes) {
char out[32];
if(bytes == 1)
if (bytes == 1)
snprintf(out, sizeof(out), "%d Byte", bytes);
else if(bytes < 1024)
else if (bytes < 1024)
snprintf(out, sizeof(out), "%d Bytes", bytes);
else if(bytes < 1024 * 1024)
else if (bytes < 1024 * 1024)
snprintf(out, sizeof(out), "%.1f KB", (float)bytes / 1024);
else if (bytes < 1024 * 1024 * 1024)
snprintf(out, sizeof(out), "%.1f MB", (float)bytes / 1024 / 1024);
source/utils/sound.cpp
+7 -14
View File
@@ -24,8 +24,7 @@ typedef struct _WavHeader {
} WavHeader;
static_assert(sizeof(WavHeader) == 44, "WavHeader size is not 44 bytes.");
sound::sound(const string& path, int channel, bool toloop)
{
sound::sound(const string& path, int channel, bool toloop) {
ndspSetOutputMode(NDSP_OUTPUT_STEREO);
ndspSetOutputCount(2); // Num of buffers
@@ -58,8 +57,7 @@ sound::sound(const string& path, int channel, bool toloop)
if (wavHeader.totallength == 0 ||
(wavHeader.channels != 1 && wavHeader.channels != 2) ||
(wavHeader.bits_per_sample != 8 && wavHeader.bits_per_sample != 16))
{
(wavHeader.bits_per_sample != 8 && wavHeader.bits_per_sample != 16)) {
// Unsupported WAV file.
printf("Corrupted wav file.\n");
fclose(fp);
@@ -104,8 +102,7 @@ sound::sound(const string& path, int channel, bool toloop)
chnl = channel;
}
sound::~sound()
{
sound::~sound() {
waveBuf.data_vaddr = 0;
waveBuf.nsamples = 0;
waveBuf.looping = false;
@@ -117,17 +114,13 @@ sound::~sound()
}
}
void sound::play()
{
if (!data)
return;
void sound::play() {
if (!data) return;
DSP_FlushDataCache(data, dataSize);
ndspChnWaveBufAdd(chnl, &waveBuf);
}
void sound::stop()
{
if (!data)
return;
void sound::stop() {
if (!data) return;
ndspChnWaveBufClear(chnl);
}
source/utils/stringutils.cpp
+2 -4
View File
@@ -1,13 +1,11 @@
#include "stringutils.hpp"
bool matchPattern(std::string pattern, std::string tested)
{
bool matchPattern(std::string pattern, std::string tested) {
std::regex patternRegex(pattern);
return regex_match(tested, patternRegex);
}
std::string StringUtils::format(const std::string& fmt_str, ...)
{
std::string StringUtils::format(const std::string& fmt_str, ...) {
va_list ap;
char* fp = NULL;
va_start(ap, fmt_str);