remove saves option (#19)

* delete vmc saves * delete from memcard * optimized png
bucanero · Dec 6, 2024 · 5c8fb36 · 5c8fb36
1 parent 00780a8
commit 5c8fb36
Show file tree

Hide file tree

Showing 64 changed files with 138 additions and 20 deletions.
diff --git a/data/buk_scr.png b/data/buk_scr.png
diff --git a/data/cat_about.png b/data/cat_about.png
diff --git a/data/cat_bup.png b/data/cat_bup.png
diff --git a/data/cat_cheats.png b/data/cat_cheats.png
diff --git a/data/cat_db.png b/data/cat_db.png
diff --git a/data/cat_empty.png b/data/cat_empty.png
diff --git a/data/cat_hdd.png b/data/cat_hdd.png
diff --git a/data/cat_opt.png b/data/cat_opt.png
diff --git a/data/cat_sav.png b/data/cat_sav.png
diff --git a/data/cat_usb.png b/data/cat_usb.png
diff --git a/data/cat_warning.png b/data/cat_warning.png
diff --git a/data/cheat.png b/data/cheat.png
diff --git a/data/circle_loading_bg.png b/data/circle_loading_bg.png
diff --git a/data/circle_loading_seek.png b/data/circle_loading_seek.png
diff --git a/data/column_1.png b/data/column_1.png
diff --git a/data/column_2.png b/data/column_2.png
diff --git a/data/column_3.png b/data/column_3.png
diff --git a/data/column_4.png b/data/column_4.png
diff --git a/data/column_5.png b/data/column_5.png
diff --git a/data/column_6.png b/data/column_6.png
diff --git a/data/column_7.png b/data/column_7.png
diff --git a/data/edit_shadow.png b/data/edit_shadow.png
diff --git a/data/footer_ico_circle.png b/data/footer_ico_circle.png
diff --git a/data/footer_ico_cross.png b/data/footer_ico_cross.png
diff --git a/data/footer_ico_square.png b/data/footer_ico_square.png
diff --git a/data/footer_ico_triangle.png b/data/footer_ico_triangle.png
diff --git a/data/header_dot.png b/data/header_dot.png
diff --git a/data/header_line.png b/data/header_line.png
diff --git a/data/help.png b/data/help.png
diff --git a/data/jar_about.png b/data/jar_about.png
diff --git a/data/jar_about_hover.png b/data/jar_about_hover.png
diff --git a/data/jar_bup.png b/data/jar_bup.png
diff --git a/data/jar_bup_hover.png b/data/jar_bup_hover.png
diff --git a/data/jar_db.png b/data/jar_db.png
diff --git a/data/jar_db_hover.png b/data/jar_db_hover.png
diff --git a/data/jar_empty.png b/data/jar_empty.png
diff --git a/data/jar_hdd.png b/data/jar_hdd.png
diff --git a/data/jar_hdd_hover.png b/data/jar_hdd_hover.png
diff --git a/data/jar_opt.png b/data/jar_opt.png
diff --git a/data/jar_opt_hover.png b/data/jar_opt_hover.png
diff --git a/data/jar_usb.png b/data/jar_usb.png
diff --git a/data/jar_usb_hover.png b/data/jar_usb_hover.png
diff --git a/data/logo.png b/data/logo.png
diff --git a/data/logo_text.png b/data/logo_text.png
diff --git a/data/mark_arrow.png b/data/mark_arrow.png
diff --git a/data/mark_line.png b/data/mark_line.png
diff --git a/data/opt_off.png b/data/opt_off.png
diff --git a/data/opt_on.png b/data/opt_on.png
diff --git a/data/scroll_bg.png b/data/scroll_bg.png
diff --git a/data/tag_apply.png b/data/tag_apply.png
diff --git a/data/tag_net.png b/data/tag_net.png
diff --git a/data/tag_transfer.png b/data/tag_transfer.png
diff --git a/data/tag_vmc.png b/data/tag_vmc.png
diff --git a/data/tag_warning.png b/data/tag_warning.png
diff --git a/data/tag_zip.png b/data/tag_zip.png
diff --git a/data/trp_gold.png b/data/trp_gold.png
diff --git a/data/trp_sync.png b/data/trp_sync.png
diff --git a/include/menu.h b/include/menu.h
@@ -19,7 +19,7 @@ enum menu_screen_ids
 	MENU_MAIN_SCREEN,		/* 0 - Main Menu */
 	MENU_PS2VMC_SAVES,		/* 1 - PS2 VMC Menu */
 	MENU_USB_SAVES,			/* 2 - USB Menu (User List) */
-	MENU_HDD_SAVES,			/* 3 - HDD Menu (User List) */
+	MENU_MEMCARD_SAVES,		/* 3 - MemCard Menu (User List) */
 	MENU_ONLINE_DB,			/* 4 - Online Menu (Online List) */
 	MENU_USER_BACKUP,		/* 5 - User Backup */
 	MENU_SETTINGS,			/* 6 - Options Menu */

diff --git a/include/saves.h b/include/saves.h
@@ -128,11 +128,11 @@ enum save_type_enum
     FILE_TYPE_NULL,
     FILE_TYPE_MENU,
     FILE_TYPE_PS2,
+    FILE_TYPE_PS1,
     FILE_TYPE_VMC,
-    FILE_TYPE_PSV,
 
     // PS1 File Types
-    FILE_TYPE_PS1,
+    FILE_TYPE_PSV,
     FILE_TYPE_MCS,
     FILE_TYPE_PSX,
 
@@ -268,6 +268,7 @@ int exportPSV(const char *mc_save, const char* out_path);
 int exportCBS(const char *mc_save, const char* out_path, const char* title);
 int exportMCS(const char* path, const char* fname, const char* dstName);
 
+int vmc_delete_save(const char* path);
 int vmc_export_psv(const char* save, const char* out_path);
 int vmc_export_psu(const char* path, const char* output);
 int vmc_import_psv(const char *input);

diff --git a/source/exec_cmd.c b/source/exec_cmd.c
@@ -778,6 +778,47 @@ static void resignSave(save_entry_t* entry)
     show_message("Save %s successfully modified!", entry->title_id);
 }
 
