From c7573006c670809b9d9208ff79d4690c85ead4cf Mon Sep 17 00:00:00 2001 From: lengyijun Date: Sun, 10 Nov 2024 10:15:06 +0800 Subject: [PATCH] Add args: `--edit-page` and `--edit-patch` Fix https://github.com/tealdeer-rs/tealdeer/issues/383 Co-authored-by: Niklas Mohrin --- src/cli.rs | 8 +++++++ src/main.rs | 67 ++++++++++++++++++++++++++++++++++++++++++---------- tests/lib.rs | 19 +++++++++++++++ 3 files changed, 82 insertions(+), 12 deletions(-) diff --git a/src/cli.rs b/src/cli.rs index e6715075..beded136 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -32,6 +32,14 @@ pub(crate) struct Cli { #[arg(short = 'l', long = "list")] pub list: bool, + /// Edit custom patch with `EDITOR` + #[arg(long, requires = "command", conflicts_with = "edit_page")] + pub edit_patch: bool, + + /// Edit custom page with `EDITOR` + #[arg(long, requires = "command")] + pub edit_page: bool, + /// Render a specific markdown file #[arg( short = 'f', diff --git a/src/main.rs b/src/main.rs index 9dede44d..ed21d195 100644 --- a/src/main.rs +++ b/src/main.rs @@ -32,10 +32,12 @@ compile_error!( use std::{ env, + fs::create_dir_all, io::{self, IsTerminal}, process, }; +use anyhow::anyhow; use app_dirs::AppInfo; use clap::Parser; @@ -276,6 +278,57 @@ fn main() { } }; + let custom_pages_dir = config + .directories + .custom_pages_dir + .as_ref() + .map(PathWithSource::path); + + // Note: According to the TLDR client spec, page names must be transparently + // lowercased before lookup: + // https://github.com/tldr-pages/tldr/blob/main/CLIENT-SPECIFICATION.md#page-names + let command = args.command.join("-").to_lowercase(); + + if args.edit_patch || args.edit_page { + let Some(custom_pages_dir) = custom_pages_dir else { + print_error(enable_styles, &anyhow!("Fail to get custom page dir")); + process::exit(1); + }; + let _ = create_dir_all(custom_pages_dir); + + let file_name = if args.edit_patch { + format!("{command}.patch.md") + } else { + format!("{command}.page.md") + }; + let custom_page_path = custom_pages_dir.join(file_name); + let Ok(editor) = env::var("EDITOR") else { + print_error( + enable_styles, + &anyhow!("`EDITOR` not set. Please set `EDITOR` by `export EDITOR=vim`."), + ); + process::exit(1); + }; + println!("Editing {custom_page_path:?}"); + match std::process::Command::new(&editor) + .arg(custom_page_path.to_str().unwrap()) + .status() + { + Ok(status) => { + if !status.success() { + print_error( + enable_styles, + &anyhow!("{editor} exit with code {:?}", status.code()), + ); + } + } + Err(e) => { + print_error(enable_styles, &e.into()); + } + } + return; + } + // Show various paths if args.show_paths { show_paths(&config); @@ -321,7 +374,7 @@ fn main() { // Check cache presence and freshness if !cache_updated - && (args.list || !args.command.is_empty()) + && (args.list || !command.is_empty()) && check_cache(&cache, &args, enable_styles) == CheckCacheResult::CacheMissing { process::exit(1); @@ -329,11 +382,6 @@ fn main() { // List cached commands and exit if args.list { - let custom_pages_dir = config - .directories - .custom_pages_dir - .as_ref() - .map(PathWithSource::path); println!( "{}", cache.list_pages(custom_pages_dir, platforms).join("\n") @@ -342,12 +390,7 @@ fn main() { } // Show command from cache - if !args.command.is_empty() { - // Note: According to the TLDR client spec, page names must be transparently - // lowercased before lookup: - // https://github.com/tldr-pages/tldr/blob/main/CLIENT-SPECIFICATION.md#page-names - let command = args.command.join("-").to_lowercase(); - + if !command.is_empty() { // Collect languages let languages = args .language diff --git a/tests/lib.rs b/tests/lib.rs index fa8d19c7..768a237e 100644 --- a/tests/lib.rs +++ b/tests/lib.rs @@ -959,3 +959,22 @@ fn test_raw_render_file() { .success() .stdout(diff(include_str!("inkscape-v1.md"))); } + +#[test] +fn test_edit_page() { + let testenv = TestEnv::new(); + testenv.write_config(format!( + "[directories]\ncustom_pages_dir = '{}'", + testenv.custom_pages_dir.path().to_str().unwrap() + )); + + let args = vec!["--edit-page", "foo"]; + + testenv + .command() + .args(&args) + .env("EDITOR", "touch") + .assert() + .success(); + assert!(testenv.custom_pages_dir.path().join("foo.page.md").exists()); +}