feat (python): 拆分为 python2 和 python3

Author: qianmoQ

src-tauri/src/plugins/manager.rs

@@ -1,4 +1,4 @@
-use super::{python::PythonPlugin, LanguagePlugin};
+use super::{python2::Python2Plugin, python3::Python3Plugin, LanguagePlugin};
 use std::collections::HashMap;
 
 pub struct PluginManager {
@@ -9,7 +9,8 @@ impl PluginManager {
     pub fn new() -> Self {
         let mut plugins: HashMap<String, Box<dyn LanguagePlugin>> = HashMap::new();
 
-        plugins.insert("python".to_string(), Box::new(PythonPlugin));
+        plugins.insert("python2".to_string(), Box::new(Python2Plugin));
+        plugins.insert("python3".to_string(), Box::new(Python3Plugin));
 
         Self { plugins }
     }

src-tauri/src/plugins/mod.rs

@@ -46,6 +46,7 @@ pub trait LanguagePlugin: Send + Sync {
 
 // 重新导出子模块
 pub mod manager;
-pub mod python;
+pub mod python2;
+pub mod python3;
 
 pub use manager::PluginManager;

src-tauri/src/plugins/python.rs src-tauri/src/plugins/python2.rssrc-tauri/src/plugins/python.rs renamed to src-tauri/src/plugins/python2.rs

@@ -1,18 +1,18 @@
 use super::{ExecutionResult, LanguagePlugin};
 
-pub struct PythonPlugin;
+pub struct Python2Plugin;
 
-impl LanguagePlugin for PythonPlugin {
+impl LanguagePlugin for Python2Plugin {
     fn get_language_name(&self) -> &'static str {
-        "Python"
+        "Python 2"
     }
 
     fn get_file_extension(&self) -> &'static str {
         "py"
     }
 
     fn get_commands(&self) -> Vec<&'static str> {
-        vec!["python", "python2", "python3"]
+        vec!["python", "python2"]
     }
 
     fn get_version_args(&self) -> Vec<&'static str> {

src-tauri/src/plugins/python3.rs

@@ -0,0 +1,55 @@
+use super::{ExecutionResult, LanguagePlugin};
+
+pub struct Python3Plugin;
+
+impl LanguagePlugin for Python3Plugin {
+    fn get_language_name(&self) -> &'static str {
+        "Python 3"
+    }
+
+    fn get_file_extension(&self) -> &'static str {
+        "py"
+    }
+
+    fn get_commands(&self) -> Vec<&'static str> {
+        vec!["python", "python3"]
+    }
+
+    fn get_version_args(&self) -> Vec<&'static str> {
+        vec!["--version"]
+    }
+
+    fn get_execute_args(&self, file_path: &str) -> Vec<String> {
+        vec![file_path.to_string()]
+    }
+
+    fn get_path_command(&self) -> String {
+        "import sys; print(sys.executable)".to_string()
+    }
+
+    fn pre_execute_hook(&self, code: &str) -> Result<String, String> {
+        // 添加一些 Python 特定的预处理
+        let processed_code = format!(
+            "# CodeForge Python Execution\n# Generated at: {}\n\n{}",
+            chrono::Utc::now().format("%Y-%m-%d %H:%M:%S UTC"),
+            code
+        );
+        Ok(processed_code)
+    }
+
+    fn post_execute_hook(&self, result: &mut ExecutionResult) -> Result<(), String> {
+        // Python 特定的后处理
+        if result.success && result.stdout.is_empty() && result.stderr.is_empty() {
+            result.stdout = "Code executed successfully (no output)".to_string();
+        }
+
+        // 清理 Python 特定的错误信息
+        if !result.stderr.is_empty() {
+            result.stderr = result
+                .stderr
+                .replace("Traceback (most recent call last):", "Error:");
+        }
+
+        Ok(())
+    }
+}

src/App.vue

@@ -110,7 +110,6 @@ const isSuccess = ref(false)
 const lastExecutionTime = ref(0)
 const activeTab = ref('output')
 const showSettings = ref(false)
-const executionHistory = ref<ExecutionResult[]>([])
 
 const envInfo = ref<EnvInfo>({
   installed: false,
@@ -135,7 +134,7 @@ const showToast = (message: string, type: 'success' | 'error' | 'info' = 'succes
 const refreshEnvInfo = async () => {
   try {
     const info: LanguageInfo = await invoke('get_info', {
-      language: 'python'
+      language: 'python2'
     })
 
     envInfo.value = {
@@ -151,7 +150,7 @@ const refreshEnvInfo = async () => {
       installed: false,
       version: 'Error',
       path: 'Error',
-      language: 'python'
+      language: 'python2'
     }
   }
 }
@@ -169,7 +168,7 @@ const runCode = async () => {
     const result: ExecutionResult = await invoke('execute_code', {
       request: {
         code: code.value,
-        language: 'python'
+        language: 'python2'
       }
     })
 
@@ -199,7 +198,7 @@ const runCode = async () => {
 
 const clearOutput = () => {
   output.value = ''
-  showToast('Output cleared', 'info')
+  showToast('输出已清空', 'info')
 }
 
 onMounted(async () => {

src/components/AppHeader.vue

@@ -13,16 +13,19 @@
     <div class="flex items-center space-x-3">
       <button @click="$emit('run-code')"
               :disabled="isRunning || !envInstalled"
-              :class="['flex items-center space-x-2 px-3 py-1.5 rounded-md font-medium transition-all duration-200 cursor-pointer',
+              :class="['flex items-center space-x-2 px-3 py-1.5 rounded-md font-medium transition-all duration-200',
                 isRunning || !envInstalled
                   ? 'bg-gray-300 text-gray-500 cursor-not-allowed'
-                  : 'btn-success shadow-sm hover:shadow-md'
+                  : 'btn-success shadow-sm hover:shadow-md cursor-pointer'
               ]">
         <component :is="isRunning ? Square : Play" class="w-3 h-3"/>
         <span>{{ isRunning ? '运行中...' : '运行代码' }}</span>
       </button>
 
-      <button @click="$emit('clear-output')" class="btn-danger px-3 py-2.5 rounded-md font-medium transition-all duration-200 cursor-pointer">
+      <button class="btn-danger px-3 py-2.5 rounded-md font-medium transition-all duration-200"
+              :disabled="isRunning || !envInstalled"
+              :class="[isRunning || !envInstalled ? 'cursor-not-allowed' : 'cursor-pointer']"
+              @click="$emit('clear-output')">
         <Trash2 class="w-4 h-4"/>
       </button>
     </div>

src/components/Toast.vue

@@ -75,7 +75,9 @@ const props = withDefaults(defineProps<Props>(), {
 const emit = defineEmits<Emits>()
 
 const progressWidth = ref(100)
+// @ts-ignore
 let progressTimer: NodeJS.Timeout | null = null
+// @ts-ignore
 let autoCloseTimer: NodeJS.Timeout | null = null
 
 // 图标组件映射