Merge pull request #68 from w3irDv/enh/io-errors

More controls on createFolders
Xpl0itU · Jan 19, 2025 · 58b1945 · 58b1945
2 parents 499b808 + fbdf67e
commit 58b1945
Show file tree

Hide file tree

Showing 15 changed files with 121 additions and 34 deletions.
diff --git a/include/savemng.h b/include/savemng.h
@@ -168,4 +168,5 @@ Account *getWiiUacc();
 Account *getSDacc();
 void deleteSlot(Title *title, uint8_t slot);
 bool wipeBackupSet(const std::string &subPath);
-void splitStringWithNewLines(const std::string &input, std::string &output);
+void splitStringWithNewLines(const std::string &input, std::string &output);
+void sdWriteDisclaimer(); 
diff --git a/include/version.h b/include/version.h
@@ -3,3 +3,4 @@
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 6
 #define VERSION_MICRO 5
+#define VERSION_FIX 'i'
diff --git a/meta/hbl/meta.xml b/meta/hbl/meta.xml
@@ -2,8 +2,8 @@
 <app version="1">
     <name>SaveMii WUT</name>
     <coder>DaThinkingChair,w3irDv</coder>
-    <version>1.6.5</version>
-    <release_date>202408240000</release_date>
+    <version>1.6.5.1</version>
+    <release_date>202501190000</release_date>
     <short_description>WiiU/vWii Save Manager</short_description>
     <long_description>WiiU/vWii Save Manager
 

diff --git a/romfs/languages/SChinese.json b/romfs/languages/SChinese.json
@@ -200,13 +200,17 @@
   "Initializing ROMFS": "Initializing ROMFS",
   "Initializing WPAD and KAPD": "Initializing WPAD and KAPD",
   "Initializing loadWiiU Titles": "Initializing loadWiiU Titles",
-  "Please wait. First write to SD may be slow.": "Please wait. First write to SD may be slow.",
   "Press \ue000 to continue": "Press \ue000 to continue",
   "Read error\n%s": "Read error\n%s",
   "Wipe BackupSet - Hm, are you REALLY sure?": "Wipe BackupSet - Hm, are you REALLY sure?",
   "Write error\n%s": "Write error\n%s",
   "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back": "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back",
   "\ue003 Confirm - \ue001 Cancel": "\ue003 Confirm - \ue001 Cancel",
+  "Error while creating final folder:\n\n%s\n%lx": "Error while creating final folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%lx": "Error while creating folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%s": "Error while creating folder:\n\n%s\n%s",
+  "Initializing FS": "Initializing FS",
+  "Please wait. First write to (some) SDs can take several seconds.": "Please wait. First write to (some) SDs can take several seconds.",
   "KB_N_0": "1234567890-=",
   "KB_N_1": "qwertyuiop[]|",
   "KB_N_2": "asdfghjkl;'",

diff --git a/romfs/languages/TChinese.json b/romfs/languages/TChinese.json
@@ -194,13 +194,17 @@
   "Initializing ROMFS": "Initializing ROMFS",
   "Initializing WPAD and KAPD": "Initializing WPAD and KAPD",
   "Initializing loadWiiU Titles": "Initializing loadWiiU Titles",
-  "Please wait. First write to SD may be slow.": "Please wait. First write to SD may be slow.",
   "Press \ue000 to continue": "Press \ue000 to continue",
   "Read error\n%s": "Read error\n%s",
   "Wipe BackupSet - Hm, are you REALLY sure?": "Wipe BackupSet - Hm, are you REALLY sure?",
   "Write error\n%s": "Write error\n%s",
   "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back": "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back",
   "\ue003 Confirm - \ue001 Cancel": "\ue003 Confirm - \ue001 Cancel",
+  "Error while creating final folder:\n\n%s\n%lx": "Error while creating final folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%lx": "Error while creating folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%s": "Error while creating folder:\n\n%s\n%s",
+  "Initializing FS": "Initializing FS",
+  "Please wait. First write to (some) SDs can take several seconds.": "Please wait. First write to (some) SDs can take several seconds.",
   "KB_N_0": "1234567890-=",
   "KB_N_1": "qwertyuiop[]|",
   "KB_N_2": "asdfghjkl;'",

