joel16/VLFFM
1
0
Fork 0
mirror of https://github.com/joel16/VLFFM.git synced 2024-11-26 21:10:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fs: Fix fsDeletePath

Browse Source
This commit is contained in:
joel16 2024-02-03 21:57:45 -05:00
parent a43d7fc57b
commit 2ec08ab81a
3 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/include/fs.h
View File

@ -41,7 +41,7 @@ int fsParentDir(FsFileList *list);
const char *fsSetPath(FsFileListEntry *entry, const char *path);
int fsCopyPath(const char *src_path, const char *dest_path, FileProcessParam *param);
int fsMovePath(const char *src_path, const char *dest_path);
int fsDelete(const char *path, FileProcessParam *param);
int fsDeletePath(const char *path, FileProcessParam *param);
bool fsFileExists(const char *path);
SceSize fsGetFileSize(const char *path);
int fsReadFile(const char *path, void *buf, SceSize size);

60
app/source/fs.c
View File

@ -441,42 +441,39 @@ int fsMovePath(const char *src_path, const char *dest_path) {
return 0;
}
int fsDelete(const char *path, FileProcessParam *param) {
int fsDeletePath(const char *path, FileProcessParam *param) {
SceUID dfd = pspIoOpenDir(path);
if (dfd >= 0) {
int res = 0;
do {
SceIoDirent dir;
memset(&dir, 0, sizeof(SceIoDirent));
res = pspIoReadDir(dfd, &dir);
if (res > 0) {
if (strcmp(dir.d_name, ".") == 0 || strcmp(dir.d_name, "..") == 0) {
continue;
}
size_t len = strlen(path) + strlen(dir.d_name) + 2;
char new_path[512] = { 0 };
memset(new_path, 0, len);
snprintf(new_path, 512, "%s%s%s", path, fsHasEndSlash(path) ? "" : "/", dir.d_name);
if (FIO_S_ISDIR(dir.d_stat.st_mode)) {
int ret = fsDelete(new_path, param);
int ret = fsDeletePath(new_path, param);
if (ret <= 0) {
utilsLogError("%s: fsDelete(%s) failed: 0x%08x\n", __func__, new_path, ret);
utilsLogError("%s: fsDeletePath(%s) failed: 0x%08x\n", __func__, new_path, ret);
pspIoCloseDir(dfd);
return ret;
}
}
else {
int ret = 0;
if (R_FAILED(ret = pspIoRemoveFile(new_path))) {
} else {
int ret = pspIoRemoveFile(new_path);
if (ret < 0) {
utilsLogError("%s: pspIoRemoveFile(%s) failed: 0x%08x\n", __func__, new_path, ret);
pspIoCloseDir(dfd);
return ret;
}
if (param) {
if (param->value) {
(param->value)++;
@ -485,7 +482,7 @@ int fsDelete(const char *path, FileProcessParam *param) {
if (param->setProgress) {
param->setProgress(param->value ? param->value : 0, param->max);
}
if (param->cancelHandler && param->cancelHandler()) {
pspIoCloseDir(dfd);
return 0;
@ -494,40 +491,35 @@ int fsDelete(const char *path, FileProcessParam *param) {
}
}
} while (res > 0);
int ret = 0;
if (R_FAILED(ret = pspIoCloseDir(dfd))) {
utilsLogError("%s: pspIoCloseDir(%s) failed: 0x%08x\n", __func__, path, ret);
return ret;
}
if (R_FAILED(ret = pspIoRemoveDir(path))) {
pspIoCloseDir(dfd);
int ret = pspIoRemoveDir(path);
if (ret < 0) {
utilsLogError("%s: pspIoRemoveDir(%s) failed: 0x%08x\n", __func__, path, ret);
return ret;
}
if (param) {
if (param->value) {
(param->value)++;
}
if (param->setProgress) {
param->setProgress(param->value ? param->value : 0, param->max);
}
if (param->cancelHandler && param->cancelHandler()) {
return 0;
}
}
}
else {
int ret = 0;
if (R_FAILED(ret = pspIoRemoveFile(path))) {
} else {
int ret = pspIoRemoveFile(path);
if (ret < 0) {
utilsLogError("%s: pspIoRemoveFile(%s) failed: 0x%08x\n", __func__, path, ret);
return ret;
}
if (param) {
if (param->value) {
(param->value)++;
@ -536,14 +528,14 @@ int fsDelete(const char *path, FileProcessParam *param) {
if (param->setProgress) {
param->setProgress(param->value ? param->value : 0, param->max);
}
if (param->cancelHandler && param->cancelHandler()) {
return 0;
}
}
}
return 0;
return 1;
}
bool fsFileExists(const char *path) {

4
app/source/gui.c
View File

@ -267,7 +267,7 @@ static int guiControlContextMenuSelection(int selection) {
case GUI_CONTEXT_MENU_PROPERTIES:
guiDisplayProperties();
break;
case GUI_CONTEXT_MENU_COPY:
if (gui.context_menu.copy_flag == GUI_COPY_ACTION_NONE) {
guiSetCopyFlag(GUI_COPY_ACTION_COPY_PATH);
@ -325,7 +325,7 @@ static int guiControlContextMenuSelection(int selection) {
if (button_res == VLF_MD_YES) {
file_op_flag = true;
if (R_FAILED(fsDelete(fsSetPath(gui.entry, NULL), NULL))) {
if (R_FAILED(fsDeletePath(fsSetPath(gui.entry, NULL), NULL))) {
guiDisplayErrorDialog();
}