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

Add Autoboot into a script.

Browse Source
This commit is contained in:
StackZ
2020-03-06 18:10:02 +01:00
parent 05d809e0bc
commit 3a659fd768
10 changed files with 211 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/screens/scriptlist.cpp
+88 -12
View File
@@ -25,6 +25,7 @@
*/
#include "download.hpp"
#include "mainMenu.hpp"
#include "scriptBrowse.hpp"
#include "scriptCreator.hpp"
#include "scriptHelper.hpp"
@@ -312,6 +313,49 @@ void ScriptList::DrawSubMenu(void) const {
Gui::DrawStringCentered(80, subPos[3].y+12, 0.6f, Config::TxtColor, Lang::get("CHANGE_SCRIPTPATH"), 130);
}
void loadDesc(void) {
lines.clear();
while(Desc.find('\n') != Desc.npos) {
lines.push_back(Desc.substr(0, Desc.find('\n')));
Desc = Desc.substr(Desc.find('\n')+1);
}
lines.push_back(Desc.substr(0, Desc.find('\n')));
}
extern int AutobootWhat;
bool changeBackHandle = false;
ScriptList::ScriptList() {
if (AutobootWhat == 2) {
// If Script isn't found, go to MainMenu.
if (access(Config::AutobootFile.c_str(), F_OK) != 0) {
AutobootWhat = 0;
changeBackHandle = true;
Gui::setScreen(std::make_unique<MainMenu>());
}
if (ScriptHelper::checkIfValid(Config::AutobootFile) == true) {
Info fI = parseInfo(Config::AutobootFile);
currentFile = Config::AutobootFile;
selectedTitle = fI.title;
jsonFile = openScriptFile();
Desc = Description(jsonFile);
checkForValidate();
fileInfo2 = parseObjects(currentFile);
loadColors(jsonFile);
loadDesc();
isScriptSelected = true;
selection = 0;
mode = 2;
changeBackHandle = true;
AutobootWhat = 0;
} else {
AutobootWhat = 0;
changeBackHandle = true;
Gui::setScreen(std::make_unique<MainMenu>());
}
}
}
void ScriptList::DrawList(void) const {
std::string line1;
@@ -368,15 +412,6 @@ void ScriptList::Draw(void) const {
}
}
void loadDesc(void) {
lines.clear();
while(Desc.find('\n') != Desc.npos) {
lines.push_back(Desc.substr(0, Desc.find('\n')));
Desc = Desc.substr(Desc.find('\n')+1);
}
lines.push_back(Desc.substr(0, Desc.find('\n')));
}
void ScriptList::DrawSingleObject(void) const {
std::string info;
std::string entryAmount = std::to_string(selection2+1) + " / " + std::to_string(fileInfo2.size());
@@ -419,11 +454,33 @@ void ScriptList::DrawSingleObject(void) const {
}
}
void ScriptList::refreshList() {
if (returnIfExist(Config::ScriptPath, {"json"}) == true) {
Msg::DisplayMsg(Lang::get("REFRESHING_LIST"));
dirContents.clear();
fileInfo.clear();
chdir(Config::ScriptPath.c_str());
getDirectoryContents(dirContents, {"json"});
for(uint i=0;i<dirContents.size();i++) {
fileInfo.push_back(parseInfo(dirContents[i].name));
}
selection = 0;
mode = 1;
} else {
Msg::DisplayWarnMsg(Lang::get("GET_SCRIPTS_FIRST"));
selection = 0;
mode = 0;
}
}
void ScriptList::SubMenuLogic(u32 hDown, u32 hHeld, touchPosition touch) {
if ((hDown & KEY_B) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) {
Gui::screenBack();
return;
if (changeBackHandle) {
Gui::setScreen(std::make_unique<MainMenu>());
} else {
Gui::screenBack();
return;
}
}
// Navigation.
@@ -539,6 +596,25 @@ void ScriptList::ListSelection(u32 hDown, u32 hHeld, touchPosition touch) {
mode = 0;
}
if (hDown & KEY_START) {
if (Config::autoboot == 2) {
if (Msg::promptMsg(Lang::get("DISABLE_AUTOBOOT"))) {
Config::autoboot = 0;
Config::AutobootFile = "";
}
} else {
if (dirContents[selection].isDirectory) {
} else if (fileInfo.size() != 0) {
if (ScriptHelper::checkIfValid(dirContents[selection].name) == true) {
if (Msg::promptMsg(Lang::get("AUTOBOOT_SCRIPT"))) {
Config::AutobootFile = Config::ScriptPath + dirContents[selection].name;
Config::autoboot = 2;
}
}
}
}
}
if ((hHeld & KEY_DOWN && !keyRepeatDelay) || (hDown & KEY_TOUCH && touching(touch, arrowPos[1]))) {
if (selection < (int)fileInfo.size()-1) {
selection++;
@@ -665,7 +741,7 @@ void ScriptList::SelectFunction(u32 hDown, u32 hHeld, touchPosition touch) {
selection2 = 0;
fileInfo2.clear();
isScriptSelected = false;
mode = 1;
refreshList();
}
if ((hHeld & KEY_DOWN && !keyRepeatDelay) || (hDown & KEY_TOUCH && touching(touch, arrowPos[1]))) {
source/screens/unistore.cpp
+56 -38
View File
@@ -50,7 +50,7 @@ extern u32 TextColor;
extern u32 progressBar;
extern u32 selected;
extern u32 unselected;
extern bool UniStoreAutoboot;
extern int AutobootWhat;
bool changeBackState = false;
C2D_SpriteSheet appStoreSheet;
@@ -198,29 +198,35 @@ void loadStoreColors(nlohmann::json &json) {
UniStore::UniStore() {
// Autobooting UniStore. ;)
if (UniStoreAutoboot) {
if (AutobootWhat == 1) {
// If store isn't found, go to MainMenu.
if (access(Config::UniStoreFile.c_str(), F_OK) != 0) {
Gui::setScreen(std::make_unique<MainMenu>());
if (access(Config::AutobootFile.c_str(), F_OK) != 0) {
AutobootWhat = 0;
changeBackState = true;
Gui::setScreen(std::make_unique<MainMenu>());
}
// Parse store.
SI = parseStoreInfo(Config::UniStoreFile);
// If WiFi enabled & File exist, update store.
if (checkWifiStatus()) {
if (Msg::promptMsg(Lang::get("WOULD_YOU_LIKE_UPDATE"))) {
if(SI.url != "" && SI.url != "MISSING: storeInfo.url" && SI.file != "" && SI.file != "MISSING: storeInfo.file") {
ScriptHelper::downloadFile(SI.url, SI.file, Lang::get("UPDATING"));
}
if(SI.sheetURL != "" && SI.sheetURL != "MISSING: storeInfo.sheetURL" && SI.storeSheet != "" && SI.storeSheet != "MISSING: storeInfo.sheet") {
ScriptHelper::downloadFile(SI.sheetURL, SI.storeSheet, Lang::get("UPDATING"));
if (ScriptHelper::checkIfValid(Config::AutobootFile, 1) == true) {
SI = parseStoreInfo(Config::AutobootFile);
if (checkWifiStatus()) {
if (Msg::promptMsg(Lang::get("WOULD_YOU_LIKE_UPDATE"))) {
if(SI.url != "" && SI.url != "MISSING: storeInfo.url" && SI.file != "" && SI.file != "MISSING: storeInfo.file") {
ScriptHelper::downloadFile(SI.url, SI.file, Lang::get("UPDATING"));
}
if(SI.sheetURL != "" && SI.sheetURL != "MISSING: storeInfo.sheetURL" && SI.storeSheet != "" && SI.storeSheet != "MISSING: storeInfo.sheet") {
ScriptHelper::downloadFile(SI.sheetURL, SI.storeSheet, Lang::get("UPDATING"));
}
}
}
} else {
AutobootWhat = 0;
changeBackState = true;
Gui::setScreen(std::make_unique<MainMenu>());
}
if (ScriptHelper::checkIfValid(Config::UniStoreFile, 1) == true) {
currentStoreFile = Config::UniStoreFile;
if (ScriptHelper::checkIfValid(Config::AutobootFile, 1) == true) {
currentStoreFile = Config::AutobootFile;
Msg::DisplayMsg(Lang::get("PREPARE_STORE"));
if (SI.storeSheet != "" || SI.storeSheet != "MISSING: storeInfo.sheet") {
if(access(SI.storeSheet.c_str(), F_OK) != -1 ) {
@@ -234,7 +240,12 @@ UniStore::UniStore() {
displayInformations = handleIfDisplayText();
isScriptSelected = true;
mode = 2;
AutobootWhat = 0;
changeBackState = true;
} else {
AutobootWhat = 0;
changeBackState = true;
Gui::setScreen(std::make_unique<MainMenu>());
}
}
}
@@ -452,6 +463,24 @@ void UniStore::updateStore(int selectedStore) {
}
}
void UniStore::refreshList() {
if (returnIfExist(Config::StorePath, {"unistore"}) == true) {
Msg::DisplayMsg(Lang::get("REFRESHING_LIST"));
dirContents.clear();
storeInfo.clear();
chdir(Config::StorePath.c_str());
getDirectoryContents(dirContents, {"unistore"});
for(uint i=0;i<dirContents.size();i++) {
storeInfo.push_back(parseStoreInfo(dirContents[i].name));
descript();
loadStoreDesc();
}
mode = 1;
} else {
Msg::DisplayWarnMsg(Lang::get("GET_STORES_FIRST"));
mode = 0;
}
}
void UniStore::SubMenuLogic(u32 hDown, u32 hHeld, touchPosition touch) {
if ((hDown & KEY_B) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) {
if (changeBackState) {
@@ -717,18 +746,18 @@ void UniStore::StoreSelectionLogic(u32 hDown, u32 hHeld, touchPosition touch) {
}
if (hDown & KEY_START) {
if (Config::autobootUnistore) {
if (Msg::promptMsg(Lang::get("DISABLE_AUTOBOOT_STORE"))) {
Config::autobootUnistore = false;
Config::UniStoreFile = "";
if (Config::autoboot == 1) {
if (Msg::promptMsg(Lang::get("DISABLE_AUTOBOOT"))) {
Config::autoboot = 0;
Config::AutobootFile = "";
}
} else {
if (dirContents[selection].isDirectory) {
} else if (storeInfo.size() != 0) {
if (ScriptHelper::checkIfValid(dirContents[selection].name, 1) == true) {
if (Msg::promptMsg(Lang::get("AUTOBOOT_STORE"))) {
Config::UniStoreFile = Config::StorePath + dirContents[selection].name;
Config::autobootUnistore = true;
Config::AutobootFile = Config::StorePath + dirContents[selection].name;
Config::autoboot = 1;
}
}
}
@@ -740,23 +769,12 @@ void UniStore::StoreLogic(u32 hDown, u32 hHeld, touchPosition touch) {
if (keyRepeatDelay) keyRepeatDelay--;
if ((hDown & KEY_B) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) {
if (UniStoreAutoboot) {
UniStoreAutoboot = false;
mode = 0;
appStoreList.clear();
isScriptSelected = false;
selection2 = 0;
if (sheetHasLoaded == true) {
freeSheet();
}
} else {
mode = 1;
appStoreList.clear();
isScriptSelected = false;
selection2 = 0;
if (sheetHasLoaded == true) {
freeSheet();
}
refreshList();
appStoreList.clear();
isScriptSelected = false;
selection2 = 0;
if (sheetHasLoaded == true) {
freeSheet();
}
}