diff --git a/romfs/languages/english.json b/romfs/languages/english.json
@@ -109,7 +109,6 @@
   "Wipe BackupSet - Are you sure?": "Wipe BackupSet - Are you sure?",
   "Wipe BackupSet - Hm, are you REALLY sure?": "Wipe BackupSet - Hm, are you REALLY sure?",
   "Initializing BackupSets metadata.": "Initializing BackupSets metadata.", 
-  "Please wait. First write to SD may be slow.": "Please wait. First write to SD may be slow.",
   "Filter BackupSets": "Filter BackupSets",
   "Show only BackupSets satisfying all these conditions:": "Show only BackupSets satisfying all these conditions:",
   "Console: %s": "Console: %s",
@@ -213,6 +212,11 @@
   "Read error\n%s": "Read error\n%s",
   "Write error\n%s": "Write error\n%s",
   "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back": "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back",
+  "Error while creating final folder:\n\n%s\n%lx": "Error while creating final folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%lx": "Error while creating folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%s": "Error while creating folder:\n\n%s\n%s",
+  "Initializing FS": "Initializing FS",
+  "Please wait. First write to (some) SDs can take several seconds.": "Please wait. First write to (some) SDs can take several seconds.",
   "KB_N_0": "1234567890-=",
   "KB_N_1": "qwertyuiop[]|",
   "KB_N_2": "asdfghjkl;'",

diff --git a/romfs/languages/german.json b/romfs/languages/german.json
@@ -198,13 +198,17 @@
   "Initializing ROMFS": "Initializing ROMFS",
   "Initializing WPAD and KAPD": "Initializing WPAD and KAPD",
   "Initializing loadWiiU Titles": "Initializing loadWiiU Titles",
-  "Please wait. First write to SD may be slow.": "Please wait. First write to SD may be slow.",
   "Press \ue000 to continue": "Press \ue000 to continue",
   "Read error\n%s": "Read error\n%s",
   "Wipe BackupSet - Hm, are you REALLY sure?": "Wipe BackupSet - Hm, are you REALLY sure?",
   "Write error\n%s": "Write error\n%s",
   "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back": "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back",
   "\ue003 Confirm - \ue001 Cancel": "\ue003 Confirm - \ue001 Cancel",
+  "Error while creating final folder:\n\n%s\n%lx": "Error while creating final folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%lx": "Error while creating folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%s": "Error while creating folder:\n\n%s\n%s",
+  "Initializing FS": "Initializing FS",
+  "Please wait. First write to (some) SDs can take several seconds.": "Please wait. First write to (some) SDs can take several seconds.",
   "KB_N_0": "1234567890-=",
   "KB_N_1": "qwertyuiop[]|",
   "KB_N_2": "asdfghjkl;'",

diff --git a/romfs/languages/italian.json b/romfs/languages/italian.json
@@ -199,13 +199,17 @@
   "Initializing ROMFS": "Initializing ROMFS",
   "Initializing WPAD and KAPD": "Initializing WPAD and KAPD",
   "Initializing loadWiiU Titles": "Initializing loadWiiU Titles",
-  "Please wait. First write to SD may be slow.": "Please wait. First write to SD may be slow.",
   "Press \ue000 to continue": "Press \ue000 to continue",
   "Read error\n%s": "Read error\n%s",
   "Wipe BackupSet - Hm, are you REALLY sure?": "Wipe BackupSet - Hm, are you REALLY sure?",
   "Write error\n%s": "Write error\n%s",
   "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back": "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back",
   "\ue003 Confirm - \ue001 Cancel": "\ue003 Confirm - \ue001 Cancel",
+  "Error while creating final folder:\n\n%s\n%lx": "Error while creating final folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%lx": "Error while creating folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%s": "Error while creating folder:\n\n%s\n%s",
+  "Initializing FS": "Initializing FS",
+  "Please wait. First write to (some) SDs can take several seconds.": "Please wait. First write to (some) SDs can take several seconds.",
   "KB_N_0": "1234567890-=",
   "KB_N_1": "qwertyuiop[]|",
   "KB_N_2": "asdfghjkl;'",

