rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ask before trimming ROMs (#156)

Browse Source 
* Ask before trimming ROMs

* Fix unwanted key repeat
This commit is contained in:
Pk11 2022-01-17 03:35:14 -06:00 committed by GitHub
parent 4b16b7a011
commit bef9eacf22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arm9/source/fileOperations.cpp
View File

@ -129,14 +129,43 @@ int trimNds(const char *fileName) {
sNDSHeaderExt ndsCardHeader;
fread(&ndsCardHeader, 1, sizeof(ndsCardHeader), file);
fseek(file, 0, SEEK_END);
u32 fileSize = ftell(file);
fclose(file);
u32 romSize = ((ndsCardHeader.unitCode != 0) && (ndsCardHeader.twlRomSize > 0))
? ndsCardHeader.twlRomSize : ndsCardHeader.romSize + 0x88;
truncate(fileName, romSize);
if(fileSize == romSize) {
font->clear(false);
font->print(0, 0, false, STR_FILE_ALREADY_TRIMMED + "\n\n" + STR_A_OK);
font->update(false);
return romSize;
do {
swiWaitForVBlank();
scanKeys();
} while(!(keysDown() & KEY_A));
} else {
font->clear(false);
font->printf(0, 0, false, Alignment::left, Palette::white, (STR_TRIM_TO_N_BYTES + "\n\n" + STR_A_YES_B_NO).c_str(), getBytes(romSize).c_str());
font->update(false);
u16 pressed;
do {
scanKeys();
pressed = keysDown();
swiWaitForVBlank();
} while(!(pressed & (KEY_A | KEY_B)));
if(pressed & KEY_A) {
truncate(fileName, romSize);
fileSize = romSize;
}
}
return fileSize;
}
return -1;

56
arm9/source/file_browse.cpp
View File

@ -459,21 +459,21 @@ FileOperation fileBrowse_A(DirEntry* entry, char path[PATH_MAX]) {
break;
}
}
keysDownRepeat(); // prevent unwanted key repeat
return operations[optionOffset];
}
if (pressed & KEY_B) {
} else if (pressed & KEY_B) {
return FileOperation::none;
}
#ifdef SCREENSWAP
// Swap screens
if (pressed & KEY_TOUCH) {
else if (pressed & KEY_TOUCH) {
screenSwapped = !screenSwapped;
screenSwapped ? lcdMainOnBottom() : lcdMainOnTop();
}
#endif
// Make a screenshot
if ((held & KEY_R) && (pressed & KEY_L)) {
else if ((held & KEY_R) && (pressed & KEY_L)) {
screenshot();
}
}
@ -717,14 +717,9 @@ std::string browseForFile (void) {
screenOffset = 0;
fileOffset = 0;
}
} else if(getOp == FileOperation::showInfo) {
for (int i = 0; i < 15; i++) swiWaitForVBlank();
}
}
}
// Directory options
if (entry->isDirectory && (held & KEY_R) && (pressed & KEY_A)) {
} else if (entry->isDirectory && (held & KEY_R) && (pressed & KEY_A)) { // Directory options
if (entry->name == "..") {
screenMode = 0;
return "null";
@ -736,9 +731,7 @@ std::string browseForFile (void) {
for (int i = 0; i < 15; i++) swiWaitForVBlank();
}
}
}
if (pressed & KEY_B) {
} else if (pressed & KEY_B) {
if (strcmp(path, getDrivePath()) == 0) {
screenMode = 0;
return "null";
@ -748,10 +741,7 @@ std::string browseForFile (void) {
getDirectoryContents (dirContents);
screenOffset = 0;
fileOffset = 0;
}
// Rename file/folder
if ((held & KEY_R) && (pressed & KEY_X) && (entry->name != ".." && driveWritable(currentDrive))) {
} else if ((held & KEY_R) && (pressed & KEY_X) && (entry->name != ".." && driveWritable(currentDrive))) { // Rename file/folder
pressed = 0;
std::string newName = kbdGetString(STR_RENAME_TO, -1, entry->name);
@ -776,10 +766,7 @@ std::string browseForFile (void) {
getDirectoryContents(dirContents);
}
}
}
// Delete action
if ((pressed & KEY_X) && (entry->name != ".." && driveWritable(currentDrive))) {
} else if ((pressed & KEY_X) && (entry->name != ".." && driveWritable(currentDrive))) { // Delete action
font->clear(false);
int selections = std::count_if(dirContents.begin(), dirContents.end(), [](const DirEntry &x){ return x.selected; });
if (entry->selected && selections > 1) {
@ -855,10 +842,7 @@ std::string browseForFile (void) {
break;
}
}
}
// Create new folder
if ((held & KEY_R) && (pressed & KEY_Y) && driveWritable(currentDrive)) {
} else if ((held & KEY_R) && (pressed & KEY_Y) && driveWritable(currentDrive)) { // Create new folder
pressed = 0;
std::string newName = kbdGetString(STR_NAME_FOR_NEW_FOLDER);
@ -883,10 +867,7 @@ std::string browseForFile (void) {
getDirectoryContents (dirContents);
}
}
}
// Add to selection
if ((pressed & KEY_L && !(held & KEY_R)) && entry->name != "..") {
} else if ((pressed & KEY_L && !(held & KEY_R)) && entry->name != "..") { // Add to selection
bool select = !entry->selected;
entry->selected = select;
while(held & KEY_L) {
@ -941,9 +922,7 @@ std::string browseForFile (void) {
fileBrowse_drawBottomScreen(entry);
showDirectoryContents(dirContents, fileOffset, screenOffset);
}
}
if (pressed & KEY_Y) {
} else if (pressed & KEY_Y) {
// Copy
if (!clipboardOn) {
if (entry->name != "..") {
@ -965,27 +944,22 @@ std::string browseForFile (void) {
} else if (driveWritable(currentDrive) && fileBrowse_paste(path)) {
getDirectoryContents (dirContents);
}
}
if ((pressed & KEY_SELECT) && !clipboardUsed) {
} else if ((pressed & KEY_SELECT) && !clipboardUsed) {
clipboardOn = !clipboardOn;
}
// START menu
if (pressed & KEY_START) {
} if (pressed & KEY_START) { // START menu
startMenu();
}
#ifdef SCREENSWAP
// Swap screens
if (pressed & KEY_TOUCH) {
else if (pressed & KEY_TOUCH) {
screenSwapped = !screenSwapped;
screenSwapped ? lcdMainOnBottom() : lcdMainOnTop();
}
#endif
// Make a screenshot
if ((held & KEY_R) && (pressed & KEY_L)) {
else if ((held & KEY_R) && (pressed & KEY_L)) {
if(screenshot())
getDirectoryContents(dirContents);
}

2
arm9/source/language.inl
View File

@ -30,6 +30,8 @@ STRING(COULD_NOT_ALLOCATE_BUFFER, "Could not allocate buffer")
STRING(COULD_NOT_OPEN_FILE_READING, "Could not open file for reading")
STRING(CALCULATING_SHA1, "Calculating SHA1 hash of:\n%s")
STRING(N_OF_N_BYTES_PROCESSED, "%d/%d bytes processed")
STRING(FILE_ALREADY_TRIMMED, "This file is already trimmed.")
STRING(TRIM_TO_N_BYTES, "Trim file to %s?")
STRING(RUNNING_X_WITH_N_PARAMETERS, "Running %s with %d parameters")
STRING(START_FAILED_ERROR_N, "Start failed. Error %d")
STRING(HEADER_TITLE, "Header Title: %s")

2
nitrofiles/languages/en-US/language.ini
View File

@ -30,6 +30,8 @@ COULD_NOT_ALLOCATE_BUFFER=Could not allocate buffer
COULD_NOT_OPEN_FILE_READING=Could not open file for reading
CALCULATING_SHA1=Calculating SHA1 hash of:\n%s
N_OF_N_BYTES_PROCESSED=%d/%d bytes processed
FILE_ALREADY_TRIMMED=This file is already trimmed.
TRIM_TO_N_BYTES=Trim file to %s?
RUNNING_X_WITH_N_PARAMETERS=Running %s with %d parameters
START_FAILED_ERROR_N=Start failed. Error %d
HEADER_TITLE=Header Title: %s