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

Universal-Updater -> DarkStore Part 2

Browse Source 
Renamed Strings For DarkStore
Made .store Files Useable
This commit is contained in:
dark98
2021-09-09 16:23:22 +01:00
parent 76b41884c5
commit c894ff9924
61 changed files with 650 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/overlays/storeSelect.cpp
+25 -25
View File
@@ -56,7 +56,7 @@ static const std::vector<Structs::ButtonPos> mainButtons = {
/*
Delete a store.. including the Spritesheets, if found.
const std::string &file: The file of the UniStore.
const std::string &file: The file of the Store.
*/
static void DeleteStore(const std::string &file) {
nlohmann::json storeJson;
@@ -68,7 +68,7 @@ static void DeleteStore(const std::string &file) {
if (storeJson.is_discarded())
storeJson = {};
/* Check, if Spritesheet exist on UniStore. */
/* Check, if Spritesheet exist on Store. */
if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_array()) {
const std::vector<std::string> sht = storeJson["storeInfo"]["sheet"].get<std::vector<std::string>>();
@@ -96,7 +96,7 @@ static void DeleteStore(const std::string &file) {
}
}
deleteFile((std::string(_STORE_PATH) + file).c_str()); // Now delete UniStore.
deleteFile((std::string(_STORE_PATH) + file).c_str()); // Now delete Store.
}
/*
@@ -107,7 +107,7 @@ static bool DownloadStore() {
std::string file = "";
const std::string URL = QR_Scanner::StoreHandle();
if (URL != "") doSheet = DownloadUniStore(URL, -1, file, true);
if (URL != "") doSheet = DownloadStore(URL, -1, file, true);
if (doSheet) {
nlohmann::json storeJson;
@@ -163,7 +163,7 @@ static bool UpdateStore(const std::string &URL) {
bool doSheet = false;
std::string file = "";
if (URL != "") doSheet = DownloadUniStore(URL, -1, file, false);
if (URL != "") doSheet = DownloadStore(URL, -1, file, false);
if (doSheet) {
nlohmann::json storeJson;
@@ -215,19 +215,19 @@ static bool UpdateStore(const std::string &URL) {
}
/*
This is the UniStore Manage Handle.
This is the Store Manage Handle.
Here you can..
- Delete a UniStore.
- Download / Add a UniStore.
- Check for Updates for a UniStore.
- Switch the UniStore.
- Delete a Store.
- Download / Add a Store.
- Check for Updates for a Store.
- Switch the Store.
*/
void Overlays::SelectStore() {
bool doOut = false;
int selection = 0, sPos = 0;
std::vector<UniStoreInfo> info = GetUniStoreInfo(_STORE_PATH);
std::vector<StoreInfo> info = GetStoreInfo(_STORE_PATH);
while(!doOut) {
Gui::clearTextBufs();
@@ -252,7 +252,7 @@ void Overlays::SelectStore() {
Gui::DrawStringCentered(0, 70, 0.5f, UIThemes->TextColor(), info[selection].Description, 380, 130, font, C2D_WordWrap);
} else {
Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), Lang::get("INVALID_UNISTORE"), 390, 0, font);
Gui::DrawStringCentered(0, 1, 0.7f, UIThemes->TextColor(), Lang::get("INVALID_STORE"), 390, 0, font);
}
Gui::DrawString(10, 200, 0.4, UIThemes->TextColor(), "- " + Lang::get("ENTRIES") + ": " + std::to_string(info[selection].StoreSize), 150, 0, font);
@@ -265,7 +265,7 @@ void Overlays::SelectStore() {
Gui::Draw_Rect(0, 0, 320, 25, UIThemes->BarColor());
Gui::Draw_Rect(0, 25, 320, 1, UIThemes->BarOutline());
GFX::DrawIcon(sprites_arrow_idx, mainButtons[9].x, mainButtons[9].y, UIThemes->TextColor());
Gui::DrawStringCentered(0, 2, 0.6, UIThemes->TextColor(), Lang::get("SELECT_UNISTORE_2"), 310, 0, font);
Gui::DrawStringCentered(0, 2, 0.6, UIThemes->TextColor(), Lang::get("SELECT_STORE_2"), 310, 0, font);
for(int i = 0; i < 6 && i < (int)info.size(); i++) {
if (sPos + i == selection) Gui::Draw_Rect(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, UIThemes->MarkSelected());
@@ -311,9 +311,9 @@ void Overlays::SelectStore() {
if (info[selection].File != "") { // Ensure to check for this.
if (!(info[selection].File.find("/") != std::string::npos)) {
/* Load selected one. */
if (info[selection].Version == -1) Msg::waitMsg(Lang::get("UNISTORE_INVALID_ERROR"));
else if (info[selection].Version < 3) Msg::waitMsg(Lang::get("UNISTORE_TOO_OLD"));
else if (info[selection].Version > _UNISTORE_VERSION) Msg::waitMsg(Lang::get("UNISTORE_TOO_NEW"));
if (info[selection].Version == -1) Msg::waitMsg(Lang::get("STORE_INVALID_ERROR"));
else if (info[selection].Version < 3) Msg::waitMsg(Lang::get("STORE_TOO_OLD"));
else if (info[selection].Version > _STORE_VERSION) Msg::waitMsg(Lang::get("STORE_TOO_NEW"));
else {
config->lastStore(info[selection].FileName);
StoreUtils::store = std::make_unique<Store>(_STORE_PATH + info[selection].FileName, info[selection].FileName);
@@ -333,9 +333,9 @@ void Overlays::SelectStore() {
if (touching(touch, mainButtons[i])) {
if (i + sPos < (int)info.size() && info[i + sPos].File != "") { // Ensure to check for this.
if (!(info[i + sPos].File.find("/") != std::string::npos)) {
if (info[i + sPos].Version == -1) Msg::waitMsg(Lang::get("UNISTORE_INVALID_ERROR"));
else if (info[i + sPos].Version < 3) Msg::waitMsg(Lang::get("UNISTORE_TOO_OLD"));
else if (info[i + sPos].Version > _UNISTORE_VERSION) Msg::waitMsg(Lang::get("UNISTORE_TOO_NEW"));
if (info[i + sPos].Version == -1) Msg::waitMsg(Lang::get("STORE_INVALID_ERROR"));
else if (info[i + sPos].Version < 3) Msg::waitMsg(Lang::get("STORE_TOO_OLD"));
else if (info[i + sPos].Version > _STORE_VERSION) Msg::waitMsg(Lang::get("STORE_TOO_NEW"));
else {
config->lastStore(info[i + sPos].FileName);
StoreUtils::store = std::make_unique<Store>(_STORE_PATH + info[i + sPos].FileName, info[i + sPos].FileName);
@@ -352,22 +352,22 @@ void Overlays::SelectStore() {
}
}
/* Delete UniStore. */
/* Delete Store. */
if ((hidKeysDown() & KEY_X) || (hidKeysDown() & KEY_TOUCH && touching(touch, mainButtons[6]))) {
if (info[selection].FileName != "") {
DeleteStore(info[selection].FileName);
selection = 0;
info = GetUniStoreInfo(_STORE_PATH);
info = GetStoreInfo(_STORE_PATH);
}
}
/* Download latest UniStore. */
/* Download latest Store. */
if ((hidKeysDown() & KEY_START) || (hidKeysDown() & KEY_TOUCH && touching(touch, mainButtons[7]))) {
if (checkWifiStatus()) {
if (info[selection].URL != "") {
if (UpdateStore(info[selection].URL)) {
selection = 0;
info = GetUniStoreInfo(_STORE_PATH);
info = GetStoreInfo(_STORE_PATH);
}
}
@@ -380,12 +380,12 @@ void Overlays::SelectStore() {
else if (selection > sPos + 6 - 1) sPos = selection - 6 + 1;
}
/* UniStore QR Code / URL Download. */
/* Store QR Code / URL Download. */
if ((hidKeysDown() & KEY_Y) || (hidKeysDown() & KEY_TOUCH && touching(touch, mainButtons[8]))) {
if (checkWifiStatus()) {
if (DownloadStore()) {
selection = 0;
info = GetUniStoreInfo(_STORE_PATH);
info = GetStoreInfo(_STORE_PATH);
}
} else {