From 466fe27d518388788ea2563e95909dcdab1d1326 Mon Sep 17 00:00:00 2001
From: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com>
Date: Tue, 3 Nov 2020 08:49:38 +0100
Subject: [PATCH] See desc for more.

- Removed "beta" of Universal-DB. NOTE: This will only work at 12:00 UTC.

- Fixed downloadFile caused an error, when the folder did not exist.

- Removed sheet.png of the spritesheet, because unneeded.
---
 assets/gfx/sprites.t3s        |   1 -
 assets/gfx/sprites/sheet.png  | Bin 360 -> 0 bytes
 include/utils/config.hpp      |   2 +-
 source/screens/mainScreen.cpp |  14 +++++++-------
 source/utils/download.cpp     |  13 ++++++++++---
 5 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 assets/gfx/sprites/sheet.png

diff --git a/assets/gfx/sprites.t3s b/assets/gfx/sprites.t3s
index 3e612b3..145e747 100644
--- a/assets/gfx/sprites.t3s
+++ b/assets/gfx/sprites.t3s
@@ -10,7 +10,6 @@ sprites/noIcon.png
 sprites/qr_code.png
 sprites/search.png
 sprites/settings.png
-sprites/sheet.png
 sprites/sort.png
 sprites/sort_checked.png
 sprites/sort_unchecked.png
diff --git a/assets/gfx/sprites/sheet.png b/assets/gfx/sprites/sheet.png
deleted file mode 100644
index 1167bfe4038ba8559621232eabd2ed8e5eebc681..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 360
zcmV-u0hj)XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0Ub$1K~y-6&62Sz#BmtLKfhn%EXs17%W9MoQA%M^1`}m9D1U)JLCS41
zDH(1Pb;uxzNeoP9Q1S=pwliIQ48H2?{LbCRvwVBsp7(j4Z|@8L0_vjrY<twylA6ZD
zMfJUd;TUUb5g-M|fZjGCuYj$no(4A6d<yh*@XI^kII6pY=|tK@yao!u3{Z>u8^CRb
za4r_O0G5F=Fb>QH=V4$7c*=^_72Y#o6*vN>fH|NJOaePVU+A3!Bh3PLzzuL3oB^sp
z1=tJ106AbDIQbSq&8ZL3iXPPgwVbiOikerK)Jt{YOJqL~?$v^N_{$CKs)OpAnopu6
zqreN$&*yDqp$;^FZQvkDlF|=`x~{&qaBrwpb)|*DAK(LojwKJ8`E&390000<MNUMn
GLSTYh7n*PY

diff --git a/include/utils/config.hpp b/include/utils/config.hpp
index 4f460b2..3d10aa1 100644
--- a/include/utils/config.hpp
+++ b/include/utils/config.hpp
@@ -87,7 +87,7 @@ private:
 	nlohmann::json json;
 	bool changesMade = false;
 
-	std::string v_language = "en", v_lastStore = "universal-db-beta.unistore",
+	std::string v_language = "en", v_lastStore = "universal-db.unistore",
 				v_3dsxPath = "sdmc:/3ds", v_ndsPath = "sdmc:", v_archivePath = "sdmc:";
 	bool v_list = false, v_autoUpdate = true, v_metadata = true, v_updateCheck = true, v_showBg = false;
 };
diff --git a/source/screens/mainScreen.cpp b/source/screens/mainScreen.cpp
index bed200e..af72463 100644
--- a/source/screens/mainScreen.cpp
+++ b/source/screens/mainScreen.cpp
@@ -46,31 +46,31 @@ MainScreen::MainScreen() {
 	this->meta = std::make_unique<Meta>();
 
 	/* Check if lastStore is accessible. */
-	if (config->lastStore() != "universal-db-beta.unistore" || config->lastStore() != "") {
+	if (config->lastStore() != "universal-db.unistore" || config->lastStore() != "") {
 		if (access((std::string(_STORE_PATH) + config->lastStore()).c_str(), F_OK) != 0) {
-			config->lastStore("universal-db-beta.unistore");
+			config->lastStore("universal-db.unistore");
 
 		} else {
 			/* check version and file here. */
 			const UniStoreInfo info = GetInfo((std::string(_STORE_PATH) + config->lastStore()), config->lastStore());
 
 			if (info.Version != 3) {
-				config->lastStore("universal-db-beta.unistore");
+				config->lastStore("universal-db.unistore");
 			}
 
 			if (info.File != "") { // Ensure to check for this.
 				if ((info.File.find("/") != std::string::npos)) {
-					config->lastStore("universal-db-beta.unistore"); // It does contain a '/' which is invalid.
+					config->lastStore("universal-db.unistore"); // It does contain a '/' which is invalid.
 				}
 			}
 		}
 	}
 
 	/* If Universal DB --> Get! */
-	if (config->lastStore() == "universal-db-beta.unistore" || config->lastStore() == "") {
-		if (access("sdmc:/3ds/Universal-Updater/stores/universal-db-beta.unistore", F_OK) != 0) {
+	if (config->lastStore() == "universal-db.unistore" || config->lastStore() == "") {
+		if (access("sdmc:/3ds/Universal-Updater/stores/universal-db.unistore", F_OK) != 0) {
 			std::string tmp = ""; // Just a temp.
-			DownloadUniStore("https://db.universal-team.net/unistore/universal-db-beta.unistore", -1, tmp, true, true);
+			DownloadUniStore("https://db.universal-team.net/unistore/universal-db.unistore", -1, tmp, true, true);
 			DownloadSpriteSheet("https://db.universal-team.net/unistore/universal-db.t3x", "universal-db.t3x");
 		}
 	}
diff --git a/source/utils/download.cpp b/source/utils/download.cpp
index d6adbaa..a53b6aa 100644
--- a/source/utils/download.cpp
+++ b/source/utils/download.cpp
@@ -147,7 +147,6 @@ Result downloadToFile(const std::string &url, const std::string &path) {
 	int res;
 
 	printf("Downloading from:\n%s\nto:\n%s\n", url.c_str(), path.c_str());
-	const char *filepath = path.c_str();
 
 	void *socubuf = memalign(0x1000, 0x100000);
 	if (!socubuf) {
@@ -161,9 +160,17 @@ Result downloadToFile(const std::string &url, const std::string &path) {
 		goto exit;
 	}
 
-	makeDirs(strdup(filepath));
+	/* make directories. */
+	for (char *slashpos = strchr(path.c_str() + 1, '/'); slashpos != NULL; slashpos = strchr(slashpos + 1, '/')) {
+		char bak = *(slashpos);
+		*(slashpos) = '\0';
 
-	downfile = fopen(filepath, "wb");
+		mkdir(path.c_str(), 0777);
+
+		*(slashpos) = bak;
+	}
+
+	downfile = fopen(path.c_str(), "wb");
 	if (!downfile) {
 		retcode = -2;
 		goto exit;