diff --git a/romfs/languages/japanese.json b/romfs/languages/japanese.json
@@ -194,13 +194,17 @@
   "Initializing ROMFS": "Initializing ROMFS",
   "Initializing WPAD and KAPD": "Initializing WPAD and KAPD",
   "Initializing loadWiiU Titles": "Initializing loadWiiU Titles",
-  "Please wait. First write to SD may be slow.": "Please wait. First write to SD may be slow.",
   "Press \ue000 to continue": "Press \ue000 to continue",
   "Read error\n%s": "Read error\n%s",
   "Wipe BackupSet - Hm, are you REALLY sure?": "Wipe BackupSet - Hm, are you REALLY sure?",
   "Write error\n%s": "Write error\n%s",
   "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back": "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back",
   "\ue003 Confirm - \ue001 Cancel": "\ue003 Confirm - \ue001 Cancel",
+  "Error while creating final folder:\n\n%s\n%lx": "Error while creating final folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%lx": "Error while creating folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%s": "Error while creating folder:\n\n%s\n%s",
+  "Initializing FS": "Initializing FS",
+  "Please wait. First write to (some) SDs can take several seconds.": "Please wait. First write to (some) SDs can take several seconds.",
   "KB_N_0": "1234567890-=",
   "KB_N_1": "qwertyuiop[]|",
   "KB_N_2": "asdfghjkl;'",

diff --git a/romfs/languages/korean.json b/romfs/languages/korean.json
@@ -194,13 +194,17 @@
   "Initializing ROMFS": "Initializing ROMFS",
   "Initializing WPAD and KAPD": "Initializing WPAD and KAPD",
   "Initializing loadWiiU Titles": "Initializing loadWiiU Titles",
-  "Please wait. First write to SD may be slow.": "Please wait. First write to SD may be slow.",
   "Press \ue000 to continue": "Press \ue000 to continue",
   "Read error\n%s": "Read error\n%s",
   "Wipe BackupSet - Hm, are you REALLY sure?": "Wipe BackupSet - Hm, are you REALLY sure?",
   "Write error\n%s": "Write error\n%s",
   "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back": "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back",
   "\ue003 Confirm - \ue001 Cancel": "\ue003 Confirm - \ue001 Cancel",
+  "Error while creating final folder:\n\n%s\n%lx": "Error while creating final folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%lx": "Error while creating folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%s": "Error while creating folder:\n\n%s\n%s",
+  "Initializing FS": "Initializing FS",
+  "Please wait. First write to (some) SDs can take several seconds.": "Please wait. First write to (some) SDs can take several seconds.",
   "KB_N_0": "1234567890-=",
   "KB_N_1": "qwertyuiop[]|",
   "KB_N_2": "asdfghjkl;'",

diff --git a/romfs/languages/portuguese.json b/romfs/languages/portuguese.json
@@ -198,13 +198,17 @@
   "Initializing ROMFS": "Initializing ROMFS",
   "Initializing WPAD and KAPD": "Initializing WPAD and KAPD",
   "Initializing loadWiiU Titles": "Initializing loadWiiU Titles",
-  "Please wait. First write to SD may be slow.": "Please wait. First write to SD may be slow.",
   "Press \ue000 to continue": "Press \ue000 to continue",
   "Read error\n%s": "Read error\n%s",
   "Wipe BackupSet - Hm, are you REALLY sure?": "Wipe BackupSet - Hm, are you REALLY sure?",
   "Write error\n%s": "Write error\n%s",
   "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back": "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back",
   "\ue003 Confirm - \ue001 Cancel": "\ue003 Confirm - \ue001 Cancel",
+  "Error while creating final folder:\n\n%s\n%lx": "Error while creating final folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%lx": "Error while creating folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%s": "Error while creating folder:\n\n%s\n%s",
+  "Initializing FS": "Initializing FS",
+  "Please wait. First write to (some) SDs can take several seconds.": "Please wait. First write to (some) SDs can take several seconds.",
   "KB_N_0": "1234567890-=",
   "KB_N_1": "qwertyuiop[]|",
   "KB_N_2": "asdfghjkl;'",

diff --git a/romfs/languages/russian.json b/romfs/languages/russian.json
@@ -147,7 +147,6 @@
   "No titles found": "No titles found",
   "No vWii titles found.": "No vWii titles found.",
   "No": "No",
