mirror of
https://github.com/DarkStore-3DS/DarkStore.git
synced 2026-07-03 00:39:02 +00:00
Working stuff! :) Last steps -> Add error checking.
This commit is contained in:
@@ -37,10 +37,13 @@
|
||||
|
||||
#define ENTRIES_PER_SCREEN 3
|
||||
|
||||
// Information like Title and Description.
|
||||
struct Info {
|
||||
std::string title;
|
||||
std::string description;
|
||||
};
|
||||
std::string choice;
|
||||
std::string currentFile;
|
||||
|
||||
Info parseInfo(std::string fileName) {
|
||||
FILE* file = fopen(fileName.c_str(), "rt");
|
||||
@@ -58,8 +61,70 @@ Info parseInfo(std::string fileName) {
|
||||
return info;
|
||||
}
|
||||
|
||||
// Objects like Release or Nightly.
|
||||
std::vector<std::string> parseObjects(std::string fileName) {
|
||||
FILE* file = fopen(fileName.c_str(), "rt");
|
||||
if(!file) {
|
||||
printf("File not found\n");
|
||||
fclose(file);
|
||||
return {{""}};
|
||||
}
|
||||
nlohmann::json json = nlohmann::json::parse(file, nullptr, false);
|
||||
fclose(file);
|
||||
|
||||
std::vector<std::string> objs;
|
||||
for(auto it = json.begin();it != json.end(); it++) {
|
||||
if(it.key() != "info") {
|
||||
objs.push_back(it.key());
|
||||
}
|
||||
}
|
||||
return objs;
|
||||
}
|
||||
|
||||
void runFunctions(void) {
|
||||
FILE* file = fopen(currentFile.c_str(), "rt");
|
||||
nlohmann::json json = nlohmann::json::parse(file, nullptr, false);
|
||||
fclose(file);
|
||||
for(int i=0;i<(int)json.at(choice).size();i++) {
|
||||
std::string type = json.at(choice).at(i).at("type");
|
||||
|
||||
if(type == "deleteFile") {
|
||||
std::string file = json.at(choice).at(i).at("file");
|
||||
std::string message = json.at(choice).at(i).at("message");
|
||||
download::deleteFileList(file, message);
|
||||
|
||||
} else if(type == "downloadFile") {
|
||||
std::string file = json.at(choice).at(i).at("file");
|
||||
std::string output = json.at(choice).at(i).at("output");
|
||||
std::string message = json.at(choice).at(i).at("message");
|
||||
download::downloadFile(file, output, message);
|
||||
|
||||
} else if(type == "downloadRelease") {
|
||||
std::string repo = json.at(choice).at(i).at("repo");
|
||||
std::string file = json.at(choice).at(i).at("file");
|
||||
std::string output = json.at(choice).at(i).at("output");
|
||||
std::string message = json.at(choice).at(i).at("message");
|
||||
download::downloadRelease(repo, file, output, message);
|
||||
|
||||
} else if(type == "extractFile") {
|
||||
std::string file = json.at(choice).at(i).at("file");
|
||||
std::string input = json.at(choice).at(i).at("input");
|
||||
std::string output = json.at(choice).at(i).at("output");
|
||||
std::string message = json.at(choice).at(i).at("message");
|
||||
download::extractFileList(file, input, output, message);
|
||||
|
||||
} else if(type == "installCia") {
|
||||
std::string file = json.at(choice).at(i).at("file");
|
||||
std::string message = json.at(choice).at(i).at("message");
|
||||
download::installFileList(file, message);
|
||||
}
|
||||
}
|
||||
doneMsg();
|
||||
}
|
||||
|
||||
|
||||
std::vector<Info> fileInfo;
|
||||
std::vector<std::string> fileInfo2;
|
||||
|
||||
ScriptList::ScriptList() {
|
||||
dirContents.clear();
|
||||
@@ -70,8 +135,7 @@ ScriptList::ScriptList() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void ScriptList::Draw(void) const {
|
||||
void ScriptList::DrawList(void) const {
|
||||
std::string titleinfo;
|
||||
Gui::DrawTop();
|
||||
Gui::DrawStringCentered(0, 2, 0.7f, TextColor, "Universal-Updater", 400);
|
||||
@@ -88,10 +152,35 @@ void ScriptList::Draw(void) const {
|
||||
}
|
||||
|
||||
|
||||
void ScriptList::Draw(void) const {
|
||||
if (mode == 0){
|
||||
DrawList();
|
||||
} else if (mode == 1) {
|
||||
DrawSingleObject();
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptList::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
|
||||
void ScriptList::DrawSingleObject(void) const {
|
||||
std::string info;
|
||||
Gui::DrawTop();
|
||||
Gui::DrawStringCentered(0, 2, 0.7f, TextColor, "Universal-Updater", 400);
|
||||
Gui::DrawBottom();
|
||||
for(int i=0;i<ENTRIES_PER_SCREEN && i<(int)fileInfo2.size();i++) {
|
||||
info = fileInfo2[screenPos2 + i];
|
||||
if(screenPos2 + i == selection2) {
|
||||
Gui::Draw_Rect(0, 40+(i*57), 320, 45, SelectedColor);
|
||||
} else {
|
||||
Gui::Draw_Rect(0, 40+(i*57), 320, 45, UnselectedColor);
|
||||
}
|
||||
Gui::DrawString(0, 40+(i*57), 0.7f, WHITE, info, 320);
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptList::ListSelection(u32 hDown, u32 hHeld) {
|
||||
if (keyRepeatDelay) keyRepeatDelay--;
|
||||
|
||||
if (hDown & KEY_B) {
|
||||
fileInfo.clear();
|
||||
Gui::screenBack();
|
||||
return;
|
||||
}
|
||||
@@ -108,7 +197,6 @@ void ScriptList::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
|
||||
keyRepeatDelay = 6;
|
||||
}
|
||||
}
|
||||
|
||||
if (hHeld & KEY_UP && !keyRepeatDelay) {
|
||||
if (selection > 0) {
|
||||
selection--;
|
||||
@@ -122,9 +210,69 @@ void ScriptList::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
|
||||
}
|
||||
}
|
||||
|
||||
if (hDown & KEY_A) {
|
||||
currentFile = dirContents[selection].name;
|
||||
fileInfo2 = parseObjects(currentFile);
|
||||
selection = 0;
|
||||
mode = 1;
|
||||
}
|
||||
|
||||
if(selection < screenPos) {
|
||||
screenPos = selection;
|
||||
} else if (selection > screenPos + ENTRIES_PER_SCREEN - 1) {
|
||||
screenPos = selection - ENTRIES_PER_SCREEN + 1;
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptList::SelectFunction(u32 hDown, u32 hHeld) {
|
||||
if (keyRepeatDelay) keyRepeatDelay--;
|
||||
if (hHeld & KEY_DOWN && !keyRepeatDelay) {
|
||||
if (selection2 < (int)fileInfo2.size()-1) {
|
||||
selection2++;
|
||||
} else {
|
||||
selection2 = 0;
|
||||
}
|
||||
if (fastMode == true) {
|
||||
keyRepeatDelay = 3;
|
||||
} else if (fastMode == false){
|
||||
keyRepeatDelay = 6;
|
||||
}
|
||||
}
|
||||
if (hHeld & KEY_UP && !keyRepeatDelay) {
|
||||
if (selection2 > 0) {
|
||||
selection2--;
|
||||
} else {
|
||||
selection2 = (int)fileInfo2.size()-1;
|
||||
}
|
||||
if (fastMode == true) {
|
||||
keyRepeatDelay = 3;
|
||||
} else if (fastMode == false){
|
||||
keyRepeatDelay = 6;
|
||||
}
|
||||
}
|
||||
if (hDown & KEY_A) {
|
||||
choice = fileInfo2[selection2];
|
||||
runFunctions();
|
||||
}
|
||||
|
||||
if (hDown & KEY_B) {
|
||||
selection2 = 0;
|
||||
fileInfo2.clear();
|
||||
mode = 0;
|
||||
}
|
||||
|
||||
if(selection2 < screenPos2) {
|
||||
screenPos2 = selection2;
|
||||
} else if (selection2 > screenPos2 + ENTRIES_PER_SCREEN - 1) {
|
||||
screenPos2 = selection2 - ENTRIES_PER_SCREEN + 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void ScriptList::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
|
||||
if (mode == 0) {
|
||||
ListSelection(hDown, hHeld);
|
||||
} else if (mode == 1) {
|
||||
SelectFunction(hDown, hHeld);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user