Skip to content

Commit

Permalink
batch restore - mocked version - prompts and summary
Browse files Browse the repository at this point in the history
  • Loading branch information
@w3irDv
w3irDv committed Nov 12, 2024
1 parent e0684c5 commit 10fd4b5
Show file tree
Hide file tree
Showing 16 changed files with 341 additions and 91 deletions.
3 changes: 2 additions & 1 deletion include/menu/BRTitleSelectState.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class BRTitleSelectState : public ApplicationState {
public:
BRTitleSelectState(int sduser, int wiiuuser, bool common, bool wipeBeforeRestore, bool fullBackup,Title *titles, int titlesCount);
BRTitleSelectState(int sduser, int wiiuuser, bool common, bool wipeBeforeRestore, bool fullBackup,Title *titles, int titlesCount, bool isWiiUBatchRestore);

enum eState {
STATE_BATCH_RESTORE_TITLE_SELECT,
Expand All @@ -31,6 +31,7 @@ class BRTitleSelectState : public ApplicationState {
bool fullBackup;
Title *titles;
int titlesCount;
bool isWiiUBatchRestore;


std::vector<const char *> sortNames = {LanguageUtils::gettext("None"),
Expand Down
3 changes: 2 additions & 1 deletion include/savemng.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ std::string getUSB();
void consolePrintPos(int x, int y, const char *format, ...) __attribute__((hot));
bool promptConfirm(Style st, const std::string &question);
void promptError(const char *message, ...);
void promptMessage(Color bgcolor,const char *message, ...);
std::string getDynamicBackupPath(uint32_t highID, uint32_t lowID, uint8_t slot);
std::string getBatchBackupPath(uint32_t highID, uint32_t lowID, uint8_t slot, std::string datetime);
std::string getBatchBackupPathRoot(std::string datetime);
Expand All @@ -145,7 +146,7 @@ std::string getNowDateForFolder() __attribute__((hot));
std::string getNowDate() __attribute__((hot));
void writeMetadata(uint32_t highID,uint32_t lowID,uint8_t slot,bool isUSB) __attribute__((hot));
void writeMetadata(uint32_t highID,uint32_t lowID,uint8_t slot,bool isUSB,const std::string &batchDatetime) __attribute__((hot));
void writeBackupAllMetadata(const std::string & Date);
void writeBackupAllMetadata(const std::string & Date, const std::string & tag);
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));
int restoreSavedata(Title *title, uint8_t slot, int8_t sduser, int8_t wiiuuser, bool common, bool interactive = true) __attribute__((hot));
Expand Down
3 changes: 2 additions & 1 deletion include/utils/Colors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
#define COLOR_INFO Color(0x88CC88FF)
#define COLOR_KEY Color(0xFF3333FF)
#define COLOR_KEY_S Color(0xFF666600)
#define COLOR_KEY_C Color(0xFF0000FF)
#define COLOR_KEY_C Color(0xFF0000FF)
#define COLOR_BG_SUCCESS Color(0x00DD55FF)
14 changes: 10 additions & 4 deletions src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +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(14, 0, 1, LanguageUtils::gettext("Disclaimer:"));
consolePrintPosAligned(15, 0, 1, LanguageUtils::gettext("There is always the potential for a brick."));
consolePrintPosAligned(16, 0, 1,
Expand Down Expand Up @@ -226,6 +227,10 @@ static Title *loadWiiUTitles(int run) {

free(xmlBuf);
}
if (strlen(titles[wiiuTitlesCount].shortName) == 0u)
sprintf(titles[wiiuTitlesCount].shortName,"%08x%08x",
titles[wiiuTitlesCount].highID,
titles[wiiuTitlesCount].lowID);

titles[wiiuTitlesCount].isTitleDupe = false;
for (int i = 0; i < wiiuTitlesCount; i++) {
Expand All @@ -243,10 +248,7 @@ static Title *loadWiiUTitles(int run) {
titles[wiiuTitlesCount].isTitleOnUSB = isTitleOnUSB;
titles[wiiuTitlesCount].listID = wiiuTitlesCount;
if (loadTitleIcon(&titles[wiiuTitlesCount]) < 0)
titles[wiiuTitlesCount].iconBuf = nullptr;

//titles[wiiuTitlesCount].is_Wii = false;
WHBLogPrintf("count %d -- iconbuf %u",wiiuTitlesCount,titles[wiiuTitlesCount].iconBuf);
titles[wiiuTitlesCount].iconBuf = nullptr;

wiiuTitlesCount++;

Expand Down Expand Up @@ -347,6 +349,10 @@ static Title *loadWiiTitles() {
titles[i].shortName[k++] = 0x80 | (bnrBuf[j] & 0x3F);
}
}
if (strlen(titles[i].shortName) == 0u)
sprintf(titles[i].shortName,"%08x%08x",
titles[i].highID,
titles[i].lowID);

memset(titles[i].longName, 0, sizeof(titles[i].longName));
for (int j = 0x20, k = 0; j < 0x40; j++) {
Expand Down
167 changes: 137 additions & 30 deletions src/menu/BRTitleSelectState.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,29 @@
#define MAX_TITLE_SHOW 14

BRTitleSelectState::BRTitleSelectState(int sduser, int wiiuuser, bool common, bool wipeBeforeRestore, bool fullBackup,
Title *titles, int titlesCount) :
Title *titles, int titlesCount, bool isWiiUBatchRestore) :
sduser(sduser),
wiiuuser(wiiuuser),
common(common),
wipeBeforeRestore(wipeBeforeRestore),
fullBackup(fullBackup),
titles(titles),
titlesCount(titlesCount)
titlesCount(titlesCount),
isWiiUBatchRestore(isWiiUBatchRestore)
{
WHBLogPrintf("sduser %d",sduser);
WHBLogPrintf("wiiuuser %d",wiiuuser);
WHBLogPrintf("common %c",common ? '0':'1');
WHBLogPrintf("wipe %c",wipeBeforeRestore ? '0':'1');
WHBLogPrintf("tcount %u",titlesCount);
WHBLogPrintf("titles %u",titles);
bool test = false;

c2t.clear();
// from the subset of titles with backup data, filter out the ones without the specified user info
for (int i = 0; i < this->titlesCount; i++) {
WHBLogPrintf("processing %u",i);
WHBLogPrintf("has backup %u",i);
//WHBLogPrintf("processing %u",i);
//WHBLogPrintf("has backup %u",i);
this->titles[i].currentBackup.candidateToBeRestored = false;
this->titles[i].currentBackup.selected = false;
this->titles[i].currentBackup.hasUserSavedata = false;
Expand Down Expand Up @@ -77,7 +79,12 @@ BRTitleSelectState::BRTitleSelectState(int sduser, int wiiuuser, bool common, bo
WHBLogPrintf("init select wiiU - is wii %s",isWii ? "si" : "no");
this->titles[i].currentBackup.candidateToBeRestored = true; // backup has enough data to try restore
this->titles[i].currentBackup.selected = true; // from candidates list, user can select/deselest at wish

if (! test) {
this->titles[i].saveInit = false;
test = true;
}
if ( ! this->titles[i].saveInit )
this->titles[i].currentBackup.selected = false; // we discourage a restore to a not init titles
}
else
{
Expand Down Expand Up @@ -114,12 +121,22 @@ void BRTitleSelectState::render() {
return;
}
if (this->state == STATE_BATCH_RESTORE_TITLE_SELECT) {
DrawUtils::setFontColor(COLOR_INFO);
consolePrintPosAligned(0, 4, 1,LanguageUtils::gettext("Batch Restore - Select & Go"));
DrawUtils::setFontColor(COLOR_TEXT);
if ((this->titles == nullptr) || (this->titlesCount == 0 || (this->candidatesCount == 0))) {
promptError(LanguageUtils::gettext("No titles matching criterias found."));
DrawUtils::endDraw();
promptError(LanguageUtils::gettext("There are no titles matching selected filters."));
this->noTitles = true;
DrawUtils::beginDraw();
consolePrintPosAligned(8, 4, 1, LanguageUtils::gettext("No titles found"));
consolePrintPosAligned(17, 4, 1, LanguageUtils::gettext("Any Button: Back"));
return;
}
consolePrintPos(39, 0, LanguageUtils::gettext("%s Sort: %s \ue084"),
consolePrintPosAligned(39, 4, 2, LanguageUtils::gettext("%s Sort: %s \ue084"),
(this->titleSort > 0) ? (this->sortAscending ? "\ue083 \u2193" : "\ue083 \u2191") : "", this->sortNames[this->titleSort]);
std::string nxtAction;
std::string lastState;
for (int i = 0; i < MAX_TITLE_SHOW; i++) {
WHBLogPrintf("iteracio %d",i);
if (i + this->scroll < 0 || i + this->scroll >= (int) this->candidatesCount)
Expand All @@ -130,36 +147,62 @@ void BRTitleSelectState::render() {
WHBLogPrintf("scroll %d ",scroll);
WHBLogPrintf("c2t %d",c2t[i + this->scroll]);

if (!this->titles[c2t[i + this->scroll]].currentBackup.selected)
DrawUtils::setFontColor(static_cast<Color>(0xFFFF00FF));
if ( ! this->titles[c2t[i + this->scroll]].currentBackup.selected)
DrawUtils::setFontColor(static_cast<Color>(0x888800FF));
if (this->titles[c2t[i + this->scroll]].currentBackup.selected && ! this->titles[c2t[i + this->scroll]].saveInit)
DrawUtils::setFontColor(static_cast<Color>(0xFF8800FF));
if (strcmp(this->titles[c2t[i + this->scroll]].shortName, "DONT TOUCH ME") == 0)
DrawUtils::setFontColor(static_cast<Color>(0xFF0000FF));
if (this->titles[c2t[i + this->scroll]].currentBackup.batchRestoreState == KO)
DrawUtils::setFontColor(static_cast<Color>(0xFF0000FF));
if (this->titles[c2t[i + this->scroll]].currentBackup.batchRestoreState == OK)
DrawUtils::setFontColor(static_cast<Color>(0xFFFFFFFF));
WHBLogPrintf("nom");
if (strlen(this->titles[c2t[i + this->scroll]].shortName) != 0u) {
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]"),
titleStateAfterBR[this->titles[c2t[i + this->scroll]].currentBackup.batchRestoreState]);
WHBLogPrintf("shortname %s",this->titles[c2t[i + this->scroll]].shortName);
}
else {
consolePrintPos(M_OFF, i + 2, " %08lx%08lx", this->titles[c2t[i + this->scroll]].highID,
this->titles[c2t[i + this->scroll]].lowID);
WHBLogPrintf("nameid %08lx%08lx",this->titles[c2t[i + this->scroll]].highID,
this->titles[c2t[i + this->scroll]].lowID);
}

switch (this->titles[c2t[i + this->scroll]].currentBackup.batchRestoreState) {
case NOT_TRIED :
lastState = "[]";
nxtAction = this->titles[c2t[i + this->scroll]].currentBackup.selected ? LanguageUtils::gettext("[Restore]") : LanguageUtils::gettext("[Skip]");
break;
case OK :
lastState = LanguageUtils::gettext("[Ok]");
nxtAction = LanguageUtils::gettext("[Restored]");
break;
case ABORTED :
lastState = LanguageUtils::gettext("[AbortedByUser]");
nxtAction = this->titles[c2t[i + this->scroll]].currentBackup.selected ? LanguageUtils::gettext("[Retry]") : LanguageUtils::gettext("[Skip]");
break;
case WR :
lastState = LanguageUtils::gettext("[Warning-CheckSave]");
nxtAction = this->titles[c2t[i + this->scroll]].currentBackup.selected ? LanguageUtils::gettext("[Retry]") : LanguageUtils::gettext("[Skip]");
break;
case KO:
nxtAction = this->titles[c2t[i + this->scroll]].currentBackup.selected ? LanguageUtils::gettext("[Retry]") : LanguageUtils::gettext("[Skip]");
lastState = LanguageUtils::gettext("[Failed]");
break;
default:
nxtAction = "";
lastState = "";
break;
}


consolePrintPos(M_OFF, i + 2, " %s %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]].saveInit ? "" : " [No Init]",
nxtAction.c_str(),lastState.c_str());
//WHBLogPrintf("shortname %s",this->titles[c2t[i + this->scroll]].shortName);
DrawUtils::setFontColor(COLOR_TEXT);
WHBLogPrintf("icona");
//WHBLogPrintf("icona");
if (this->titles[c2t[i + this->scroll]].iconBuf != nullptr) {
if (isWii)
DrawUtils::drawRGB5A3((M_OFF + 2) * 12 - 2, (i + 3) * 24 + 3, 0.25,
titles[c2t[i + this->scroll]].iconBuf);
else
DrawUtils::drawTGA((M_OFF + 4) * 12 - 2, (i + 3) * 24, 0.18, this->titles[c2t[i + this->scroll]].iconBuf);
WHBLogPrintf(" drawTGA -- var1 %d var2 %d c2t %d iconBuf %u",(M_OFF + 4) * 12 - 2,(i + 3) * 24,c2t[i + this->scroll],this->titles[c2t[i + this->scroll]].iconBuf);
//WHBLogPrintf(" drawTGA -- var1 %d var2 %d c2t %d iconBuf %u",(M_OFF + 4) * 12 - 2,(i + 3) * 24,c2t[i + this->scroll],this->titles[c2t[i + this->scroll]].iconBuf);
}
}
consolePrintPos(-1, 2 + cursorPos, "\u2192");
Expand Down Expand Up @@ -193,6 +236,38 @@ ApplicationState::eSubState BRTitleSelectState::update(Input *input) {
if (!promptConfirm(ST_ERROR, LanguageUtils::gettext("vWii saves are in the vWii section. Continue?")))
return SUBSTATE_RUNNING;
*/
char summary[512];
const char* summaryTemplate;
char usermsg[128];
if (isWiiUBatchRestore) {
summaryTemplate = LanguageUtils::gettext("You have selected the following options:\n%s\n%s\n%s\n%s.\nContinue?\n\n");
if (sduser > - 1) {
snprintf(usermsg,64,LanguageUtils::gettext("- Restore from %s to < %s (%s) >"),getSDacc()[sduser].persistentID,getWiiUacc()[wiiuuser].miiName,getWiiUacc()[wiiuuser].persistentID);
}
snprintf(summary,512,summaryTemplate,
(sduser == -1) ? LanguageUtils::gettext("- Restore allusers") : usermsg,
(common || sduser == -1 ) ? LanguageUtils::gettext("- Include common savedata: Y") : LanguageUtils::gettext("- Include common savedata: N"),
wipeBeforeRestore ? LanguageUtils::gettext("- Wipe data: Y") : LanguageUtils::gettext("- Wipe data: N"),
fullBackup ? LanguageUtils::gettext("- Perform full backup: Y") : LanguageUtils::gettext("- Perform full backup: N"));
} else {
summaryTemplate = LanguageUtils::gettext("You have selected the following options:\n%s\n%s.\nContinue?\n\n");
snprintf(summary,512,summaryTemplate,
wipeBeforeRestore ? LanguageUtils::gettext("- Wipe data: Y") : LanguageUtils::gettext("- Wipe data: N"),
fullBackup ? LanguageUtils::gettext("- Perform full backup: Y") : LanguageUtils::gettext("- Perform full backup: N"));
}

if (!promptConfirm(ST_WARNING,summary))
return SUBSTATE_RUNNING;

for (int i = 0; i < titlesCount ; i++) {
if (! this->titles[i].currentBackup.selected )
continue;
if (! this->titles[i].saveInit) {
if (!promptConfirm(ST_ERROR, LanguageUtils::gettext("You have selected uniniilized titles (not recommended). Are you 100% sure?")))
return SUBSTATE_RUNNING;
break;
}
}
WHBLogPrintf("initiating restore process");
if ( fullBackup ) {
const std::string batchDatetime = getNowDateForFolder();
Expand Down Expand Up @@ -246,13 +321,42 @@ ApplicationState::eSubState BRTitleSelectState::update(Input *input) {
if (retCode > 0)
this->titles[i].currentBackup.batchRestoreState = KO;
WHBLogPrintf("%u - restore user: %d common: %s",i,wiiuuser,effectiveCommon ? "si":"no");
if (this->titles[i].currentBackup.batchRestoreState == OK || this->titles[i].currentBackup.batchRestoreState == WR )
this->titles[i].currentBackup.selected = false;
}

WHBLogPrintf("restore done");

//DrawUtils::setRedraw(true);
//this->state = STATE_DO_SUBSTATE;
//this->subState = std::make_unique<TitleTaskState>(this->titles[this->targ], this->titles, this->titlesCount);
WHBLogPrintf("restore done");
int titlesOK = 0;
int titlesAborted = 0;
int titlesWarning = 0;
int titlesKO = 0;
int titlesSkipped = 0;
for (int i = 0; i < titlesCount ; i++) {
if (this->titles[i].currentBackup.candidateToBeRestored && ! this->titles[i].currentBackup.selected) {
titlesSkipped++;
continue;
}
switch (this->titles[i].currentBackup.batchRestoreState) {
case OK :
titlesOK++;
break;
case WR :
titlesWarning++;
break;
case KO:
titlesKO++;
break;
case ABORTED :
titlesAborted++;
break;
}
}
summaryTemplate = LanguageUtils::gettext("Restore done\n OK: %d\n Warning: %d\n KO: %d\n Aborted: %d\n Skipped: %d\n");
snprintf(summary,512,summaryTemplate,titlesOK,titlesWarning,titlesKO,titlesAborted,titlesSkipped);
promptMessage(COLOR_BG_SUCCESS,summary);
DrawUtils::setRedraw(true);
return SUBSTATE_RUNNING;
}
if (input->get(TRIGGER, PAD_BUTTON_DOWN)) {
if (this->candidatesCount <= 14)
Expand All @@ -274,7 +378,10 @@ ApplicationState::eSubState BRTitleSelectState::update(Input *input) {
cursorPos = this->candidatesCount - 1;
}
if (input->get(TRIGGER, PAD_BUTTON_Y)) {
this->titles[c2t[cursorPos + this->scroll]].currentBackup.selected = this->titles[c2t[cursorPos + this->scroll]].currentBackup.selected ? false:true;
if (this->titles[c2t[cursorPos + this->scroll]].currentBackup.batchRestoreState != OK)
this->titles[c2t[cursorPos + this->scroll]].currentBackup.selected = this->titles[c2t[cursorPos + this->scroll]].currentBackup.selected ? false:true;
else
return SUBSTATE_RUNNING;
}
} else if (this->state == STATE_DO_SUBSTATE) {
auto retSubState = this->subState->update(input);
Expand Down
6 changes: 6 additions & 0 deletions src/menu/BackupSetListState.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ ApplicationState::eSubState BackupSetListState::update(Input *input) {
if (input->get(TRIGGER, PAD_BUTTON_B))
return SUBSTATE_RETURN;
if (input->get(TRIGGER, PAD_BUTTON_A)) {
if (! finalScreen) {
if (cursorPos + scroll == 0) {
promptError(LanguageUtils::gettext("Root BackupSet cannot be selecte for batchRestore"));
return SUBSTATE_RUNNING;
}
}
BackupSetList::setBackupSetEntry(cursorPos + scroll);
BackupSetList::setBackupSetSubPath();
DrawUtils::setRedraw(true);
Expand Down
Loading

0 comments on commit 10fd4b5

Please sign in to comment.