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 1167bfe..0000000 Binary files a/assets/gfx/sprites/sheet.png and /dev/null differ 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(); /* 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;