-  "Please wait. First write to SD may be slow.": "Please wait. First write to SD may be slow.",
   "Portuguese": "Portuguese",
   "Press \ue000 to continue": "Press \ue000 to continue",
   "Press \ue044 to exit.": "Press \ue044 to exit.",
@@ -212,6 +211,11 @@
   "Read error\n%s": "Read error\n%s",
   "Write error\n%s": "Write error\n%s",
   "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back": "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back",
+  "Error while creating final folder:\n\n%s\n%lx": "Error while creating final folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%lx": "Error while creating folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%s": "Error while creating folder:\n\n%s\n%s",
+  "Initializing FS": "Initializing FS",
+  "Please wait. First write to (some) SDs can take several seconds.": "Please wait. First write to (some) SDs can take several seconds.",
   "KB_N_0": "1234567890-=",
   "KB_N_1": "qwertyuiop[]|",
   "KB_N_2": "asdfghjkl;'",

diff --git a/romfs/languages/spanish.json b/romfs/languages/spanish.json
@@ -154,7 +154,6 @@
   "No titles found": "No titles found",
   "No vWii titles found.": "No vWii titles found.",
   "No": "No",
-  "Please wait. First write to SD may be slow.": "Please wait. First write to SD may be slow.",
   "Portuguese": "Portuguese",
   "Press \ue000 to continue": "Press \ue000 to continue",
   "Restore completed. Results:\n- OK: %d\n- Warning: %d\n- KO: %d\n- Aborted: %d\n- Skipped: %d\n": "Restore completed. Results:\n- OK: %d\n- Warning: %d\n- KO: %d\n- Aborted: %d\n- Skipped: %d\n",
@@ -206,6 +205,11 @@
   "Read error\n%s": "Read error\n%s",
   "Write error\n%s": "Write error\n%s",
   "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back": "\ue002: Change BackupSet  \ue000: Restore  \ue045 Tag Slot  \ue001: Back",
+  "Error while creating final folder:\n\n%s\n%lx": "Error while creating final folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%lx": "Error while creating folder:\n\n%s\n%lx",
+  "Error while creating folder:\n\n%s\n%s": "Error while creating folder:\n\n%s\n%s",
+  "Initializing FS": "Initializing FS",
+  "Please wait. First write to (some) SDs can take several seconds.": "Please wait. First write to (some) SDs can take several seconds.",
   "KB_N_0": "1234567890-=",
   "KB_N_1": "qwertyuiop[]|",
   "KB_N_2": "asdfghjkl;'",

diff --git a/src/main.cpp b/src/main.cpp
@@ -41,7 +41,7 @@ static bool contains(const T (&arr)[N], const T &element) {
 }
 
 static void disclaimer() {
-    consolePrintPosAligned(13, 0, 1,"SaveMii v%u.%u.%u", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
+    consolePrintPosAligned(13, 0, 1,"SaveMii v%u.%u.%u%c", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO, VERSION_FIX);
     consolePrintPosAligned(14, 0, 1, LanguageUtils::gettext("Disclaimer:"));
     consolePrintPosAligned(15, 0, 1, LanguageUtils::gettext("There is always the potential for a brick."));
     consolePrintPosAligned(16, 0, 1,
@@ -524,7 +524,7 @@ int main() {
     disclaimer();
     DrawUtils::drawTGA(298, 144, 1, icon_tga);
     consolePrintPosAligned(10, 0, 1, LanguageUtils::gettext("Initializing BackupSets metadata."));
-    consolePrintPosAligned(11, 0, 1, LanguageUtils::gettext("Please wait. First write to SD may be slow."));
+    consolePrintPosAligned(11, 0, 1, LanguageUtils::gettext("Please wait. First write to (some) SDs can take several seconds."));
     DrawUtils::endDraw();
 
     BackupSetList::initBackupSetList();
@@ -543,7 +543,7 @@ int main() {
             DrawUtils::beginDraw();
             DrawUtils::clear(COLOR_BACKGROUND);
 
-            consolePrintPos(0, 0, "SaveMii v%u.%u.%u", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
+            consolePrintPos(0, 0, "SaveMii v%u.%u.%u%c", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO, VERSION_FIX);
             consolePrintPos(0, 1, "----------------------------------------------------------------------------");
 
             DrawUtils::setRedraw(false);