+static int deleteSave(const save_entry_t* save)
+{
+	char path[256];
+	int ret = 0;
+
+	if (!show_dialog(DIALOG_TYPE_YESNO, "Do you want to delete %s?", save->dir_name))
+		return 0;
+
+	if (save->flags & SAVE_FLAG_VMC)
+		ret = (save->flags & SAVE_FLAG_PS1) ? formatSave(save->icon[0]) : vmc_delete_save(save->dir_name);
+
+	else if (save->flags & SAVE_FLAG_PACKED)
+		ret = (remove(save->path) == SUCCESS);
+
+	else if (save->flags & SAVE_FLAG_MEMCARD)
+	{
+		if (save->flags & SAVE_FLAG_PS1CARD)
+		{
+			snprintf(path, sizeof(path), "%s%s", save->path, save->dir_name);
+			ret = (remove(path) == SUCCESS);
+		}
+		else
+		{
+			clean_directory(save->path);
+			ret = (remove(save->path) == SUCCESS);
+		}
+	}
+	else if (save->flags & SAVE_FLAG_PS1|SAVE_FLAG_PS2)
+	{
+		clean_directory(save->path);
+		ret = (remove(save->path) == SUCCESS);
+	}
+
+	if (ret)
+		show_message("Save successfully deleted:\n%s", save->dir_name);
+	else
+		show_message("Error! Couldn't delete save:\n%s", save->dir_name);
+
+	return ret;
+}
+
 static void exportAllSaves(const save_entry_t* save, int dev, int all)
 {
 	struct tm t;
@@ -1140,6 +1181,13 @@ void execCodeCommand(code_entry_t* code, const char* codecmd)
 			code->activated = 0;
 			break;
 
+		case CMD_DELETE_SAVE:
+			if (deleteSave(selected_entry))
+				selected_entry->flags |= SAVE_FLAG_UPDATED;
+			else
+				code->activated = 0;
+			break;
+
 		case CMD_COPY_SAVE_VMC:
 			copyVmcSave(selected_entry, codecmd[1] ? MC1_PATH : MC0_PATH);
 			code->activated = 0;

diff --git a/source/main.c b/source/main.c
@@ -159,7 +159,7 @@ static const char* get_menu_help(int id)
 	case MENU_PS1VMC_SAVES:
 	case MENU_PS2VMC_SAVES:
 	case MENU_USB_SAVES:
-	case MENU_HDD_SAVES:
+	case MENU_MEMCARD_SAVES:
 	case MENU_ONLINE_DB:
 		return "\x10 Select    \x13 Back    \x12 Details    \x11 Refresh";
 

diff --git a/source/menu_main.c b/source/menu_main.c
@@ -142,7 +142,7 @@ static void SetMenu(int id)
 
 		case MENU_MAIN_SCREEN: //Main Menu
 		case MENU_USB_SAVES: //USB Saves Menu
-		case MENU_HDD_SAVES: //HHD Saves Menu
+		case MENU_MEMCARD_SAVES: //HHD Saves Menu
 		case MENU_ONLINE_DB: //Cheats Online Menu
 		case MENU_USER_BACKUP: //Backup Menu
 			menu_textures[icon_png_file_index].size = 0;
@@ -153,17 +153,30 @@ static void SetMenu(int id)
 			break;
 
 		case MENU_PATCHES: //Cheat Selection Menu
-			if (selected_entry->flags & SAVE_FLAG_UPDATED && id == MENU_PS2VMC_SAVES)
-			{
-				selected_entry->flags ^= SAVE_FLAG_UPDATED;
-				mcio_vmcFinish();
-				ReloadUserSaves(&vmc2_saves);
-			}
-			else if (selected_entry->flags & SAVE_FLAG_UPDATED && id == MENU_PS1VMC_SAVES)
+			if (selected_entry->flags & SAVE_FLAG_UPDATED)
 			{
+				switch (id)
+				{
+				case MENU_PS2VMC_SAVES:
+					mcio_vmcFinish();
+					ReloadUserSaves(&vmc2_saves);
+					break;
+
+				case MENU_PS1VMC_SAVES:
+					saveMemoryCard(vmc1_saves.path, 0, 0);
+					ReloadUserSaves(&vmc1_saves);
+					break;
+
+				case MENU_MEMCARD_SAVES:
+					ReloadUserSaves(&hdd_saves);
+					break;
+
+				case MENU_USB_SAVES:
+					ReloadUserSaves(&usb_saves);
+					break;
+				}
+
 				selected_entry->flags ^= SAVE_FLAG_UPDATED;
-				saveMemoryCard(vmc1_saves.path, 0, 0);
-				ReloadUserSaves(&vmc1_saves);
 			}
 			break;
 
@@ -226,7 +239,7 @@ static void SetMenu(int id)
 				Draw_UserCheatsMenu_Ani(&usb_saves);
 			break;
 
-		case MENU_HDD_SAVES: //HDD saves Menu
+		case MENU_MEMCARD_SAVES: //HDD saves Menu
 			if (!hdd_saves.list && !ReloadUserSaves(&hdd_saves))
 				return;
 
@@ -263,7 +276,7 @@ static void SetMenu(int id)
 
 		case MENU_PATCHES: //Cheat Selection Menu
 			//if entering from game list, don't keep index, otherwise keep
-			if (menu_id == MENU_USB_SAVES || menu_id == MENU_HDD_SAVES || menu_id == MENU_ONLINE_DB || 
+			if (menu_id == MENU_USB_SAVES || menu_id == MENU_MEMCARD_SAVES || menu_id == MENU_ONLINE_DB || 
 				menu_id == MENU_PS2VMC_SAVES || menu_id == MENU_PS1VMC_SAVES)
 				menu_old_sel[MENU_PATCHES] = 0;
 
@@ -780,6 +793,13 @@ static void doPatchMenu(void)
 				return;
 			}
 
+			if (selected_centry->codes[0] == CMD_DELETE_SAVE)
+			{
+				selected_centry->activated = 0;
+				SetMenu(last_menu_id[MENU_PATCHES]);
+				return;
+			}
+
 			if (selected_centry->codes[0] == CMD_VIEW_RAW_PATCH)
 			{
 				selected_centry->activated = 0;
@@ -833,7 +853,7 @@ void drawScene(void)
 			doSaveMenu(&usb_saves);
 			break;
 
-		case MENU_HDD_SAVES: //HDD Saves Menu
+		case MENU_MEMCARD_SAVES: //HDD Saves Menu
 			doSaveMenu(&hdd_saves);
 			break;
 

diff --git a/source/psv_resign.c b/source/psv_resign.c
@@ -1063,7 +1063,7 @@ int vmc_export_psu(const char* path, const char* output)
 			}
 			free(p);
 
-			entry.length = 1024 - (dirent.stat.size % 1024);
+			entry.length = (1024 - (dirent.stat.size % 1024)) % 1024;
 			while(entry.length--)
 				fputc(0xFF, fh);
 		}
