refactor: streamline CLI and code structure

- rename CLI flags for clarity (copy to copy_to_clipboard, print_table to check_env)
- add JSON output format with enum-based detection in main.rs
- simplify conditional checks using if-let patterns in repository and openai modules
- fix copyright typo in message.rs
- add serde_json and serde dependencies for JSON serialization

Signed-off-by: mingcheng <[email protected]>

Author: mingcheng

Cargo.lock

@@ -21,6 +21,8 @@ dependencies = [
  "git2",
  "log",
  "reqwest",
+ "serde",
+ "serde_json",
  "tabled",
  "tokio",
  "tracing",
@@ -1842,9 +1844,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.32"
+version = "0.23.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40"
+checksum = "751e04a496ca00bb97a5e043158d23d66b5aabf2e1d5aa2a0aaebb1aafe6f82c"
 dependencies = [
  "once_cell",
  "ring",

Cargo.toml

@@ -38,6 +38,8 @@ tracing = "0.1"
 tracing-subscriber = "0.3"
 arboard = "3.6"
 tabled = "0.20"
+serde_json = "1.0.145"
+serde = { version = "1.0.228", features = ["derive"] }
 
 [[bin]]
 name = "aigitcommit"

src/cli.rs

@@ -76,15 +76,31 @@ If not specified, the current directory will be used"#,
         default_value_t = false,
         required = false
     )]
-    pub copy: bool,
+    pub copy_to_clipboard: bool,
+
+    #[arg(
+        long,
+        help = "Print the commit message in JSON format",
+        default_value_t = false,
+        required = false
+    )]
+    pub json: bool,
 
     #[arg(
         long,
         help = "Print the commit message in a table format",
-        default_value_t = true,
+        default_value_t = false,
+        required = false
+    )]
+    pub no_table: bool,
+
+    #[arg(
+        long,
+        help = "Check current environment variables for OpenAI API key and model name",
+        default_value_t = false,
         required = false
     )]
-    pub print_table: bool,
+    pub check_env: bool,
 
     #[arg(
         long,

src/git/message.rs

@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) 2025 Hangzhou Guanwaii Technology Co,.Ltd.
+ * Copyright (c) 2025 Hangzhou Guanwaii Technology Co., Ltd.
  *
  * This source code is licensed under the MIT License,
  * which is located in the LICENSE file in the source tree's root directory.
@@ -9,7 +9,7 @@
  * File Created: 2025-10-16 15:06:58
  *
  * Modified By: mingcheng <[email protected]>
- * Last Modified: 2025-10-16 17:03:29
+ * Last Modified: 2025-10-17 18:22:55
  */
 
 use crate::git::repository::Repository;
@@ -21,6 +21,7 @@ use tracing::trace;
 /// A commit message consists of:
 /// - `title`: The first line (subject line), typically 50-72 characters
 /// - `content`: The body of the commit message with detailed description
