Merge pull request #151 from mcthesw/dev

Merge dev

Author: mcthesw

doc/en/README.md

@@ -93,7 +93,7 @@ Other developers do not need to change the version number, just add your updates
 
 - Update the version number in `package.json`(`pnpm version <patch|minor|major>`)
 - Update the version number in `src/schemas/saveTypes.ts`
-- Update the version number in `src-tauri/src/config.rs:default_config`
+- Update the version number in `src-tauri/src/config/app_config.rs:impl Default for Config`
 - Update the version number in `src-tauri/tauri.conf.json`
 
 ## Folder Structure

doc/zh-CN/README.md

@@ -93,7 +93,7 @@ vue-devtools
 
 - 在`package.json`中更新版本号(`pnpm version <patch|minor|major>`)
 - 在`src/schemas/saveTypes.ts`中更新版本号
-- 在`src-tauri/src/config.rs:default_config`中更新版本号
+- 在`src-tauri/src/config/app_config.rs:impl Default for Config`中更新版本号
 - 在`src-tauri/tauri.conf.json`中更新版本号
 
 ## 文件夹说明

locales/en_US.json

@@ -37,7 +37,13 @@
     "open_log_folder": "Open log",
     "log_to_file": "Generate file log",
     "setting_tips": "An asterisk indicates that it will take effect after restarting, and the remaining settings will take effect after saving.",
-    "add_new_to_favorites": "New games are automatically added to favorites"
+    "add_new_to_favorites": "New games are automatically added to favorites",
+    "quick_action_hotkeys": "Quick backup/restore hotkey settings (settings need to be saved)",
+    "hotkey": {
+      "quick_backup": "Quick backup",
+      "hint": "Note that the settings here are the same as other settings with an asterisk. They need to be saved and restarted to take effect. Setting it to empty will disable this function.",
+      "quick_apply": "Quick file reading"
+    }
   },
   "home": {
     "hello_world": "Hello world",
@@ -230,10 +236,10 @@
     "choose_save_file_error": "An error occurred while selecting the save file",
     "choose_executable_file_error": "An error occurred while selecting an executable file",
     "add_game_failed": "Failed to add game",
-    "get_backup_list_failed": "Failed to obtain backup information",
+    "get_game_snapshots_failed": "Failed to obtain backup information",
     "backup_failed": "Backup failed, check logs for more information",
-    "delete_backup_failed": "Delete backup failed, check logs for more information",
-    "apply_backup_failed": "Apply backup failed, check logs for more information",
+    "delete_snapshot_failed": "Delete backup failed, check logs for more information",
+    "restore_snapshot_failed": "Apply backup failed, check logs for more information",
     "delete_game_failed": "Failed to delete game",
     "open_backup_folder_failed": "Failed to open backup folder",
     "set_config_failed": "Failed to set config",
@@ -258,7 +264,8 @@
       "quick_apply": "Quick apply",
       "exit": "Exit",
       "success": "Success",
-      "error": "Error"
+      "error": "Error",
+      "find_error_detail": "Please check the log file for details"
     },
     "backup": {
       "extra_backup_file_not_exist": "Since the file does not exist, the extra backup (pre-overwrite backup) cannot be completed and the recovery is aborted. If you don't need this feature, turn it off in settings.",
@@ -285,5 +292,8 @@
     "add_success": "Node added successfully",
     "enable_edit": "Enable editing: You can drag and drop items directly to sort them",
     "game_not_found": "It is recommended to delete this collection as the game does not exist:"
+  },
+  "setting": {
+    "current_quick_action_game": "Current quick backup games"
   }
 }

locales/fr.json

@@ -217,10 +217,10 @@
         "choose_save_file_error": "Misappropriation dans la sélection des documents archivés",
         "choose_executable_file_error": "Manquement dans la sélection d ' un document exécutoire",
         "add_game_failed": "Synchronisation cellulaire",
-        "get_backup_list_failed": "Failure to obtain back-up information",
+        "get_game_snapshots_failed": "Failure to obtain back-up information",
         "backup_failed": "Intervalles de sauvegarde automatiques",
-        "delete_backup_failed": "Points d ' addition réussis",
-        "apply_backup_failed": "Défauts d'application, registres d'inspection pour obtenir plus d'information",
+        "delete_snapshot_failed": "Points d ' addition réussis",
+        "restore_snapshot_failed": "Défauts d'application, registres d'inspection pour obtenir plus d'information",
         "delete_game_failed": "Supprimer l'échec du jeu",
         "open_backup_folder_failed": "Défaut d ' ouvrir les documents",
         "set_config_failed": "Absence de configuration",

