refactor: restructure git module with message abstraction 🔄

- rename git.rs to repository.rs for better semantic clarity
- create GitMessage struct to encapsulate commit message logic
- extract Author struct for cleaner user data handling
- update commit method to accept GitMessage instead of raw strings
- integrate table display with structured message formatting

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

Author: mingcheng

src/lib.rs

@@ -13,5 +13,8 @@
  */
 
 pub mod cli;
-pub mod git;
+// pub mod git;
 pub mod openai;
+
+pub mod message;
+pub mod repository;

src/main.rs

@@ -12,10 +12,11 @@
  * Last Modified: 2025-09-26 15:45:37
  */
 
-use aigitcommit::cli::Cli;
-use aigitcommit::git::Git;
+use aigitcommit::cli::{print_table, Cli};
+use aigitcommit::message::GitMessage;
 use aigitcommit::openai;
 use aigitcommit::openai::OpenAI;
+use aigitcommit::repository::Git;
 use arboard::Clipboard;
 use async_openai::error::OpenAIError;
 use async_openai::types::{
@@ -135,20 +136,28 @@ async fn main() -> std::result::Result<(), Box<dyn Error>> {
         }
     };
 
+    let (title, content) = result.split_once("\n\n").unwrap();
+
     // Detect auto signoff from environment variable
     let need_signoff = cli.signoff
         || env::var("GIT_AUTO_SIGNOFF")
             .map(|v| v == "1" || v.eq_ignore_ascii_case("true"))
             .unwrap_or(false);
 
+    let message: GitMessage = GitMessage::new(&repository, title, content, need_signoff)?;
+
     // Write the commit message to stdout
     trace!("write to stdout, and finish the process");
