mirrors/AIO-switch-updater
1
0
Fork 0
mirror of https://github.com/HamletDuFromage/aio-switch-updater.git synced 2024-11-25 02:52:05 +00:00
Code Issues Releases Activity

parse files in json order for batch copy

Browse source
This commit is contained in:
flb 2021-02-16 14:42:43 +01:00
parent bb97a32886
commit a228cf5c7b
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -22,7 +22,7 @@ DATA := data
INCLUDES := include lib/zipper/include INCLUDES := include lib/zipper/include
APP_TITLE := All-in-One Switch Updater APP_TITLE := All-in-One Switch Updater
APP_AUTHOR := HamletDuFromage APP_AUTHOR := HamletDuFromage
APP_VERSION := 2.3.0 APP_VERSION := 2.3.1
TARGET := $(notdir $(CURDIR)) TARGET := $(notdir $(CURDIR))
ROMFS := resources ROMFS := resources

1
resources/i18n/en-US/menus.json
View file

@ -74,6 +74,7 @@
"v2_2_0_text": "\uE016 For cheatslips.com, the build ID of a running game will now be fetched, allowing you to access cheatsheets even if the build ID isn't listed in the versions database.", "v2_2_0_text": "\uE016 For cheatslips.com, the build ID of a running game will now be fetched, allowing you to access cheatsheets even if the build ID isn't listed in the versions database.",
"v2_2_1_text": "\uE016 Fixed non Atmosphere CFW being wrongly categorised as ams.", "v2_2_1_text": "\uE016 Fixed non Atmosphere CFW being wrongly categorised as ams.",
"v2_3_0_text": "\uE016 Added possibility to copy a list of files to custom locations. This may come in handy for trinket/esoteric bootloader users.\n\uE016 Added warning screen on launch.\n\uE016 Few UI tweaks.\n\uE016 Traditional Chinese translation updated (qazrfv1234)", "v2_3_0_text": "\uE016 Added possibility to copy a list of files to custom locations. This may come in handy for trinket/esoteric bootloader users.\n\uE016 Added warning screen on launch.\n\uE016 Few UI tweaks.\n\uE016 Traditional Chinese translation updated (qazrfv1234)",
"v2_3_1_text": "\uE016 Files for batch copy are now copied according to the json order (formerly alphabetical order).",
"Ok_button": "Ok", "Ok_button": "Ok",
"cheats_page.cpp":"", "cheats_page.cpp":"",

3
source/changelog_page.cpp
View file

@ -103,6 +103,9 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true)
verTitles.push_back("v2.3.0"); verTitles.push_back("v2.3.0");
changes.push_back("menus/v2_3_0_text"_i18n ); changes.push_back("menus/v2_3_0_text"_i18n );
verTitles.push_back("v2.3.1");
changes.push_back("menus/v2_3_1_text"_i18n );
int nbVersions = verTitles.size(); int nbVersions = verTitles.size();

5
source/utils.cpp
View file

@ -366,7 +366,7 @@ std::string readVersion(const char* path){
} }
std::string copyFiles(const char* path) { std::string copyFiles(const char* path) {
nlohmann::json toMove; nlohmann::ordered_json toMove;
std::ifstream f(COPY_FILES_JSON); std::ifstream f(COPY_FILES_JSON);
f >> toMove; f >> toMove;
f.close(); f.close();
@ -374,7 +374,8 @@ std::string copyFiles(const char* path) {
for (auto it = toMove.begin(); it != toMove.end(); ++it) { for (auto it = toMove.begin(); it != toMove.end(); ++it) {
if(std::filesystem::exists(it.key())) { if(std::filesystem::exists(it.key())) {
createTree(std::string(std::filesystem::path(it.value().get<std::string>()).parent_path()) + "/"); createTree(std::string(std::filesystem::path(it.value().get<std::string>()).parent_path()) + "/");
cp(it.key().c_str(), it.value().get<std::string>().c_str()); //cp(it.key().c_str(), it.value().get<std::string>().c_str());
std::cout << it.key() << it.value().get<std::string>() << std::endl;
} }
else { else {
error += it.key() + "\n"; error += it.key() + "\n";