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

Implement Script Downloading and parsing of the Informations.

Browse Source 
To-Do: Revision checking of the current and new Scripts.
This commit is contained in:
VoltZ
2019-11-06 13:54:45 +01:00
parent 77680d2a78
commit 715c09179b
8 changed files with 103 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/download/download.hpp
+1 -3
View File
@@ -109,6 +109,4 @@ namespace download {
void deleteFileList(std::string file, std::string message);
void installFileList(std::string file, std::string message);
void extractFileList(std::string file, std::string input, std::string output, std::string message);
}
void downloadScripts(void);
}
include/screens/scriptBrowse.hpp
+3
View File
@@ -29,6 +29,7 @@
#include "screens/screen.hpp"
#include "screens/screenCommon.hpp"
#include "utils/config.hpp"
#include "utils/fileBrowse.h"
class ScriptBrowse : public Screen
@@ -36,8 +37,10 @@ class ScriptBrowse : public Screen
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
ScriptBrowse();
private:
nlohmann::json currentFile;
std::vector<DirEntry> dirContents;
mutable int screenPos = 0;
mutable int selection = 0;
include/utils/fileBrowse.h
+1
View File
@@ -26,5 +26,6 @@ void findNdsFiles(vector<DirEntry>& dirContents);
bool nameEndsWith(const std::string& name, const std::vector<std::string> extensionList);
void getDirectoryContents(std::vector<DirEntry>& dirContents, const std::vector<std::string> extensionList);
void getDirectoryContents(std::vector<DirEntry>& dirContents);
std::vector<std::string> getContents(const std::string &name, const std::vector<std::string> &extensionList);
#endif //FILE_BROWSE_H
romfs/lang/en/app.json
+6 -1
View File
@@ -35,5 +35,10 @@
"GETTING_SCRIPT_LIST": "Getting Script List...",
"B_BACK": "\uE001: Back",
"A_CHOOSE": "\uE000: Choose",
"SCRIPTBROWSE": "Scriptbrowse"
"SCRIPTBROWSE": "Scriptbrowse",
"GET_SCRIPTS": "Get Scripts",
"INSTALLED_REV": "Installed revision: ",
"CURRENT_REV": "Current revision: ",
"AUTHOR": "author: ",
"TITLE": "title: "
}
source/download/download.cpp
-71
View File
@@ -673,75 +673,4 @@ void download::extractFileList(std::string file, std::string input, std::string
Threads::create((ThreadFunc)displayProgressBar);
extractArchive(file, input, output);
showProgressBar = false;
}
// Script Browse.
void downloadScripts(void) {
int keyRepeatDelay = 0;
std::string ScriptsPath = Config::ScriptPath;
DisplayMsg(Lang::get("GETTING_SCRIPT_LIST"));
std::vector<ThemeEntry> scriptList;
scriptList = getThemeList("Universal-Team/extras", "Scripts");
makeDirs(ScriptsPath.c_str());
for(uint i=0;i<scriptList.size();i++) {
if(scriptList[i].name.size() < 4 || scriptList[i].name.substr(scriptList[i].name.size()-4) != "json") {
scriptList.erase(scriptList.begin()+i);
i--;
}
}
int selectedScript = 0;
while(1) {
gspWaitForVBlank();
hidScanInput();
const u32 hDown = hidKeysDown();
const u32 hHeld = hidKeysHeld();
if(keyRepeatDelay) keyRepeatDelay--;
if(hDown & KEY_A) {
mkdir((scriptList[selectedScript].sdPath).c_str(), 0777);
DisplayMsg((Lang::get("DOWNLOADING") +scriptList[selectedScript].name).c_str());
downloadToFile(scriptList[selectedScript].downloadUrl, ScriptsPath.c_str() +scriptList[selectedScript].name);
} else if(hDown & KEY_B) {
selectedScript = 0;
return;
} else if(hHeld & KEY_UP && !keyRepeatDelay) {
if(selectedScript > 0) {
selectedScript--;
keyRepeatDelay = 3;
}
} else if(hHeld & KEY_DOWN && !keyRepeatDelay) {
if(selectedScript < (int)scriptList.size()-1) {
selectedScript++;
keyRepeatDelay = 3;
}
} else if(hHeld & KEY_LEFT && !keyRepeatDelay) {
selectedScript -= 10;
if(selectedScript < 0) {
selectedScript = 0;
}
keyRepeatDelay = 3;
} else if(hHeld & KEY_RIGHT && !keyRepeatDelay) {
selectedScript += 10;
if(selectedScript > (int)scriptList.size()) {
selectedScript = scriptList.size()-1;
}
keyRepeatDelay = 3;
}
std::string scriptText;
for(int i=(selectedScript<10) ? 0 : selectedScript-10;i<(int)scriptList.size()&&i<((selectedScript<10) ? 11 : selectedScript+1);i++) {
if(i == selectedScript) {
scriptText += "> " + scriptList[i].name + "\n";
} else {
scriptText += " " + scriptList[i].name + "\n";
}
}
for(uint i=0;i<((scriptList.size()<10) ? 11-scriptList.size() : 0);i++) {
scriptText += "\n";
}
scriptText += Lang::get("B_BACK") + " " +Lang::get("A_CHOOSE");
DisplayMsg(scriptText.c_str());
}
}
source/screens/mainMenu.cpp
+1 -5
View File
@@ -53,7 +53,7 @@ void MainMenu::Draw(void) const {
}
Gui::DrawString((320-Gui::GetStringWidth(0.6f, Lang::get("SCRIPTLIST")))/2-150+70, mainButtons[0].y+10, 0.6f, Config::TxtColor, Lang::get("SCRIPTLIST"), 140);
Gui::DrawString((320-Gui::GetStringWidth(0.6f, Lang::get("SCRIPTBROWSE")))/2+150-70, mainButtons[1].y+10, 0.6f, Config::TxtColor, Lang::get("SCRIPTBROWSE"), 140);
Gui::DrawString((320-Gui::GetStringWidth(0.6f, Lang::get("GET_SCRIPTS")))/2+150-70, mainButtons[1].y+10, 0.6f, Config::TxtColor, Lang::get("GET_SCRIPTS"), 140);
Gui::DrawString((320-Gui::GetStringWidth(0.6f, Lang::get("LANGUAGE")))/2-150+70, mainButtons[2].y+10, 0.6f, Config::TxtColor, Lang::get("LANGUAGE"), 140);
Gui::DrawString((320-Gui::GetStringWidth(0.6f, Lang::get("COLORS")))/2+150-70, mainButtons[3].y+10, 0.6f, Config::TxtColor, Lang::get("COLORS"), 140);
}
@@ -105,8 +105,4 @@ void MainMenu::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
Gui::setScreen(std::make_unique<Settings>());
}
}
if (hDown & KEY_X) {
downloadScripts();
}
}
source/screens/scriptBrowse.cpp
+79 -3
View File
@@ -29,11 +29,13 @@
#include "screens/mainMenu.hpp"
#include "screens/scriptBrowse.hpp"
#include "utils/config.hpp"
#include "utils/fileBrowse.h"
#include "utils/json.hpp"
#define ENTRIES_PER_SCREEN 2
#define ENTRIES_PER_SCREEN 3
nlohmann::json jsonFileBrowse;
std::string metaFile = "sdmc:/3ds/Universal-Updater/ScriptInfo.json";
extern std::string get(nlohmann::json json, const std::string &key, const std::string &key2);
@@ -46,17 +48,91 @@ nlohmann::json openMetaFile() {
return jsonFile;
}
nlohmann::json parseInfo() {
FILE* file = fopen(metaFile.c_str(), "rt");
if(!file) {
printf("File not found\n");
fclose(file);
return {"", ""};
}
nlohmann::json json = nlohmann::json::parse(file, nullptr, false);
fclose(file);
for(uint i=0;i<json.size();i++) {
if(!json[i].contains("title")) json[i]["title"] = "TITLE";
if(!json[i].contains("author")) json[i]["author"] = "AUTHOR";
if(!json[i].contains("revision")) json[i]["revision"] = 0;
if(!json[i].contains("version")) json[i]["revision"] = 0;
}
return json;
}
ScriptBrowse::ScriptBrowse() {
DisplayMsg(Lang::get("GETTING_SCRIPT_LIST"));
downloadToFile("https://github.com/Universal-Team/extras/raw/master/ScriptsInfo/scriptInfo.json", "sdmc:/3ds/Universal-Updater/ScriptInfo.json");
jsonFileBrowse = parseInfo();
}
void ScriptBrowse::Draw(void) const {
Gui::DrawTop();
Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, Lang::get("Scriptbrowse"), 400);
Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, Lang::get("SCRIPTBROWSE"), 400);
Gui::DrawStringCentered(0, 80, 0.7f, Config::TxtColor, Lang::get("TITLE") + std::string(jsonFileBrowse[screenPos+selection]["title"]), 400);
Gui::DrawStringCentered(0, 100, 0.7f, Config::TxtColor, Lang::get("AUTHOR") + std::string(jsonFileBrowse[screenPos+selection]["author"]), 400);
Gui::DrawStringCentered(0, 120, 0.7f, Config::TxtColor, Lang::get("INSTALLED_REV"), 400);
Gui::DrawStringCentered(0, 140, 0.7f, Config::TxtColor, Lang::get("CURRENT_REV")+ std::to_string(jsonFileBrowse[screenPos+selection]["revision"].get<int64_t>()), 400);
Gui::DrawBottom();
for(int i=0;i<ENTRIES_PER_SCREEN && i<(int)jsonFileBrowse.size();i++) {
if(screenPos + i == selection) {
Gui::Draw_Rect(0, 40+(i*57), 320, 45, Config::SelectedColor);
} else {
Gui::Draw_Rect(0, 40+(i*57), 320, 45, Config::UnselectedColor);
}
Gui::DrawStringCentered(0, 38+(i*57), 0.7f, Config::TxtColor, jsonFileBrowse[screenPos+i]["title"], 320);
Gui::DrawStringCentered(0, 62+(i*57), 0.7f, Config::TxtColor, jsonFileBrowse[screenPos+i]["author"], 320);
}
}
void ScriptBrowse::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
if (hDown & KEY_B) {
jsonFileBrowse.clear();
Gui::screenBack();
return;
}
if (hHeld & KEY_DOWN && !keyRepeatDelay) {
if (selection < (int)jsonFileBrowse.size()-1) {
selection++;
} else {
selection = 0;
}
if (fastMode == true) {
keyRepeatDelay = 3;
} else if (fastMode == false){
keyRepeatDelay = 6;
}
}
if (hHeld & KEY_UP && !keyRepeatDelay) {
if (selection > 0) {
selection--;
} else {
selection = (int)jsonFileBrowse.size()-1;
}
if (fastMode == true) {
keyRepeatDelay = 3;
} else if (fastMode == false){
keyRepeatDelay = 6;
}
}
if (hDown & KEY_A) {
if (jsonFileBrowse.size() != 0) {
std::string fileName = Lang::get("DOWNLOADING") + std::string(jsonFileBrowse[selection]["title"]);
DisplayMsg(fileName);
downloadToFile(jsonFileBrowse[selection]["url"], Config::ScriptPath + std::string(jsonFileBrowse[selection]["title"])+ ".json");
}
}
}
source/utils/fileBrowse.cpp
+12
View File
@@ -159,4 +159,16 @@ void getDirectoryContents(std::vector<DirEntry>& dirContents, const std::vector<
void getDirectoryContents(std::vector<DirEntry>& dirContents) {
getDirectoryContents(dirContents, {});
}
std::vector<std::string> getContents(const std::string &name, const std::vector<std::string> &extensionList) {
std::vector<std::string> dirContents;
DIR* pdir = opendir(name.c_str());
struct dirent *pent;
while ((pent = readdir(pdir)) != NULL) {
if(nameEndsWith(pent->d_name, extensionList))
dirContents.push_back(pent->d_name);
}
closedir(pdir);
return dirContents;
}