enh - batch restore - mocked version - fix

Xpl0itU · Oct 20, 2024 · 0933734 · 0933734
1 parent 42f6baa
commit 0933734
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/include/menu/BackupSetListState.h b/include/menu/BackupSetListState.h
@@ -8,7 +8,7 @@
 class BackupSetListState : public ApplicationState {
 public:
     BackupSetListState();
-    BackupSetListState(Title *titles, int titlesCount);
+    BackupSetListState(Title *titles, int titlesCount, bool vWiiRestore);
 
     static void resetCursorPosition();
     static void resetCursorAndScroll();
@@ -30,7 +30,7 @@ class BackupSetListState : public ApplicationState {
     eState state = STATE_BACKUPSET_MENU;
     eSubstateCalled substateCalled = NONE;
     bool finalScreen;
-
+    
     bool sortAscending;
 
     static int cursorPos;
@@ -43,4 +43,6 @@ class BackupSetListState : public ApplicationState {
 
     Title *titles;
     int titlesCount;
+
+    bool vWiiRestore;
 };
diff --git a/include/menu/BatchRestoreOptions.h b/include/menu/BatchRestoreOptions.h
@@ -9,7 +9,7 @@
 
 class BatchRestoreOptions : public ApplicationState {
 public:
-    BatchRestoreOptions(Title *titles, int titlesCount);
+    BatchRestoreOptions(Title *titles, int titlesCount, bool vWiiRestore);
 
     enum eState {
         STATE_BATCH_RESTORE_OPTIONS_MENU,
@@ -36,4 +36,6 @@ class BatchRestoreOptions : public ApplicationState {
     int titlesCount = 0;
 
     int cursorPos = 0;
+
+    bool vWiiRestore;
 };
diff --git a/src/menu/BRTitleSelectState.cpp b/src/menu/BRTitleSelectState.cpp
@@ -120,7 +120,7 @@ void BRTitleSelectState::render() {
                 consolePrintPos(M_OFF, i + 2, "   %s %s%s%s [%s]", this->titles[c2t[i + this->scroll]].shortName,
                                 this->titles[c2t[i + this->scroll]].isTitleOnUSB ? "(USB)" : "(NAND)",
                                 this->titles[c2t[i + this->scroll]].isTitleDupe ? " [D]" : "",
-                                this->titles[c2t[i + this->scroll]].currentBackup.selected ? LanguageUtils::gettext(" [Restore]" : LanguageUtils::gettext(" [Skip]"),
+                                this->titles[c2t[i + this->scroll]].currentBackup.selected ? LanguageUtils::gettext(" [Restore]" ) : LanguageUtils::gettext(" [Skip]"),
                                 titleStateAfterBR[this->titles[c2t[i + this->scroll]].currentBackup.batchRestoreState]);
 
             else

diff --git a/src/menu/BackupSetListState.cpp b/src/menu/BackupSetListState.cpp
@@ -21,9 +21,10 @@ BackupSetListState::BackupSetListState() {
     this->sortAscending = BackupSetList::sortAscending;
 }
 
-BackupSetListState::BackupSetListState(Title *titles, int titlesCount) :
+BackupSetListState::BackupSetListState(Title *titles, int titlesCount, bool vWiiRestore) :
         titles(titles),
-        titlesCount(titlesCount) {
+        titlesCount(titlesCount),
+        vWiiRestore(vWiiRestore) {
     finalScreen = false;
 }
 
@@ -100,7 +101,7 @@ ApplicationState::eSubState BackupSetListState::update(Input *input) {
             else    // is a step in batchRestore
             {
                 this->state = STATE_DO_SUBSTATE;
-                this->subState = std::make_unique<BatchRestoreOptions>(titles, titlesCount);
+                this->subState = std::make_unique<BatchRestoreOptions>(titles, titlesCount, vWiiRestore);
             }      
         }
         if (input->get(TRIGGER, PAD_BUTTON_Y)) {

diff --git a/src/menu/BatchRestoreOptions.cpp b/src/menu/BatchRestoreOptions.cpp
@@ -15,9 +15,9 @@ extern Account *sdacc;
 extern uint8_t sdaccn;
 
 BatchRestoreOptions::BatchRestoreOptions(Title *titles, 
-    int titlesCount) : titles(titles),
-                        titlesCount(titlesCount) {
-
+    int titlesCount,bool  vWiiRestore) : titles(titles),
+                        titlesCount(titlesCount), vWiiRestore(vWiiRestore) {
+    WHBLogPrintf("batchRestore constructor");
     for (int i = 0; i<this->titlesCount; i++) {
         this->titles[i].currentBackup= {
             .hasBatchBackup = false,

diff --git a/src/menu/BatchRestoreState.cpp b/src/menu/BatchRestoreState.cpp
@@ -37,11 +37,11 @@ ApplicationState::eSubState BatchRestoreState::update(Input *input) {
             switch (cursorPos) {
                 case 0:
                     this->state = STATE_DO_SUBSTATE;
-                    this->subState = std::make_unique<BackupSetListState>(this->wiiutitles, this->wiiuTitlesCount);
+                    this->subState = std::make_unique<BackupSetListState>(this->wiiutitles, this->wiiuTitlesCount, false);
                     break;
                 case 1:
                     this->state = STATE_DO_SUBSTATE;
-                    this->subState = std::make_unique<BackupSetListState>(this->wiititles, this->vWiiTitlesCount);
+                    this->subState = std::make_unique<BackupSetListState>(this->wiititles, this->vWiiTitlesCount, true);
                     break;
                 default:
                     return SUBSTATE_RUNNING;