feat (core): 支持语言配置更新

qianmoQ · qianmoQ · commit a6cba845f817 · 2025-08-10T22:07:22.000+08:00
diff --git a/package.json b/package.json
@@ -15,12 +15,14 @@
     "@tauri-apps/plugin-opener": "^2",
     "@tauri-apps/plugin-shell": "^2.3.0",
     "@vueuse/core": "^13.6.0",
+    "lodash-es": "^4.17.21",
     "lucide-vue-next": "^0.539.0",
     "vue": "^3.5.13"
   },
   "devDependencies": {
     "@tailwindcss/postcss": "^4.1.11",
     "@tauri-apps/cli": "^2",
+    "@types/lodash-es": "^4.17.12",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.21",
     "postcss": "^8.5.6",
diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs
@@ -1,11 +1,13 @@
 use crate::plugins::PluginConfig;
+// 全局配置管理器
+use crate::PluginManagerState;
 use log::{info, warn};
 use serde::{Deserialize, Serialize};
 use std::fs;
 use std::path::PathBuf;
-// 全局配置管理器
 use std::sync::Mutex;
-use tauri::command;
+use tauri::{AppHandle, Manager, command};
+
 static CONFIG_MANAGER: Mutex<Option<ConfigManager>> = Mutex::new(None);
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -35,9 +37,9 @@ pub struct ConfigManager {
 }
 
 impl ConfigManager {
-    pub fn new() -> Result<Self, String> {
+    pub fn new(app_handle: Option<&AppHandle>) -> Result<Self, String> {
         let config_path = Self::get_config_path()?;
-        let config = Self::load_config(&config_path)?;
+        let config = Self::load_config(&config_path, app_handle)?;
 
         Ok(Self {
             config_path,
@@ -59,27 +61,65 @@ impl ConfigManager {
         Ok(config_file)
     }
 
-    fn load_config(config_path: &PathBuf) -> Result<AppConfig, String> {
+    fn load_config(
+        config_path: &PathBuf,
+        app_handle: Option<&AppHandle>,
+    ) -> Result<AppConfig, String> {
+        println!("读取配置 -> 正在读取配置文件 {:?}", config_path);
         if config_path.exists() {
             match fs::read_to_string(config_path) {
                 Ok(content) => match serde_json::from_str::<AppConfig>(&content) {
-                    Ok(config) => {
-                        info!("读取配置 -> 成功加载配置文件: {:?}", config_path);
+                    Ok(mut config) => {
+                        println!("读取配置 -> 成功加载配置文件: {:?}", config_path);
+
+                        // 检查 plugins 是否为 null，如果是则加载默认配置
+                        if config.plugins.is_none() {
+                            println!("读取配置 -> plugins 为 null，加载默认插件配置");
+                            config.plugins = Self::get_default_plugins_config(app_handle);
+                        }
+
                         Ok(config)
                     }
                     Err(e) => {
                         warn!("读取配置 -> 配置文件格式错误，使用默认配置: {}", e);
-                        Ok(AppConfig::default())
+                        Ok(Self::create_default_config(app_handle))
                     }
                 },
                 Err(e) => {
                     warn!("读取配置 -> 读取配置文件失败，使用默认配置: {}", e);
-                    Ok(AppConfig::default())
+                    Ok(Self::create_default_config(app_handle))
                 }
             }
         } else {
-            info!("读取配置 -> 配置文件不存在，使用默认配置");
-            Ok(AppConfig::default())
+            println!("读取配置 -> 配置文件不存在，使用默认配置");
+            Ok(Self::create_default_config(app_handle))
+        }
+    }
+
+    fn get_default_plugins_config(app_handle: Option<&AppHandle>) -> Option<Vec<PluginConfig>> {
+        if let Some(handle) = app_handle {
+            // 从 Tauri 状态中获取 PluginManager
+            if let Some(plugin_manager_state) = handle.try_state::<PluginManagerState>() {
+                // 同步访问插件管理器
+                if let Ok(manager) = plugin_manager_state.try_lock() {
+                    return Some(manager.get_all_plugin_default_config());
+                } else {
+                    println!("读取配置 -> 无法获取插件管理器锁，使用空配置");
+                }
+            } else {
+                println!("读取配置 -> 无法获取插件管理器状态，使用空配置");
+            }
+        }
+        Some(vec![])
+    }
+
+    fn create_default_config(app_handle: Option<&AppHandle>) -> AppConfig {
+        AppConfig {
+            log_directory: None,
+            auto_clear_logs: Some(true),
+            keep_log_days: Some(30),
+            theme: Some("system".to_string()),
+            plugins: Self::get_default_plugins_config(app_handle),
         }
     }
 
@@ -89,7 +129,7 @@ impl ConfigManager {
 
         fs::write(&self.config_path, content).map_err(|e| format!("写入配置文件失败: {}", e))?;
 
-        info!("保存配置 -> 配置文件已保存: {:?}", self.config_path);
+        info!("保存配置 -> 配置文件已保存 {}", self.config_path.display());
         Ok(())
     }
 
@@ -108,15 +148,15 @@ impl ConfigManager {
 }
 
 // 初始化配置
-pub fn init_config() -> Result<(), String> {
-    let config_manager = ConfigManager::new()?;
+pub fn init_config(app_handle: Option<&AppHandle>) -> Result<(), String> {
+    let config_manager = ConfigManager::new(app_handle)?;
 
     // 如果配置中有自定义日志目录，设置到日志系统
     if let Some(log_dir) = config_manager.get_log_directory() {
-        info!("初始化 -> 从配置文件加载日志目录: {}", log_dir);
+        println!("读取配置 -> 从配置文件加载日志目录: {}", log_dir);
         // 使用内部函数设置，避免循环保存
         if let Err(e) = crate::logger::set_log_directory_internal(log_dir.to_string()) {
-            warn!("初始化 -> 应用配置中的日志目录失败: {}", e);
+            warn!("读取配置 -> 应用配置中的日志目录失败: {}", e);
         }
     }
 
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -46,7 +46,7 @@ async fn execute_code(
         "codeforge_{}_{}.{}",
         request.language,
         execution_id,
-        plugin.get_file_extension().first().unwrap().to_string()
+        plugin.get_file_extension()
     ));
 
     let processed_code = plugin.pre_execute_hook(&request.code).map_err(|e| {
@@ -62,7 +62,7 @@ async fn execute_code(
         .map_err(|e| format!("Failed to write temporary file: {}", e))?;
 
     let start_time = std::time::Instant::now();
-    let mut last_error = String::new();
+    let mut last_error: String = String::new();
 
     let cmd = plugin.get_command();
     let args = plugin.get_execute_args(file_path.to_str().unwrap());
@@ -162,6 +162,16 @@ async fn get_info(
         .get_plugin(&language)
         .ok_or_else(|| format!("Unsupported language: {}", language))?;
 
+    plugin.pre_execute_hook(&String::new()).map_err(|e| {
+        error!(
+            "获取环境 -> 调用插件 [ {} ] pre_execute_hook 出现错误 {:?}",
+            language, e
+        );
+
+        error!("获取环境 -> 调用插件 [ {} ] 失败", language);
+        format!("Pre-execution hook failed: {}", e)
+    })?;
+
     let cmd = plugin.get_command();
     debug!("获取环境 -> 插件 [ {} ] 命令 {}", language, cmd);
 
@@ -239,7 +249,7 @@ fn main() {
         .manage(PluginManagerState::new(PluginManager::new()))
         .setup(|app| {
             // 第一步：初始化配置系统
-            if let Err(e) = init_config() {
+            if let Err(e) = init_config(Some(app.handle())) {
                 eprintln!("Failed to initialize config: {}", e);
             }
 
diff --git a/src-tauri/src/plugins/manager.rs b/src-tauri/src/plugins/manager.rs
@@ -1,4 +1,4 @@
-use super::{LanguagePlugin, python2::Python2Plugin, python3::Python3Plugin};
+use super::{python2::Python2Plugin, python3::Python3Plugin, LanguagePlugin, PluginConfig};
 use std::collections::HashMap;
 
 pub struct PluginManager {
@@ -53,7 +53,7 @@ impl PluginManager {
     pub fn get_plugin_info(&self, language: &str) -> Option<PluginInfo> {
         self.get_plugin(language).map(|plugin| PluginInfo {
             name: plugin.get_language_name().to_string(),
-            file_extension: plugin.get_file_extension().first().unwrap().to_string(),
+            file_extension: plugin.get_file_extension(),
             available_commands: vec![plugin.get_command().to_string()],
         })
     }
@@ -64,11 +64,18 @@ impl PluginManager {
             .values()
             .map(|plugin| PluginInfo {
                 name: plugin.get_language_name().to_string(),
-                file_extension: plugin.get_file_extension().first().unwrap().to_string(),
-                available_commands: vec![plugin.get_command().to_string()]
+                file_extension: plugin.get_file_extension(),
+                available_commands: vec![plugin.get_command().to_string()],
             })
             .collect()
     }
+
+    pub fn get_all_plugin_default_config(&self) -> Vec<PluginConfig> {
+        self.plugins
+            .values()
+            .map(|plugin| plugin.get_default_config())
+            .collect()
+    }
 }
 
 #[derive(Debug, serde::Serialize)]
diff --git a/src-tauri/src/plugins/mod.rs b/src-tauri/src/plugins/mod.rs
@@ -33,7 +33,7 @@ pub struct LanguageInfo {
 pub struct PluginConfig {
     pub enabled: bool,                  // 插件是否启用
     pub execute_home: Option<String>,   // 插件的执行路径
-    pub extensions: Vec<String>,        // 插件支持的文件扩展名
+    pub extension: String,              // 插件支持的文件扩展名
     pub language: String,               // 插件所属语言
     pub before_compile: Option<String>, // 插件在编译前执行的命令
     pub after_compile: Option<String>,  // 插件在编译完成后执行的命令
@@ -55,8 +55,8 @@ pub trait LanguagePlugin: Send + Sync {
     fn get_language_key(&self) -> &'static str;
 
     // 获取插件支持的文件扩展名
-    fn get_file_extension(&self) -> Vec<String> {
-        self.get_config().unwrap().extensions.clone()
+    fn get_file_extension(&self) -> String {
+        self.get_config().unwrap().extension.clone()
     }
 
     // 获取执行目录
diff --git a/src-tauri/src/plugins/python2.rs b/src-tauri/src/plugins/python2.rs
@@ -33,7 +33,7 @@ impl LanguagePlugin for Python2Plugin {
             enabled: true,
             language: String::from("python2"),
             before_compile: None,
-            extensions: vec![String::from("py")],
+            extension: String::from("py"),
             execute_home: None,
             run_command: Option::from(String::from("python2 $filename")),
             after_compile: None,
diff --git a/src-tauri/src/plugins/python3.rs b/src-tauri/src/plugins/python3.rs
@@ -32,7 +32,7 @@ impl LanguagePlugin for Python3Plugin {
             enabled: true,
             language: String::from("python3"),
             before_compile: None,
-            extensions: vec![String::from("py")],
+            extension: String::from("py"),
             execute_home: None,
             run_command: Option::from(String::from("python3 $filename")),
             after_compile: None,
diff --git a/src-tauri/src/setup/menus/app.rs b/src-tauri/src/setup/menus/app.rs
@@ -1,6 +1,7 @@
+use log::info;
 use tauri::{
-    AppHandle, Emitter,
-    menu::{MenuItemBuilder, Submenu, SubmenuBuilder},
+    menu::{MenuItemBuilder, Submenu, SubmenuBuilder}, AppHandle,
+    Emitter,
 };
 
 pub fn create_app_submenu(app: &AppHandle) -> tauri::Result<Submenu<tauri::Wry>> {
@@ -38,6 +39,7 @@ pub fn handle_app_menu_event(app: &AppHandle, event_id: &str) {
             let _event = app.emit("show-settings", ());
         }
         "quit" => {
+            info!("CodeForge 应用关闭");
             app.exit(0);
         }
         _ => {}
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
@@ -1,24 +1,33 @@
 <template>
   <Modal v-model:show="isVisible" title="设置" size="4xl" :close-on-backdrop="false" :close-on-esc="false" @close="closeSettings">
     <Tabs v-model="activeTab" type="card" size="md" :tabs="tabsData">
+      <!-- 通用配置 -->
       <template #general>
         <General/>
       </template>
+
+      <!-- 语言配置 -->
+      <template #language>
+        <Language/>
+      </template>
     </Tabs>
   </Modal>
 </template>
 
 <script setup lang="ts">
 import { nextTick, onMounted, ref } from 'vue'
-import { ShieldIcon } from 'lucide-vue-next'
+import { BracesIcon, ShieldIcon } from 'lucide-vue-next'
 import Modal from '../ui/Modal.vue'
 import Tabs from '../ui/Tabs.vue'
 import General from './setting/General.vue'
+import Language from './setting/Language.vue'
+import { useToast } from '../plugins/toast.ts'
 
 const isVisible = ref(false)
 const activeTab = ref('general')
 const tabsData = [
-  { key: 'general', label: '通用', icon: ShieldIcon }
+  { key: 'general', label: '通用', icon: ShieldIcon },
+  { key: 'language', label: '语言', icon: BracesIcon }
 ]
 
 const emit = defineEmits<{
@@ -32,6 +41,8 @@ const closeSettings = () => {
   }, 300)
 }
 
+const toast = useToast()
+
 onMounted(async () => {
   // 延迟显示动画
   await nextTick()
diff --git a/src/components/setting/Language.vue b/src/components/setting/Language.vue
diff --git a/src/types/plugin.ts b/src/types/plugin.ts
diff --git a/src/ui/Tabs.vue b/src/ui/Tabs.vue
