diff --git a/Cargo.lock b/Cargo.lock index d54ca97..11f04f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -579,7 +579,7 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gpt-shell" -version = "0.3.13" +version = "0.3.14" dependencies = [ "anyhow", "async-openai", diff --git a/src/bots.rs b/src/bots.rs index 9d60cd1..ed413d5 100644 --- a/src/bots.rs +++ b/src/bots.rs @@ -1,11 +1,10 @@ use std::fs; use std::path::PathBuf; use std::collections::HashMap; -use std::process::Command; use serde::{Serialize, Deserialize}; use anyhow::Result; use colored::*; -use std::env; +use crate::utils; #[derive(Debug, Serialize, Deserialize)] pub struct Bot { @@ -40,71 +39,21 @@ impl BotsConfig { pub fn save(&self) -> Result<()> { if let Some(path) = Self::get_path() { - // ensure directory exists - if let Some(parent) = path.parent() { - fs::create_dir_all(parent)?; - } - let content = toml::to_string_pretty(self)?; - fs::write(path, content)?; + utils::save_file(&content, &path)?; } Ok(()) } pub fn get_path() -> Option { - let home = env::var("HOME").or_else(|_| env::var("USERPROFILE")).ok()?; - let mut path = PathBuf::from(home); - path.push(".gpt-shell"); + let mut path = utils::get_config_dir()?; path.push("bots.toml"); Some(path) } pub fn open_config() -> Result<()> { if let Some(path) = Self::get_path() { - if cfg!(windows) { - // 首先尝试使用 VSCode - if Command::new("code") - .arg(path.clone()) - .spawn() - .is_err() { - // 如果 VSCode 不可用，尝试使用 Notepad++ - if Command::new("notepad++") - .arg(path.clone()) - .spawn() - .is_err() { - // 最后使用系统默认的记事本 - Command::new("notepad") - .arg(path) - .spawn()?; - } - } - } else { - // 在类Unix系统上，首先尝试使用环境变量中的默认编辑器 - if let Ok(editor) = env::var("EDITOR") { - Command::new(editor) - .arg(path.clone()) - .spawn()?; - } else { - // 如果没有设置 EDITOR，尝试常见的编辑器 - let editors = ["code", "vim", "nano", "gedit"]; - let mut opened = false; - for editor in editors { - if Command::new(editor) - .arg(path.clone()) - .spawn() - .is_ok() { - opened = true; - break; - } - } - // 如果都失败了，使用 xdg-open - if !opened { - Command::new("xdg-open") - .arg(path) - .spawn()?; - } - } - } + utils::open_file_in_editor(&path)?; } Ok(()) } @@ -155,7 +104,7 @@ impl BotsConfig { if alias.len() != 1 { return Err(anyhow::anyhow!("alias must be a single character")); } - // 检查机器人是否存在 + // 检查器人是否存在 if !self.bots.contains_key(&bot) { return Err(anyhow::anyhow!("bot not found: {}", bot)); } diff --git a/src/config.rs b/src/config.rs index 3c87ee1..ce9201c 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,11 +1,10 @@ -use std::fs; -use std::path::PathBuf; -use std::process::Command; -use serde::{Serialize, Deserialize}; use anyhow::Result; use colored::*; -use std::env; +use serde::{Deserialize, Serialize}; use std::collections::HashMap; +use std::fs; +use std::path::PathBuf; +use crate::utils; #[derive(Debug, Serialize, Deserialize)] pub struct ModelConfig { @@ -30,7 +29,6 @@ fn default_model() -> Option { Some("your are a AI assistant".to_string()) } - fn default_stream() -> bool { true } @@ -60,7 +58,10 @@ impl Config { config.save()?; println!("提示：已添加默认 OpenAI 配置，请使用以下命令设置 API Key："); - println!(" gpt config model add {} ", default_name.green()); + println!( + " gpt config model add {} ", + default_name.green() + ); } Ok(config) @@ -68,79 +69,35 @@ impl Config { Ok(Config::default()) } } - + pub fn save(&self) -> Result<()> { if let Some(path) = Self::get_path() { - // ensure directory exists - if let Some(parent) = path.parent() { - fs::create_dir_all(parent)?; - } - let content = toml::to_string_pretty(self)?; - fs::write(path, content)?; + utils::save_file(&content, &path)?; } Ok(()) } - + pub fn get_path() -> Option { - let home = env::var("HOME").or_else(|_| env::var("USERPROFILE")).ok()?; - let mut path = PathBuf::from(home); - path.push(".gpt-shell"); + let mut path = utils::get_config_dir()?; path.push("config.toml"); Some(path) } pub fn open_config() -> Result<()> { if let Some(path) = Self::get_path() { - if cfg!(windows) { - // 首先尝试使用 VSCode - if Command::new("code") - .arg(path.clone()) - .spawn() - .is_err() { - // 如果 VSCode 不可用，尝试使用 Notepad++ - if Command::new("notepad++") - .arg(path.clone()) - .spawn() - .is_err() { - // 最使用系统默认的记事本 - Command::new("notepad") - .arg(path) - .spawn()?; - } - } - } else { - // 在类Unix系统上，首先尝试使用环境变量中的默认编辑器 - if let Ok(editor) = env::var("EDITOR") { - Command::new(editor) - .arg(path.clone()) - .spawn()?; - } else { - // 如果没有设置 EDITOR，尝试常见的编辑器 - let editors = ["code", "vim", "nano", "gedit"]; - let mut opened = false; - for editor in editors { - if Command::new(editor) - .arg(path.clone()) - .spawn() - .is_ok() { - opened = true; - break; - } - } - // 如果都失败了，使用 xdg-open - if !opened { - Command::new("xdg-open") - .arg(path) - .spawn()?; - } - } - } + utils::open_file_in_editor(&path)?; } Ok(()) } - pub fn add_model(&mut self, name: String, api_key: String, api_url: String, model: String) -> Result<()> { + pub fn add_model( + &mut self, + name: String, + api_key: String, + api_url: String, + model: String, + ) -> Result<()> { let model_config = ModelConfig { api_key, api_url, @@ -197,18 +154,21 @@ impl Config { println!("- {}{}", name.green(), current); println!(" API URL: {}", config.api_url); println!(" Model: {}", config.model); - println!(" API Key: {}", if config.api_key.is_empty() { - "not set".red() - } else { - "set".green() - }); + println!( + " API Key: {}", + if config.api_key.is_empty() { + "not set".red() + } else { + "set".green() + } + ); } } pub fn get_current_model(&self) -> Option<(&str, &ModelConfig)> { - self.current_model.as_ref().and_then(|name| { - self.models.get(name).map(|config| (name.as_str(), config)) - }) + self.current_model + .as_ref() + .and_then(|name| self.models.get(name).map(|config| (name.as_str(), config))) } pub fn set_system_prompt(&mut self, prompt: Option) -> Result<()> { @@ -221,11 +181,14 @@ impl Config { pub fn set_stream(&mut self, enabled: bool) -> Result<()> { self.stream = enabled; self.save()?; - println!("stream output {}", if enabled { - "enabled".green() - } else { - "disabled".yellow() - }); + println!( + "stream output {}", + if enabled { + "enabled".green() + } else { + "disabled".yellow() + } + ); Ok(()) } -} \ No newline at end of file +} diff --git a/src/main.rs b/src/main.rs index c62913e..bf511ac 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,6 +5,7 @@ mod llm_provider; mod config; mod bots; mod update; +mod utils; use clap::{Command, Arg}; use colored::*; diff --git a/src/utils.rs b/src/utils.rs new file mode 100644 index 0000000..3049e0f --- /dev/null +++ b/src/utils.rs @@ -0,0 +1,51 @@ +use anyhow::Result; +use std::path::PathBuf; +use std::fs; +use std::env; +use std::process::Command; + +pub fn get_config_dir() -> Option { + let home = env::var("HOME").or_else(|_| env::var("USERPROFILE")).ok()?; + let mut path = PathBuf::from(home); + path.push(".gpt-shell"); + Some(path) +} + +pub fn save_file(content: &str, file_path: &PathBuf) -> Result<()> { + if let Some(parent) = file_path.parent() { + fs::create_dir_all(parent)?; + } + fs::write(file_path, content)?; + Ok(()) +} + +pub fn open_file_in_editor(path: &PathBuf) -> Result<()> { + if cfg!(windows) { + if Command::new("code").arg(path).spawn().is_err() { + if Command::new("C:\\Windows\\System32\\notepad.exe") + .arg(path) + .spawn() + .is_err() + { + println!("can not open editor, the file path is: {}", path.display()); + } + } + } else { + if let Ok(editor) = env::var("EDITOR") { + Command::new(editor).arg(path).spawn()?; + } else { + let editors = ["code", "vim", "nano", "gedit"]; + let mut opened = false; + for editor in editors { + if Command::new(editor).arg(path).spawn().is_ok() { + opened = true; + break; + } + } + if !opened { + Command::new("xdg-open").arg(path).spawn()?; + } + } + } + Ok(()) +} \ No newline at end of file