enh - batch restore - mocked version

include/ApplicationState.h

@@ -27,4 +27,5 @@ class ApplicationState {
 
     virtual void render() = 0;
     virtual eSubState update(Input *input) = 0;
+
 };

include/BackupSetList.h

@@ -93,6 +93,7 @@ class BackupSetList {
 
     static const std::string ROOT_BS;
     static std::string getBackupSetSubPath() { return backupSetSubPath; };
+    static std::string getBackupSetPath() { return currentBackupSetList->backupSetListRoot+backupSetSubPath; };
     static std::string getBackupSetEntry()  { return backupSetEntry; };
     static std::string getBackupSetSubPath(int i);
     static void setBackupSetEntry(int i);

include/menu/BRTitleSelectState.h

@@ -0,0 +1,61 @@
+#pragma once
+
+#include <ApplicationState.h>
+#include <memory>
+#include <savemng.h>
+#include <utils/InputUtils.h>
+#include <utils/LanguageUtils.h>
+#include <vector>
+
+class BRTitleSelectState : public ApplicationState {
+public:
+    BRTitleSelectState(int sduser, int wiiuuser, bool common, bool wipeBeforeRestore, bool fullBackup,Title *titles, int titlesCount);
+
+    enum eState {
+        STATE_BATCH_RESTORE_TITLE_SELECT,
+        STATE_DO_SUBSTATE,
+    };
+
+    void render() override;
+    ApplicationState::eSubState update(Input *input) override;
+
+private:
+    std::unique_ptr<ApplicationState> subState{};
+    eState state = STATE_BATCH_RESTORE_TITLE_SELECT;
+
+
+    int sduser;
+    int wiiuuser;
+    bool common;
+    bool wipeBeforeRestore;
+    bool fullBackup;
+    Title *titles;
+    int titlesCount;
+
+
+    std::vector<const char *> sortNames = {LanguageUtils::gettext("None"),
+                                           LanguageUtils::gettext("Name"),
+                                           LanguageUtils::gettext("Storage"),
+                                           LanguageUtils::gettext("Storage+Name")};
+
+    int titleSort = 1;
+    int scroll = 0;
+    int cursorPos = 0;
+    bool sortAscending = true;
+    int targ = 0;
+
+    bool noTitles = false;
+
+    std::vector<int> c2t;
+    int candidatesCount;
+
+    void updateC2t();
+
+    std::vector<const char*> titleStateAfterBR = {
+        " ",
+        " > Aborted",
+        " > OK",
+        " > WR",
+        " > KO"
+    };
+};

include/menu/BackupSetListState.h

@@ -2,14 +2,14 @@
 
 #include <ApplicationState.h>
 #include <memory>
+#include <savemng.h>
 #include <utils/InputUtils.h>
 
-
-
-
 class BackupSetListState : public ApplicationState {
 public:
     BackupSetListState();
+    BackupSetListState(Title *titles, int titlesCount);
+
     static void resetCursorPosition();
     static void resetCursorAndScroll();
     enum eState {
@@ -29,6 +29,7 @@ class BackupSetListState : public ApplicationState {
     std::unique_ptr<ApplicationState> subState{};
     eState state = STATE_BACKUPSET_MENU;
     eSubstateCalled substateCalled = NONE;
+    bool finalScreen;
 
     bool sortAscending;
 
@@ -39,4 +40,7 @@ class BackupSetListState : public ApplicationState {
 
     std::string tag;
     std::string newTag;
+
+    Title *titles;
+    int titlesCount;
 };

include/menu/BatchRestoreOptions.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <ApplicationState.h>
+#include <memory>
+#include <set>
+#include <algorithm>
+#include <utils/InputUtils.h>
+#include <savemng.h>
+
+class BatchRestoreOptions : public ApplicationState {
+public:
+    BatchRestoreOptions(Title *titles, int titlesCount);
+
+    enum eState {
+        STATE_BATCH_RESTORE_OPTIONS_MENU,
+        STATE_DO_SUBSTATE,
+    };
+
+    void render() override;
+    ApplicationState::eSubState update(Input *input) override;
+    std::string tag;
+
+private:
+    std::unique_ptr<ApplicationState> subState{};
+    eState state = STATE_BATCH_RESTORE_OPTIONS_MENU;
+
+    int8_t wiiuuser = -1;
+    int8_t sduser = -1;
+    bool common = false;
+
+    bool wipeBeforeRestore = true;
+    bool fullBackup = true;
+    std::set<std::string,std::less<std::string>> batchSDUsers;
+
+    Title *titles;
+    int titlesCount = 0;
+
+    int cursorPos = 0;
+};

include/menu/BatchRestoreState.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <ApplicationState.h>
+#include <memory>
+#include <savemng.h>
+#include <utils/InputUtils.h>
+
+class BatchRestoreState : public ApplicationState {
+public:
+    BatchRestoreState(Title *wiiutitles, Title *wiititles, int wiiuTitlesCount, int vWiiTitlesCount) : wiiutitles(wiiutitles),
+                                                                                                   wiititles(wiititles),
+                                                                                                   wiiuTitlesCount(wiiuTitlesCount),
+                                                                                                   vWiiTitlesCount(vWiiTitlesCount) {}
+    enum eState {
+        STATE_BATCH_RESTORE_MENU,
+        STATE_DO_SUBSTATE,
+    };
+
+    void render() override;
+    ApplicationState::eSubState update(Input *input) override;
+    std::string tag;
+
+private:
+    std::unique_ptr<ApplicationState> subState{};
+    eState state = STATE_BATCH_RESTORE_MENU;
+
+    Title *wiiutitles;
+    Title *wiititles;
+
+    int wiiuTitlesCount;
+    int vWiiTitlesCount;
+};

include/savemng.h

@@ -23,6 +23,23 @@
 #define M_OFF            1
 #define Y_OFF            1
 
+enum eBatchRestoreState {
+    NOT_TRIED = 0,
+    ABORTED = 1,
+    OK = 2,
+    WR = 3,
+    KO = 4
+};
+
+struct backupInfo {
+    bool hasBatchBackup;
+    bool candidateToBeRestored;
+    bool selected;
+    bool hasUserSavedata;
+    bool hasCommonSavedata;
+    eBatchRestoreState batchRestoreState; 
+};
+
 struct Title {
     uint32_t highID;
     uint32_t lowID;
@@ -37,6 +54,7 @@ struct Title {
     uint8_t *iconBuf;
     uint64_t accountSaveSize;
     uint32_t groupID;
+    backupInfo currentBackup;
 };
 
 struct Saves {
@@ -119,6 +137,7 @@ bool getLoadiineGameSaveDir(char *out, const char *productCode, const char *long
 bool getLoadiineSaveVersionList(int *out, const char *gamePath);
 bool isSlotEmpty(uint32_t highID, uint32_t lowID, uint8_t slot);
 bool isSlotEmpty(uint32_t highID, uint32_t lowID, uint8_t slot, const std::string &batchDatetime);
+bool folderEmpty(const char *fPath);
 bool hasCommonSave(Title *title, bool inSD, bool iine, uint8_t slot, int version);
 void copySavedata(Title *title, Title *titled, int8_t wiiuuser, int8_t wiiuuser_d, bool common) __attribute__((hot));
 std::string getNowDateForFolder() __attribute__((hot));
@@ -128,8 +147,8 @@ void writeMetadata(uint32_t highID,uint32_t lowID,uint8_t slot,bool isUSB,const
 void writeBackupAllMetadata(const std::string & Date);
 void backupAllSave(Title *titles, int count, const std::string &batchDatetime) __attribute__((hot));
 void backupSavedata(Title *title, uint8_t slot, int8_t wiiuuser, bool common) __attribute__((hot));
-void restoreSavedata(Title *title, uint8_t slot, int8_t sduser, int8_t wiiuuser, bool common) __attribute__((hot));
-void wipeSavedata(Title *title, int8_t wiiuuser, bool common) __attribute__((hot));
+int restoreSavedata(Title *title, uint8_t slot, int8_t sduser, int8_t wiiuuser, bool common, bool interactive = true) __attribute__((hot));
+int wipeSavedata(Title *title, int8_t wiiuuser, bool common, bool interactive = true) __attribute__((hot));
 void importFromLoadiine(Title *title, bool common, int version);
 void exportToLoadiine(Title *title, bool common, int version);
 int checkEntry(const char *fPath);

src/main.cpp

@@ -19,7 +19,7 @@
 #include <coreinit/mcp.h>
 #include <coreinit/screen.h>
 
-//#define DEBUG
+#define DEBUG
 
 #ifdef DEBUG
 #include <whb/log_udp.h>
@@ -415,6 +415,7 @@ int main() {
 
 #ifdef DEBUG    
     WHBLogUdpInit();
+    WHBLogPrintf("Hello from savemii!");
 #endif
 
     AXInit();