@@ -1076,3 +1076,26 @@ int vmc_export_psu(const char* path, const char* output)
 
 	return (i > 0);
 }
+
+int vmc_delete_save(const char* path)
+{
+	int r, dd;
+	struct io_dirent dirent;
+	char filepath[256];
+	LOG("Deleting '%s'...", path);
+	dd = mcio_mcDopen(path);
+	if (dd < 0)
+		return 0;
+	do {
+		r = mcio_mcDread(dd, &dirent);
+		if (r && (strcmp(dirent.name, ".")) && (strcmp(dirent.name, "..")))
+		{
+			snprintf(filepath, sizeof(filepath), "%s/%s", path, dirent.name);
+			LOG("Deleting '%s'", filepath);
+			mcio_mcRemove(filepath);
+		}
+	} while (r);
+	mcio_mcDclose(dd);
+	r = mcio_mcRmDir(path);
+	return (r == sceMcResSucceed);
+}
diff --git a/source/saves.c b/source/saves.c
@@ -399,6 +399,9 @@ int ReadCodes(save_entry_t * save)
 	code = _createCmdCode(PATCH_COMMAND, CHAR_ICON_USER " View Save Details", CMD_VIEW_DETAILS);
 	list_append(save->codes, code);
 
+	code = _createCmdCode(PATCH_COMMAND, CHAR_ICON_WARN " Delete Save Game", CMD_DELETE_SAVE);
+	list_append(save->codes, code);
+
 	if (save->flags & SAVE_FLAG_PS1)
 	{
 		add_ps1_commands(save);
@@ -613,6 +616,9 @@ int ReadVmc2Codes(save_entry_t * save)
 	cmd = _createCmdCode(PATCH_COMMAND, CHAR_ICON_USER " View Save Details", CMD_VIEW_DETAILS);
 	list_append(save->codes, cmd);
 
+	cmd = _createCmdCode(PATCH_COMMAND, CHAR_ICON_WARN " Delete Save Game", CMD_DELETE_SAVE);
+	list_append(save->codes, cmd);
+
 	cmd = _createCmdCode(PATCH_NULL, "----- " UTF8_CHAR_STAR " Save Transfer " UTF8_CHAR_STAR " -----", CMD_CODE_NULL);
 	list_append(save->codes, cmd);
 
@@ -918,10 +924,24 @@ int sortSaveList_Compare(const void* a, const void* b)
 	return strcasecmp(((save_entry_t*) a)->name, ((save_entry_t*) b)->name);
 }
 
