refactor(cli): commands

Author: saying121

.github/workflows/release.yml

@@ -34,16 +34,19 @@ jobs:
           tool: cargo-binstall
 
       - name: Install cargo-release
-        run: cargo binstall cargo-release -y
+        run: cargo binstall -y cargo-release
 
       - name: Install Dbus
         run: sudo apt update && sudo apt install libdbus-1-dev pkg-config
 
       - name: Publish crate
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-        run:
-          cargo release publish --allow-branch HEAD --no-confirm --workspace -x || echo "No crates publish."
+        run: |
+          cargo release publish \
+            --allow-branch HEAD \
+            --no-confirm \
+            --workspace -x || echo "No crates publish."
 
   create-release:
     # needs: [publish]

completions/_lcode

@@ -33,7 +33,7 @@ _lcode() {
 _arguments "${_arguments_options[@]}" \
 '-h[Print help]' \
 '--help[Print help]' \
-':input -- Question id:' \
+':id -- Question id:' \
 ":: :_lcode__edit_commands" \
 "*::: :->edit" \
 && ret=0
@@ -48,14 +48,14 @@ _arguments "${_arguments_options[@]}" \
 _arguments "${_arguments_options[@]}" \
 '-h[Print help]' \
 '--help[Print help]' \
-':input -- Question id:' \
+':id -- Question id:' \
 && ret=0
 ;;
 (test)
 _arguments "${_arguments_options[@]}" \
 '-h[Print help]' \
 '--help[Print help]' \
-':input -- Question id:' \
+':id -- Question id:' \
 && ret=0
 ;;
 (help)
@@ -156,7 +156,7 @@ _arguments "${_arguments_options[@]}" \
 '--force[Force update question'\''s information]' \
 '-h[Print help]' \
 '--help[Print help]' \
-':id -- Force update question'\''s information:' \
+':id -- Question id:' \
 && ret=0
 ;;
 (sync)
@@ -171,27 +171,27 @@ _arguments "${_arguments_options[@]}" \
 _arguments "${_arguments_options[@]}" \
 '-h[Print help]' \
 '--help[Print help]' \
-':id:' \
+':id -- Question id:' \
 && ret=0
 ;;
 (submit)
 _arguments "${_arguments_options[@]}" \
 '-h[Print help]' \
 '--help[Print help]' \
-':id:' \
+':id -- Question id:' \
 && ret=0
 ;;
 (sublist)
 _arguments "${_arguments_options[@]}" \
 '-h[Print help]' \
 '--help[Print help]' \
-':id:' \
+':id -- Question id:' \
 && ret=0
 ;;
 (gencon)
 _arguments "${_arguments_options[@]}" \
-'-c[]' \
-'--cn[]' \
+'-c[Generate cn config]' \
+'--cn[Generate cn config]' \
 '-h[Print help]' \
 '--help[Print help]' \
 && ret=0
