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

Truncate file name display in batch operations.

Browse Source
This commit is contained in:
Steven Smith 2015-05-01 22:31:22 -07:00
parent f90bc8b620
commit 6f32b0b00f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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.6" << "\n"; stream << "FBI v1.3.7" << "\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";
@ -177,11 +177,16 @@ int main(int argc, char **argv) {
u32 currItem = 0; 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;
if(!fsIsDirectory(path) && fsHasExtensions(path, extensions)) { if(!fsIsDirectory(path) && fsHasExtensions(path, extensions)) {
std::string displayFileName = (*it).name;
if(displayFileName.length() > 40) {
displayFileName.resize(40);
displayFileName += "...";
}
if(mode == INSTALL_CIA) { if(mode == INSTALL_CIA) {
std::stringstream batchInstallStream; std::stringstream batchInstallStream;
batchInstallStream << fileName << " (" << currItem << ")" << "\n"; batchInstallStream << displayFileName << " (" << currItem << ")" << "\n";
batchInfo = batchInstallStream.str(); batchInfo = batchInstallStream.str();
AppResult ret = appInstallFile(destination, path, onProgress); AppResult ret = appInstallFile(destination, path, onProgress);
@ -193,7 +198,7 @@ int main(int argc, char **argv) {
std::stringstream resultMsg; std::stringstream resultMsg;
resultMsg << "Install failed!" << "\n"; resultMsg << "Install failed!" << "\n";
resultMsg << fileName << "\n"; resultMsg << displayFileName << "\n";
resultMsg << appGetResultString(ret) << "\n"; resultMsg << appGetResultString(ret) << "\n";
uiPrompt(TOP_SCREEN, resultMsg.str(), false); uiPrompt(TOP_SCREEN, resultMsg.str(), false);
if(error.module != MODULE_AM || error.description != DESCRIPTION_ALREADY_EXISTS) { if(error.module != MODULE_AM || error.description != DESCRIPTION_ALREADY_EXISTS) {
@ -204,13 +209,13 @@ int main(int argc, char **argv) {
} else { } else {
std::stringstream deleteStream; std::stringstream deleteStream;
deleteStream << "Deleting CIA..." << "\n"; deleteStream << "Deleting CIA..." << "\n";
deleteStream << fileName << " (" << currItem << ")" << "\n"; deleteStream << displayFileName << " (" << currItem << ")" << "\n";
uiDisplayMessage(TOP_SCREEN, deleteStream.str()); 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";
resultMsg << fileName << "\n"; resultMsg << displayFileName << "\n";
resultMsg << platformGetErrorString(platformGetError()) << "\n"; resultMsg << platformGetErrorString(platformGetError()) << "\n";
uiPrompt(TOP_SCREEN, resultMsg.str(), false); uiPrompt(TOP_SCREEN, resultMsg.str(), false);
failed = true; failed = true;