修复 i18n
This commit is contained in:
@@ -45,13 +45,13 @@ struct CommandFrontmatter {
|
||||
/// Parse a markdown file with optional YAML frontmatter
|
||||
fn parse_markdown_with_frontmatter(content: &str) -> Result<(Option<CommandFrontmatter>, String)> {
|
||||
let lines: Vec<&str> = content.lines().collect();
|
||||
|
||||
|
||||
// Check if the file starts with YAML frontmatter
|
||||
if lines.is_empty() || lines[0] != "---" {
|
||||
// No frontmatter
|
||||
return Ok((None, content.to_string()));
|
||||
}
|
||||
|
||||
|
||||
// Find the end of frontmatter
|
||||
let mut frontmatter_end = None;
|
||||
for (i, line) in lines.iter().enumerate().skip(1) {
|
||||
@@ -60,12 +60,12 @@ fn parse_markdown_with_frontmatter(content: &str) -> Result<(Option<CommandFront
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if let Some(end) = frontmatter_end {
|
||||
// Extract frontmatter
|
||||
let frontmatter_content = lines[1..end].join("\n");
|
||||
let body_content = lines[(end + 1)..].join("\n");
|
||||
|
||||
|
||||
// Parse YAML
|
||||
match serde_yaml::from_str::<CommandFrontmatter>(&frontmatter_content) {
|
||||
Ok(frontmatter) => Ok((Some(frontmatter), body_content)),
|
||||
@@ -86,20 +86,20 @@ fn extract_command_info(file_path: &Path, base_path: &Path) -> Result<(String, O
|
||||
let relative_path = file_path
|
||||
.strip_prefix(base_path)
|
||||
.context("Failed to get relative path")?;
|
||||
|
||||
|
||||
// Remove .md extension
|
||||
let path_without_ext = relative_path
|
||||
.with_extension("")
|
||||
.to_string_lossy()
|
||||
.to_string();
|
||||
|
||||
|
||||
// Split into components
|
||||
let components: Vec<&str> = path_without_ext.split('/').collect();
|
||||
|
||||
|
||||
if components.is_empty() {
|
||||
return Err(anyhow::anyhow!("Invalid command path"));
|
||||
}
|
||||
|
||||
|
||||
if components.len() == 1 {
|
||||
// No namespace
|
||||
Ok((components[0].to_string(), None))
|
||||
@@ -112,44 +112,43 @@ fn extract_command_info(file_path: &Path, base_path: &Path) -> Result<(String, O
|
||||
}
|
||||
|
||||
/// Load a single command from a markdown file
|
||||
fn load_command_from_file(
|
||||
file_path: &Path,
|
||||
base_path: &Path,
|
||||
scope: &str,
|
||||
) -> Result<SlashCommand> {
|
||||
fn load_command_from_file(file_path: &Path, base_path: &Path, scope: &str) -> Result<SlashCommand> {
|
||||
debug!("Loading command from: {:?}", file_path);
|
||||
|
||||
|
||||
// Read file content
|
||||
let content = fs::read_to_string(file_path)
|
||||
.context("Failed to read command file")?;
|
||||
|
||||
let content = fs::read_to_string(file_path).context("Failed to read command file")?;
|
||||
|
||||
// Parse frontmatter
|
||||
let (frontmatter, body) = parse_markdown_with_frontmatter(&content)?;
|
||||
|
||||
|
||||
// Extract command info
|
||||
let (name, namespace) = extract_command_info(file_path, base_path)?;
|
||||
|
||||
|
||||
// Build full command (no scope prefix, just /command or /namespace:command)
|
||||
let full_command = match &namespace {
|
||||
Some(ns) => format!("/{ns}:{name}"),
|
||||
None => format!("/{name}"),
|
||||
};
|
||||
|
||||
|
||||
// Generate unique ID
|
||||
let id = format!("{}-{}", scope, file_path.to_string_lossy().replace('/', "-"));
|
||||
|
||||
let id = format!(
|
||||
"{}-{}",
|
||||
scope,
|
||||
file_path.to_string_lossy().replace('/', "-")
|
||||
);
|
||||
|
||||
// Check for special content
|
||||
let has_bash_commands = body.contains("!`");
|
||||
let has_file_references = body.contains('@');
|
||||
let accepts_arguments = body.contains("$ARGUMENTS");
|
||||
|
||||
|
||||
// Extract metadata from frontmatter
|
||||
let (description, allowed_tools) = if let Some(fm) = frontmatter {
|
||||
(fm.description, fm.allowed_tools.unwrap_or_default())
|
||||
} else {
|
||||
(None, Vec::new())
|
||||
};
|
||||
|
||||
|
||||
Ok(SlashCommand {
|
||||
id,
|
||||
name,
|
||||
@@ -171,18 +170,18 @@ fn find_markdown_files(dir: &Path, files: &mut Vec<PathBuf>) -> Result<()> {
|
||||
if !dir.exists() {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
|
||||
for entry in fs::read_dir(dir)? {
|
||||
let entry = entry?;
|
||||
let path = entry.path();
|
||||
|
||||
|
||||
// Skip hidden files/directories
|
||||
if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
|
||||
if name.starts_with('.') {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if path.is_dir() {
|
||||
find_markdown_files(&path, files)?;
|
||||
} else if path.is_file() {
|
||||
@@ -193,7 +192,7 @@ fn find_markdown_files(dir: &Path, files: &mut Vec<PathBuf>) -> Result<()> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -252,16 +251,16 @@ pub async fn slash_commands_list(
|
||||
) -> Result<Vec<SlashCommand>, String> {
|
||||
info!("Discovering slash commands");
|
||||
let mut commands = Vec::new();
|
||||
|
||||
|
||||
// Add default commands
|
||||
commands.extend(create_default_commands());
|
||||
|
||||
|
||||
// Load project commands if project path is provided
|
||||
if let Some(proj_path) = project_path {
|
||||
let project_commands_dir = PathBuf::from(&proj_path).join(".claude").join("commands");
|
||||
if project_commands_dir.exists() {
|
||||
debug!("Scanning project commands at: {:?}", project_commands_dir);
|
||||
|
||||
|
||||
let mut md_files = Vec::new();
|
||||
if let Err(e) = find_markdown_files(&project_commands_dir, &mut md_files) {
|
||||
error!("Failed to find project command files: {}", e);
|
||||
@@ -280,13 +279,13 @@ pub async fn slash_commands_list(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Load user commands
|
||||
if let Some(home_dir) = dirs::home_dir() {
|
||||
let user_commands_dir = home_dir.join(".claude").join("commands");
|
||||
if user_commands_dir.exists() {
|
||||
debug!("Scanning user commands at: {:?}", user_commands_dir);
|
||||
|
||||
|
||||
let mut md_files = Vec::new();
|
||||
if let Err(e) = find_markdown_files(&user_commands_dir, &mut md_files) {
|
||||
error!("Failed to find user command files: {}", e);
|
||||
@@ -305,7 +304,7 @@ pub async fn slash_commands_list(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
info!("Found {} slash commands", commands.len());
|
||||
Ok(commands)
|
||||
}
|
||||
@@ -314,17 +313,17 @@ pub async fn slash_commands_list(
|
||||
#[tauri::command]
|
||||
pub async fn slash_command_get(command_id: String) -> Result<SlashCommand, String> {
|
||||
debug!("Getting slash command: {}", command_id);
|
||||
|
||||
|
||||
// Parse the ID to determine scope and reconstruct file path
|
||||
let parts: Vec<&str> = command_id.split('-').collect();
|
||||
if parts.len() < 2 {
|
||||
return Err("Invalid command ID".to_string());
|
||||
}
|
||||
|
||||
|
||||
// The actual implementation would need to reconstruct the path and reload the command
|
||||
// For now, we'll list all commands and find the matching one
|
||||
let commands = slash_commands_list(None).await?;
|
||||
|
||||
|
||||
commands
|
||||
.into_iter()
|
||||
.find(|cmd| cmd.id == command_id)
|
||||
@@ -343,16 +342,16 @@ pub async fn slash_command_save(
|
||||
project_path: Option<String>,
|
||||
) -> Result<SlashCommand, String> {
|
||||
info!("Saving slash command: {} in scope: {}", name, scope);
|
||||
|
||||
|
||||
// Validate inputs
|
||||
if name.is_empty() {
|
||||
return Err("Command name cannot be empty".to_string());
|
||||
}
|
||||
|
||||
|
||||
if !["project", "user"].contains(&scope.as_str()) {
|
||||
return Err("Invalid scope. Must be 'project' or 'user'".to_string());
|
||||
}
|
||||
|
||||
|
||||
// Determine base directory
|
||||
let base_dir = if scope == "project" {
|
||||
if let Some(proj_path) = project_path {
|
||||
@@ -366,7 +365,7 @@ pub async fn slash_command_save(
|
||||
.join(".claude")
|
||||
.join("commands")
|
||||
};
|
||||
|
||||
|
||||
// Build file path
|
||||
let mut file_path = base_dir.clone();
|
||||
if let Some(ns) = &namespace {
|
||||
@@ -374,41 +373,40 @@ pub async fn slash_command_save(
|
||||
file_path = file_path.join(component);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Create directories if needed
|
||||
fs::create_dir_all(&file_path)
|
||||
.map_err(|e| format!("Failed to create directories: {}", e))?;
|
||||
|
||||
fs::create_dir_all(&file_path).map_err(|e| format!("Failed to create directories: {}", e))?;
|
||||
|
||||
// Add filename
|
||||
file_path = file_path.join(format!("{}.md", name));
|
||||
|
||||
|
||||
// Build content with frontmatter
|
||||
let mut full_content = String::new();
|
||||
|
||||
|
||||
// Add frontmatter if we have metadata
|
||||
if description.is_some() || !allowed_tools.is_empty() {
|
||||
full_content.push_str("---\n");
|
||||
|
||||
|
||||
if let Some(desc) = &description {
|
||||
full_content.push_str(&format!("description: {}\n", desc));
|
||||
}
|
||||
|
||||
|
||||
if !allowed_tools.is_empty() {
|
||||
full_content.push_str("allowed-tools:\n");
|
||||
for tool in &allowed_tools {
|
||||
full_content.push_str(&format!(" - {}\n", tool));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
full_content.push_str("---\n\n");
|
||||
}
|
||||
|
||||
|
||||
full_content.push_str(&content);
|
||||
|
||||
|
||||
// Write file
|
||||
fs::write(&file_path, &full_content)
|
||||
.map_err(|e| format!("Failed to write command file: {}", e))?;
|
||||
|
||||
|
||||
// Load and return the saved command
|
||||
load_command_from_file(&file_path, &base_dir, &scope)
|
||||
.map_err(|e| format!("Failed to load saved command: {}", e))
|
||||
@@ -416,35 +414,38 @@ pub async fn slash_command_save(
|
||||
|
||||
/// Delete a slash command
|
||||
#[tauri::command]
|
||||
pub async fn slash_command_delete(command_id: String, project_path: Option<String>) -> Result<String, String> {
|
||||
pub async fn slash_command_delete(
|
||||
command_id: String,
|
||||
project_path: Option<String>,
|
||||
) -> Result<String, String> {
|
||||
info!("Deleting slash command: {}", command_id);
|
||||
|
||||
|
||||
// First, we need to determine if this is a project command by parsing the ID
|
||||
let is_project_command = command_id.starts_with("project-");
|
||||
|
||||
|
||||
// If it's a project command and we don't have a project path, error out
|
||||
if is_project_command && project_path.is_none() {
|
||||
return Err("Project path required to delete project commands".to_string());
|
||||
}
|
||||
|
||||
|
||||
// List all commands (including project commands if applicable)
|
||||
let commands = slash_commands_list(project_path).await?;
|
||||
|
||||
|
||||
// Find the command by ID
|
||||
let command = commands
|
||||
.into_iter()
|
||||
.find(|cmd| cmd.id == command_id)
|
||||
.ok_or_else(|| format!("Command not found: {}", command_id))?;
|
||||
|
||||
|
||||
// Delete the file
|
||||
fs::remove_file(&command.file_path)
|
||||
.map_err(|e| format!("Failed to delete command file: {}", e))?;
|
||||
|
||||
|
||||
// Clean up empty directories
|
||||
if let Some(parent) = Path::new(&command.file_path).parent() {
|
||||
let _ = remove_empty_dirs(parent);
|
||||
}
|
||||
|
||||
|
||||
Ok(format!("Deleted command: {}", command.full_command))
|
||||
}
|
||||
|
||||
@@ -453,18 +454,18 @@ fn remove_empty_dirs(dir: &Path) -> Result<()> {
|
||||
if !dir.exists() {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
|
||||
// Check if directory is empty
|
||||
let is_empty = fs::read_dir(dir)?.next().is_none();
|
||||
|
||||
|
||||
if is_empty {
|
||||
fs::remove_dir(dir)?;
|
||||
|
||||
|
||||
// Try to remove parent if it's also empty
|
||||
if let Some(parent) = dir.parent() {
|
||||
let _ = remove_empty_dirs(parent);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user