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

Increase Script version, add citra to config.

Browse Source 
The Citra entry allows to skip the wifi check.
This commit is contained in:
StackZ
2020-07-01 15:07:29 +02:00
parent 54c426032b
commit 80afbbe19f
6 changed files with 76 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/download/download.cpp
+1
View File
@@ -626,6 +626,7 @@ Result downloadFromRelease(std::string url, std::string asset, std::string path,
* @return True if Wi-Fi is connected; false if not.
*/
bool checkWifiStatus(void) {
if (config->citra()) return true;
u32 wifiStatus;
bool res = false;
source/screens/scriptlist.cpp
+60 -44
View File
@@ -62,14 +62,19 @@ ScriptInfo parseInfo(std::string fileName) {
}
// Check if Script version has the current version.
void ScriptList::checkForValidate(void) {
bool ScriptList::checkForValidate(void) {
FILE* file = fopen(currentFile.c_str(), "rt");
nlohmann::json json = nlohmann::json::parse(file, nullptr, false);
fclose(file);
int ver = ScriptHelper::getNum(json, "info", "version");
if (ver < SCRIPT_VERSION || ver > SCRIPT_VERSION) {
if (ver == 3 || ver == 4) {
return true;
} else {
Msg::DisplayWarnMsg(Lang::get("INCOMPATIBLE_SCRIPT"));
return false;
}
return false;
}
// Open a script file and return it to a JSON.
@@ -206,18 +211,23 @@ ScriptList::ScriptList() {
if (ScriptHelper::checkIfValid(config->autobootFile()) == true) {
ScriptInfo 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;
if (checkForValidate()) {
selectedTitle = fI.title;
jsonFile = openScriptFile();
Desc = Description(jsonFile);
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>(), config->screenFade(), true);
}
} else {
AutobootWhat = 0;
changeBackHandle = true;
@@ -642,16 +652,18 @@ void ScriptList::ListSelection(u32 hDown, u32 hHeld, touchPosition touch) {
if (!dirContents[screenPos + i].isDirectory && fileInfo.size() != 0) {
if (ScriptHelper::checkIfValid(dirContents[screenPos + i].name) == true) {
currentFile = dirContents[screenPos + i].name;
selectedTitle = fileInfo[screenPos + i].title;
jsonFile = openScriptFile();
Desc = Description(jsonFile);
checkForValidate();
fileInfo2 = parseObjects(currentFile);
loadColors(jsonFile);
loadDesc();
isScriptSelected = true;
Selection = 0;
mode = 2;
if (checkForValidate()) {
selectedTitle = fileInfo[screenPos + i].title;
jsonFile = openScriptFile();
Desc = Description(jsonFile);
checkForValidate();
fileInfo2 = parseObjects(currentFile);
loadColors(jsonFile);
loadDesc();
isScriptSelected = true;
Selection = 0;
mode = 2;
}
}
}
}
@@ -662,16 +674,18 @@ void ScriptList::ListSelection(u32 hDown, u32 hHeld, touchPosition touch) {
if (!dirContents[screenPosList + i].isDirectory && fileInfo.size() != 0) {
if (ScriptHelper::checkIfValid(dirContents[screenPosList + i].name) == true) {
currentFile = dirContents[screenPosList + i].name;
selectedTitle = fileInfo[screenPosList + i].title;
jsonFile = openScriptFile();
Desc = Description(jsonFile);
checkForValidate();
fileInfo2 = parseObjects(currentFile);
loadColors(jsonFile);
loadDesc();
isScriptSelected = true;
Selection = 0;
mode = 2;
if (checkForValidate()) {
selectedTitle = fileInfo[screenPosList + i].title;
jsonFile = openScriptFile();
Desc = Description(jsonFile);
checkForValidate();
fileInfo2 = parseObjects(currentFile);
loadColors(jsonFile);
loadDesc();
isScriptSelected = true;
Selection = 0;
mode = 2;
}
}
}
}
@@ -684,16 +698,18 @@ void ScriptList::ListSelection(u32 hDown, u32 hHeld, touchPosition touch) {
} else if (fileInfo.size() != 0) {
if (ScriptHelper::checkIfValid(dirContents[Selection].name) == true) {
currentFile = dirContents[Selection].name;
selectedTitle = fileInfo[Selection].title;
jsonFile = openScriptFile();
Desc = Description(jsonFile);
checkForValidate();
fileInfo2 = parseObjects(currentFile);
loadColors(jsonFile);
loadDesc();
isScriptSelected = true;
Selection = 0;
mode = 2;
if (checkForValidate()) {
selectedTitle = fileInfo[Selection].title;
jsonFile = openScriptFile();
Desc = Description(jsonFile);
checkForValidate();
fileInfo2 = parseObjects(currentFile);
loadColors(jsonFile);
loadDesc();
isScriptSelected = true;
Selection = 0;
mode = 2;
}
}
}
}
source/utils/config.cpp
+9 -1
View File
@@ -36,6 +36,7 @@ void Config::addMissingThings() {
this->setString("3DSX_PATH", _3DSX_PATH);
this->setString("NDS_PATH", _NDS_PATH);
this->setString("ARCHIVE_PATH", ARCHIVES_DEFAULT);
this->setBool("CITRA", false);
}
}
@@ -76,6 +77,7 @@ void Config::initialize() {
this->setString("3DSX_PATH", _3DSX_PATH);
this->setString("NDS_PATH", _NDS_PATH);
this->setString("ARCHIVE_PATH", ARCHIVES_DEFAULT);
this->setBool("CITRA", false);
this->setInt("VERSION", this->configVersion);
// Write to file.
@@ -290,6 +292,12 @@ Config::Config() {
this->archivepath(this->getString("ARCHIVE_PATH"));
}
if (!this->json.contains("CITRA")) {
this->citra(false);
} else {
this->citra(this->getBool("CITRA"));
}
this->changesMade = false; // No changes made yet.
}
@@ -330,7 +338,7 @@ void Config::save() {
this->setString("3DSX_PATH", this->_3dsxpath());
this->setString("NDS_PATH", this->ndspath());
this->setString("ARCHIVE_PATH", this->archivepath());
this->setBool("CITRA", this->citra());
// Write changes to file.
const std::string dump = this->json.dump(1, '\t');
fwrite(dump.c_str(), 1, this->json.dump(1, '\t').size(), file);