-    writeln!(std::io::stdout(), "{result}")?;
+    if cli.print_table {
+        print_table(&message.title, &message.content);
+    } else {
+        writeln!(std::io::stdout(), "{}", message)?;
+    }
 
     // Copy the commit message to clipboard if the --copy option is enabled
     if cli.copy {
         let mut clipboard = Clipboard::new()?;
-        clipboard.set_text(&result)?;
+        clipboard.set_text(&message.to_string())?;
         writeln!(
             std::io::stdout(),
             "the commit message has been copied to clipboard."
@@ -165,7 +174,7 @@ async fn main() -> std::result::Result<(), Box<dyn Error>> {
 
         // Prompt the user for confirmation if --yes option is not enabled
         if cli.yes || confirm.interact()? {
-            match repository.commit(&result, need_signoff) {
+            match repository.commit(&message) {
                 Ok(_) => {
                     writeln!(std::io::stdout(), "commit successful!")?;
                 }

src/message.rs

@@ -0,0 +1,67 @@
+/*!
+ * 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.
+ *
+ * File: message.rs
+ * Author: mingcheng <[email protected]>
+ * File Created: 2025-10-16 15:06:58
+ *
+ * Modified By: mingcheng <[email protected]>
+ * Last Modified: 2025-10-16 15:25:14
+ */
+
+use std::{error::Error, fmt::Display};
+
+use log::trace;
+
+use crate::repository::Git;
+
+pub struct GitMessage {
+    pub title: String,
+    pub content: String,
+}
+
+impl Display for GitMessage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.to_string().fmt(f)
+    }
+}
+
+impl GitMessage {
+    pub fn new(
+        repository: &Git,
+        title: &str,
+        content: &str,
+        signoff: bool,
+    ) -> Result<Self, Box<dyn Error>> {
+        if title.is_empty() || content.is_empty() {
+            return Err("the commit message is invalid".into());
+        }
+
+        let mut content = content.trim().to_string();
+        // If the --signoff option is enabled, add signoff to the commit message
+        if signoff {
+            trace!("signoff option is enabled, will add signoff to the commit message");
+
+            let author = repository.get_author()?;
+            // Add signoff to the commit message
+            let _m = format!("\n\nSigned-off-by: {} <{}>", author.name, author.email);
+            content.push_str(&_m);
+        }
+
+        Ok(Self {
+            title: title.trim().to_string(),
+            content,
+        })
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.title.is_empty() && self.content.is_empty()
+    }
+
+    pub fn to_string(&self) -> String {
+        format!("{}\n\n{}", self.title, self.content)
+    }
+}

src/git.rs renamed to src/repository.rs

@@ -1,26 +1,39 @@
-/*
+/*!
  * 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.
  *
- * File: git.rs
- * Author: mingcheng ([email protected])
- * File Created: 2025-03-01 21:55:54
+ * File: repository.rs
+ * Author: mingcheng <[email protected]>
+ * File Created: 2025-10-16 15:07:05
  *
- * Modified By: mingcheng ([email protected])
- * Last Modified: 2025-09-26 14:43:17
+ * Modified By: mingcheng <[email protected]>
+ * Last Modified: 2025-10-16 15:28:33
  */
 
 use git2::{Repository, RepositoryOpenFlags, Signature, StatusOptions};
 use log::trace;
 use std::error::Error;
+use std::fmt::{Display, Formatter};
 use std::path::Path;
 
+use crate::message::GitMessage;
+
+pub struct Author {
+    pub name: String,
+    pub email: String,
+}
 pub struct Git {
     repository: Repository,
 }
 
+impl Display for Git {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Git repository at {}", self.repository.path().display())
+    }
+}
+
 impl Git {
     pub fn new(path: &str) -> Result<Git, Box<dyn Error>> {
         trace!("opening repository at {path}");
@@ -37,10 +50,10 @@ impl Git {
     }
 
     /// Commit the changes in the repository
-    pub fn commit(&self, message: &str, need_signoff: bool) -> Result<(), Box<dyn Error>> {
+    pub fn commit(&self, message: &GitMessage) -> Result<(), Box<dyn Error>> {
         // Get the current index (staged changes)
 
-        let mut message = message.to_string();
+        let message = message.to_string();
         let mut index = self.repository.index()?;
 
         // Write the index to the repository
@@ -51,20 +64,10 @@ impl Git {
         let head = self.repository.head()?.peel_to_commit()?;
 
         // Create a new commit
-        let author_name = self.get_author_name()?;
-        let author_email = self.get_author_email()?;
+        let author = self.get_author()?;
 
         // Create a signature for the author and committer
-        let signature = Signature::now(&author_name, &author_email)?;
-
-        // If the --signoff option is enabled, add signoff to the commit message
-        if need_signoff {
-            trace!("signoff option is enabled, will add signoff to the commit message");
-
-            // Add signoff to the commit message
-            let signoff = format!("\n\nSigned-off-by: {author_name} <{author_email}>");
-            message.push_str(&signoff);
-        }
+        let signature = Signature::now(&author.name, &author.email)?;
 
         match self.repository.commit(
             Some("HEAD"),
@@ -86,40 +89,17 @@ impl Git {
     }
 
     /// Get the author email and name from the repository configuration
-    pub fn get_author_email(&self) -> Result<String, Box<dyn Error>> {
+    pub fn get_author(&self) -> Result<Author, Box<dyn Error>> {
         // Get the configuration of the repository
         let config = self.repository.config()?;
 
         // Get the user email from the configuration
-        match config.get_string("user.email") {
-            Ok(email) => {
-                trace!("get author email: {email} from config `user.email`");
-                Ok(email)
-            }
-
-            Err(e) => {
-                trace!("failed to get author email: {e}");
-                Err(Box::new(e))
-            }
-        }
-    }
-
-    pub fn get_author_name(&self) -> Result<String, Box<dyn Error>> {
-        // Get the configuration of the repository
-        let config = self.repository.config()?;
+        let email = config.get_string("user.email")?;
 
         // Get the user name from the configuration
-        match config.get_string("user.name") {
-            Ok(name) => {
-                trace!("get author name: {name} from config `user.name`");
-                Ok(name)
-            }
+        let name = config.get_string("user.name")?;
 
-            Err(e) => {
-                trace!("failed to get author name: {e}");
-                Err(Box::new(e))
-            }
-        }
+        Ok(Author { name, email })
     }
 
     /// Get the diff of the current repository