@@ -336,7 +336,7 @@ esac
 (( $+functions[_lcode_commands] )) ||
 _lcode_commands() {
     local commands; commands=(
-'edit:Edit \`code\` or \`test cases\`, default edit \`code\` \[ alias\: e \]' \
+'edit:Edit \`code\` or \`test cases\`, \[ alias\: e \]' \
 'fzy:Interact select a question (fuzzy search), default view detail \[ alias\: f \]' \
 'detail:View a question detail \[ alias\: D \]' \
 'sync:Syncanhronize leetcode info \[ alias\: S \]' \
@@ -437,7 +437,7 @@ _lcode__help__fzy__edit_commands() {
 (( $+functions[_lcode__fzy_commands] )) ||
 _lcode__fzy_commands() {
     local commands; commands=(
-'detail:View detail' \
+'detail:View detail(default)' \
 'edit:Edit code' \
 'help:Print this message or the help of the given subcommand(s)' \
     )
@@ -446,7 +446,7 @@ _lcode__fzy_commands() {
 (( $+functions[_lcode__help__fzy_commands] )) ||
 _lcode__help__fzy_commands() {
     local commands; commands=(
-'detail:View detail' \
+'detail:View detail(default)' \
 'edit:Edit code' \
     )
     _describe -t commands 'lcode help fzy commands' commands "$@"
@@ -478,7 +478,7 @@ _lcode__edit__help__help_commands() {
 (( $+functions[_lcode__fzy__help_commands] )) ||
 _lcode__fzy__help_commands() {
     local commands; commands=(
-'detail:View detail' \
+'detail:View detail(default)' \
 'edit:Edit code' \
 'help:Print this message or the help of the given subcommand(s)' \
     )
@@ -492,7 +492,7 @@ _lcode__fzy__help__help_commands() {
 (( $+functions[_lcode__help_commands] )) ||
 _lcode__help_commands() {
     local commands; commands=(
-'edit:Edit \`code\` or \`test cases\`, default edit \`code\` \[ alias\: e \]' \
+'edit:Edit \`code\` or \`test cases\`, \[ alias\: e \]' \
 'fzy:Interact select a question (fuzzy search), default view detail \[ alias\: f \]' \
 'detail:View a question detail \[ alias\: D \]' \
 'sync:Syncanhronize leetcode info \[ alias\: S \]' \

crates/lcode/src/cli.rs

@@ -33,7 +33,7 @@ fn print_completions<G: Generator>(gen: G, cmd: &mut Command) {
 enum Commands {
     #[command(
         alias = "e",
-        about = format!("Edit `{cd}` or `{ts}`, default edit `{cd}` {alias}",
+        about = format!("Edit `{cd}` or `{ts}`, {alias}",
                     cd = "code".bold(),
                     ts = "test cases".bold(),
                     alias = "[ alias: e ]".bold()
@@ -51,11 +51,11 @@ enum Commands {
     #[command(alias = "S", about = format!("Syncanhronize leetcode info {}","[ alias: S ]".bold()))]
     Sync(Force),
     #[command(alias = "t", about = format!("Test your code {}", "[ alias: t ]".bold()))]
-    Test(SubTestArgs),
+    Test(IdArg),
     #[command(alias = "st", about = format!("Submit your code {}", "[ alias: st ]".bold()))]
-    Submit(SubTestArgs),
+    Submit(IdArg),
     #[command(alias = "sl", about = format!("Get submit list {}", "[ alias: sl ]".bold()))]
-    Sublist(SubTestArgs),
+    Sublist(IdArg),
     #[command(alias = "g", about = format!("Generate a config {}", "[ alias: g ]".bold()))]
     Gencon(GenArgs),
     #[command(alias = "T", about = format!("Open Tui {}", "[ alias: T ]".bold()))]
@@ -72,14 +72,15 @@ enum Commands {
 #[derive(Args)]
 #[command(args_conflicts_with_subcommands = true)]
 struct GenArgs {
-    #[arg(short, long)]
+    #[arg(short, long, help = "Generate cn config")]
     cn: bool,
 }
 
 #[derive(Debug)]
 #[derive(Args)]
 #[command(args_conflicts_with_subcommands = true)]
-struct SubTestArgs {
+struct IdArg {
+    #[arg(help = "Question id")]
     id: u32,
 }
 
@@ -94,7 +95,7 @@ struct InterArgs {
 #[derive(Debug)]
 #[derive(Subcommand)]
 enum DetailOrEdit {
-    #[command(about = "View detail")]
+    #[command(about = "View detail(default)")]
     Detail(DetailArgsFzy),
     #[command(about = "Edit code")]
     Edit,
@@ -111,7 +112,7 @@ struct DetailArgsFzy {
 #[derive(Args)]
 #[command(args_conflicts_with_subcommands = true)]
 struct DetailArgs {
-    #[arg(help = "Force update question's information")]
+    #[arg(help = "Question id")]
     id:    u32,
     #[arg(short, long, help = "Force update question's information")]
     force: bool,
@@ -132,25 +133,17 @@ struct EditArgs {
     #[command(subcommand)]
     command: Option<CoT>,
 
-    #[command(flatten, help = "Id  of the be edited question, default edit it")]
-    id: Option<EditCodeArgs>,
+    #[command(flatten, help = "Id  of the be edited question")]
+    id: Option<IdArg>,
 }
 
 #[derive(Debug)]
 #[derive(Subcommand)]
 enum CoT {
     #[command(about = "Edit code(default)")]
-    Code(EditCodeArgs),
+    Code(IdArg),
     #[command(about = "Edit test case")]
-    Test(EditCodeArgs),
-}
-
-#[derive(Debug)]
-#[derive(Args)]
-#[command(args_conflicts_with_subcommands = true)]
-struct EditCodeArgs {
-    #[arg(help = "Question id")]
-    input: u32,
+    Test(IdArg),
 }
 
 /// Cli runner
@@ -211,11 +204,11 @@ pub async fn run() -> Result<()> {
             },
             Commands::Edit(args) => match args.command {
                 Some(cmd) => match cmd {
-                    CoT::Code(id) => Editor::open(IdSlug::Id(id.input), CodeTestFile::Code).await?,
-                    CoT::Test(id) => Editor::open(IdSlug::Id(id.input), CodeTestFile::Test).await?,
+                    CoT::Code(id) => Editor::open(IdSlug::Id(id.id), CodeTestFile::Code).await?,
+                    CoT::Test(id) => Editor::open(IdSlug::Id(id.id), CodeTestFile::Test).await?,
                 },
                 None => match args.id {
-                    Some(id) => Editor::open(IdSlug::Id(id.input), CodeTestFile::Code).await?,
+                    Some(id) => Editor::open(IdSlug::Id(id.id), CodeTestFile::Code).await?,
                     None => println!("please give info"),
                 },
             },