+static int parseTypeFlags(int flags)
+{
+	if (flags & SAVE_FLAG_PACKED)
+		return ((flags & SAVE_FLAG_PS1) ? FILE_TYPE_PSX : FILE_TYPE_PSU);
+	else if (flags & SAVE_FLAG_VMC)
+		return ((flags & SAVE_FLAG_PS1) ? FILE_TYPE_VMC : FILE_TYPE_VMC+1);
+	else if (flags & SAVE_FLAG_PS1)
+		return FILE_TYPE_PS1;
+	else if (flags & SAVE_FLAG_PS2)
+		return FILE_TYPE_PS2;
+
+	return 0;
+}
+
 int sortSaveList_Compare_Type(const void* a, const void* b)
 {
-	int ta = ((save_entry_t*) a)->type;
-	int tb = ((save_entry_t*) b)->type;
+	int ta = parseTypeFlags(((save_entry_t*) a)->flags);
+	int tb = parseTypeFlags(((save_entry_t*) b)->flags);
 
 	if (ta == tb)
 		return sortSaveList_Compare(a, b);
@@ -1059,6 +1079,9 @@ static int set_psx_import_codes(save_entry_t* item)
 	cmd->options = _createMcOptions(2, "Import to MemCard", CMD_IMP_SAVE_MC);
 	list_append(item->codes, cmd);
 
+	cmd = _createCmdCode(PATCH_COMMAND, CHAR_ICON_WARN " Delete Save Game", CMD_DELETE_SAVE);
+	list_append(item->codes, cmd);
+
 	return list_count(item->codes);
 }
 
@@ -1519,6 +1542,9 @@ list_t * ReadVmc1List(const char* userPath)
 		asprintf(&item->path, "%s\n%s", userPath, mcdata[i].saveName);
 		sjis2ascii(item->name);
 
+		if(strlen(item->title_id) == 10 && item->title_id[4] == '-')
+			memmove(&item->title_id[4], &item->title_id[5], 6);
+
 		LOG("[%s] F(%X) name '%s'", item->title_id, item->flags, item->name);
 		list_append(list, item);
 	}