+#[derive(Debug, serde::Serialize)]
 pub struct GitMessage {
     pub title: String,
     pub content: String,

src/git/repository.rs

@@ -9,7 +9,7 @@
  * File Created: 2025-10-16 15:07:05
  *
  * Modified By: mingcheng <[email protected]>
- * Last Modified: 2025-10-16 22:55:18
+ * Last Modified: 2025-10-17 18:27:34
  */
 
 use git2::{Repository as _Repo, RepositoryOpenFlags, Signature};
@@ -199,13 +199,12 @@ impl Repository {
         let mut result = Vec::new();
         diff.print(git2::DiffFormat::Patch, |delta, _hunk, line| {
             // Check if the file should be excluded
-            if let Some(path) = delta.new_file().path() {
-                if let Some(filename) = path.file_name() {
-                    if excluded_files.contains(&filename.to_string_lossy().as_ref()) {
-                        warn!("skipping excluded file: {}", filename.to_string_lossy());
-                        return true; // Skip this file
-                    }
-                }
+            if let Some(path) = delta.new_file().path()
+                && let Some(filename) = path.file_name()
+                && excluded_files.contains(&filename.to_string_lossy().as_ref())
+            {
+                warn!("skipping excluded file: {}", filename.to_string_lossy());
+                return true; // Skip this file
             }
 
             // Add non-empty lines to result

src/main.rs

@@ -12,7 +12,7 @@
  * Last Modified: 2025-09-26 15:45:37
  */
 
-use aigitcommit::cli::{print_table, Cli};
+use aigitcommit::cli::{Cli, print_table};
 use aigitcommit::git::message::GitMessage;
 use aigitcommit::git::repository::Repository;
 use aigitcommit::openai;
@@ -28,7 +28,26 @@ use std::error::Error;
 use std::fs::File;
 use std::io::Write;
 use std::{env, fs};
-use tracing::{debug, trace, Level};
+use tracing::{Level, debug, trace};
+
+/// The output format for the commit message
+#[derive(Debug)]
+enum OutPutFormat {
+    Stdout,
+    Table,
+    Json,
+}
+
+/// Detect the output format based on the command line arguments
+fn detect_output_format(cli: &Cli) -> OutPutFormat {
+    if cli.json {
+        return OutPutFormat::Json;
+    } else if cli.no_table {
+        return OutPutFormat::Stdout;
+    }
+
+    OutPutFormat::Table
+}
 
 #[tokio::main]
 async fn main() -> std::result::Result<(), Box<dyn Error>> {
@@ -146,16 +165,26 @@ async fn main() -> std::result::Result<(), Box<dyn Error>> {
 
     let message: GitMessage = GitMessage::new(&repository, title, content, need_signoff)?;
 
-    // Write the commit message to stdout
-    trace!("write to stdout, and finish the process");
-    if cli.print_table {
-        print_table(&message.title, &message.content);
-    } else {
-        writeln!(std::io::stdout(), "{}", message)?;
-    }
+    // Decide the output format based on the command line arguments
+    match detect_output_format(&cli) {
+        OutPutFormat::Stdout => {
+            // Write the commit message to stdout
+            trace!("write to stdout, and finish the process");
+            writeln!(std::io::stdout(), "{}", message)?;
+        }
+        OutPutFormat::Json => {
+            // Print the commit message in JSON format
+            let json = serde_json::to_string_pretty(&message)?;
+            writeln!(std::io::stdout(), "{}", json)?;
+        }
+        OutPutFormat::Table => {
+            // Default print message in table
+            print_table(&message.title, &message.content);
+        }
+    };
 
     // Copy the commit message to clipboard if the --copy option is enabled
-    if cli.copy {
+    if cli.copy_to_clipboard {
         let mut clipboard = Clipboard::new()?;
         clipboard.set_text(format!("{}", &message))?;
         writeln!(

src/openai.rs

@@ -21,9 +21,9 @@ use askama::Template;
 use async_openai::config::OPENAI_API_BASE;
 use async_openai::error::OpenAIError;
 use async_openai::{
+    Client,
     config::OpenAIConfig,
     types::{ChatCompletionRequestMessage, CreateChatCompletionRequestArgs},
-    Client,
 };
 use log::trace;
 use reqwest::header::{HeaderMap, HeaderValue};
@@ -88,11 +88,11 @@ impl OpenAI {
 
         let request_timeout =
             env::var("OPENAI_REQUEST_TIMEOUT").unwrap_or_else(|_| String::from(""));
-        if !request_timeout.is_empty() {
-            if let Ok(timeout) = request_timeout.parse::<u64>() {
-                trace!("Setting request timeout to: {request_timeout}ms");
-                http_client_builder = http_client_builder.timeout(Duration::from_millis(timeout));
-            }
+        if !request_timeout.is_empty()
+            && let Ok(timeout) = request_timeout.parse::<u64>()
+        {
+            trace!("Setting request timeout to: {request_timeout}ms");
+            http_client_builder = http_client_builder.timeout(Duration::from_millis(timeout));
         }
 
         // Set up timeout and build the HTTP client