locales/ko.json

@@ -185,15 +185,15 @@
         "overwrite_download": "Coverage 다운로드"
     },
     "error": {
-        "delete_backup_failed": "성공적인 추가 포인트",
-        "apply_backup_failed": "신청 실패, 검사 로그는 더 많은 정보를 얻기 위하여",
+        "delete_snapshot_failed": "성공적인 추가 포인트",
+        "restore_snapshot_failed": "신청 실패, 검사 로그는 더 많은 정보를 얻기 위하여",
         "open_url_failed": "링크 열기 실패",
         "config_load_failed": "문서의 실패는 문서가 유효하지 않았거나 사용할 수없는 사실로 인해 될 수 있습니다",
         "choose_save_dir_error": "아카이브 문서의 선택에 실수",
         "choose_save_file_error": "아카이브 문서의 선택에 실수",
         "choose_executable_file_error": "시행 문서의 선택에 실수",
         "add_game_failed": "게임 실패 추가",
-        "get_backup_list_failed": "백업 정보를 얻기 위해 실패",
+        "get_game_snapshots_failed": "백업 정보를 얻기 위해 실패",
         "backup_failed": "자동 백업 간격",
         "delete_game_failed": "게임 실패 삭제",
         "open_backup_folder_failed": "다시 문서를 열 실패",

locales/zh_SIMPLIFIED.json

@@ -37,7 +37,13 @@
     "open_log_folder": "打开日志",
     "log_to_file": "生成文件日志",
     "setting_tips": "带有星号表示重启后生效，其余设置保存后生效",
-    "add_new_to_favorites": "新游戏自动加入收藏夹"
+    "add_new_to_favorites": "新游戏自动加入收藏夹",
+    "quick_action_hotkeys": "快捷备份/恢复热键设置（需要保存设置）",
+    "hotkey": {
+      "hint": "注意，此处设置和其他带有星号设置一样，需要保存并且重启生效，设置为全空即禁用该功能",
+      "quick_backup": "快速备份",
+      "quick_apply": "快速读档"
+    }
   },
   "home": {
     "hello_world": "你好 世界",
@@ -230,10 +236,10 @@
     "choose_save_file_error": "选择存档文件时发生错误",
     "choose_executable_file_error": "选择可执行文件时发生错误",
     "add_game_failed": "添加游戏失败",
-    "get_backup_list_failed": "获取备份信息失败",
+    "get_game_snapshots_failed": "获取备份信息失败",
     "backup_failed": "备份失败，检查日志以获取更多信息",
-    "delete_backup_failed": "删除备份失败，检查日志以获取更多信息",
-    "apply_backup_failed": "应用备份失败，检查日志以获取更多信息",
+    "delete_snapshot_failed": "删除备份失败，检查日志以获取更多信息",
+    "restore_snapshot_failed": "应用备份失败，检查日志以获取更多信息",
     "delete_game_failed": "删除游戏失败",
     "open_backup_folder_failed": "打开备份文件夹失败",
     "set_config_failed": "设置配置失败",
@@ -258,7 +264,8 @@
       "quick_apply": "快速读档",
       "exit": "退出",
       "success": "成功",
-      "error": "错误"
+      "error": "错误",
+      "find_error_detail": "请在日志文件中查看详情"
     },
     "backup": {
       "extra_backup_file_not_exist": "由于文件不存在，无法完成额外备份(覆盖前备份)，恢复中止。如果不需要该功能，请在设置中关闭。",
@@ -285,5 +292,8 @@
     "add_success": "成功添加节点",
     "game_not_found": "建议删除该收藏，因为游戏不存在：",
     "enable_edit": "启用编辑：可以直接拖拽项目进行排序"
+  },
+  "setting": {
+    "current_quick_action_game": "当前快捷备份的游戏"
   }
-}
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "rusty-game-save-manager",
   "private": true,
-  "version": "1.3.2",
+  "version": "1.4.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -15,8 +15,10 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
     "@tauri-apps/api": "^1.5.6",
+    "@types/lodash": "^4.17.9",
     "@vueuse/core": "^10.10.0",
     "element-plus": "^2.7.4",
+    "lodash": "^4.17.21",
     "pinia": "^2.1.7",
     "uuid": "^9.0.1",
     "vue": "^3.4.27",