blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-08-31 00:39:50 +08:00
Code Issues Projects Releases Wiki Activity

Display current item during batch processes.

Browse Source
This commit is contained in:
Steven Smith 2015-04-18 16:27:19 -07:00
parent 395183b47b
commit df2ec3c9ba
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/main.cpp
View File

@ -73,7 +73,7 @@ int main(int argc, char **argv) {
} }
std::stringstream stream; std::stringstream stream;
stream << "FBI v1.3.2" << "\n"; stream << "FBI v1.3.3" << "\n";
stream << "Free Space: " << freeSpace << " bytes (" << std::fixed << std::setprecision(2) << freeSpace / 1024.0f / 1024.0f << "MB)" << "\n"; stream << "Free Space: " << freeSpace << " bytes (" << std::fixed << std::setprecision(2) << freeSpace / 1024.0f / 1024.0f << "MB)" << "\n";
stream << "Destination: " << (destination == NAND ? "NAND" : "SD") << ", Mode: " << (mode == INSTALL_CIA ? "Install CIA" : mode == DELETE_CIA ? "Delete CIA" : mode == DELETE_TITLE ? "Delete Title" : "Launch Title") << "\n"; stream << "Destination: " << (destination == NAND ? "NAND" : "SD") << ", Mode: " << (mode == INSTALL_CIA ? "Install CIA" : mode == DELETE_CIA ? "Delete CIA" : mode == DELETE_TITLE ? "Delete Title" : "Launch Title") << "\n";
stream << "L - Switch Destination, R - Switch Mode" << "\n"; stream << "L - Switch Destination, R - Switch Mode" << "\n";
@ -94,8 +94,11 @@ int main(int argc, char **argv) {
return breakLoop; return breakLoop;
}; };
std::string batchInfo = "";
auto onProgress = [&](u64 pos, u64 totalSize) { auto onProgress = [&](u64 pos, u64 totalSize) {
std::stringstream details; std::stringstream details;
details << batchInfo;
details << "(" << std::fixed << std::setprecision(2) << ((double) pos / 1024.0 / 1024.0) << "MB / " << std::fixed << std::setprecision(2) << ((double) totalSize / 1024.0 / 1024.0) << "MB)" << "\n"; details << "(" << std::fixed << std::setprecision(2) << ((double) pos / 1024.0 / 1024.0) << "MB / " << std::fixed << std::setprecision(2) << ((double) totalSize / 1024.0 / 1024.0) << "MB)" << "\n";
details << "Press B to cancel."; details << "Press B to cancel.";
@ -152,12 +155,18 @@ int main(int argc, char **argv) {
if(uiPrompt(TOP_SCREEN, confirmMsg.str(), true)) { if(uiPrompt(TOP_SCREEN, confirmMsg.str(), true)) {
bool failed = false; bool failed = false;
std::vector<FileInfo> contents = fsGetDirectoryContents(currDirectory); std::vector<FileInfo> contents = fsGetDirectoryContents(currDirectory);
u32 currItem = 0;
for(std::vector<FileInfo>::iterator it = contents.begin(); it != contents.end(); it++) { for(std::vector<FileInfo>::iterator it = contents.begin(); it != contents.end(); it++) {
std::string path = (*it).path; std::string path = (*it).path;
std::string fileName = (*it).name; std::string fileName = (*it).name;
if(!fsIsDirectory(path) && fsHasExtensions(path, extensions)) { if(!fsIsDirectory(path) && fsHasExtensions(path, extensions)) {
if(mode == INSTALL_CIA) { if(mode == INSTALL_CIA) {
std::stringstream batchInstallStream;
batchInstallStream << fileName << " (" << currItem << ")" << "\n";
batchInfo = batchInstallStream.str();
AppResult ret = appInstallFile(destination, path, onProgress); AppResult ret = appInstallFile(destination, path, onProgress);
batchInfo = "";
if(ret != APP_SUCCESS) { if(ret != APP_SUCCESS) {
std::stringstream resultMsg; std::stringstream resultMsg;
resultMsg << "Install failed!" << "\n"; resultMsg << "Install failed!" << "\n";
@ -168,6 +177,11 @@ int main(int argc, char **argv) {
break; break;
} }
} else { } else {
std::stringstream deleteStream;
deleteStream << "Deleting CIA..." << "\n";
deleteStream << fileName << " (" << currItem << ")" << "\n";
uiDisplayMessage(TOP_SCREEN, deleteStream.str());
if(!fsDelete(path)) { if(!fsDelete(path)) {
std::stringstream resultMsg; std::stringstream resultMsg;
resultMsg << "Delete failed!" << "\n"; resultMsg << "Delete failed!" << "\n";
@ -181,6 +195,8 @@ int main(int argc, char **argv) {
} }
} }
} }
currItem++;
} }
if(!failed) { if(!failed) {
@ -218,6 +234,7 @@ int main(int argc, char **argv) {
resultMsg << appGetResultString(ret) << "\n"; resultMsg << appGetResultString(ret) << "\n";
} }
} else { } else {
uiDisplayMessage(TOP_SCREEN, "Deleting CIA...");
if(fsDelete(path)) { if(fsDelete(path)) {
updateList = true; updateList = true;
resultMsg << "succeeded!"; resultMsg << "succeeded!";