ilaborie · gwennlbh · Jun 8, 2025 · Jun 9, 2025 · Jun 10, 2025 · Jun 13, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,6 +33,7 @@ indicatif = "0.17"
 jiff = { version = "0.2.15", features = ["serde"] }
 reqwest = { version = "0.12", features = ["json", "rustls-tls-native-roots"] }
 serde = { version = "1", features = ["derive"] }
+serde_json = "1.0.140"
 tokio = { version = "1.45", features = [
   "process",
   "fs",

diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs
@@ -1,10 +1,14 @@
 use std::process::exit;
 
 use console::Term;
+use serde::{Deserialize, Serialize};
 use tracing::{info, warn};
 use url::Url;
 
 use crate::git::has_staged_changes;
+use crate::recover::{
+    ask_for_recovery, clear_recovery_file, read_recovery_file, write_recovery_file,
+};
 use crate::{git, EmojiFormat, Error, GitmojiConfig, Result, EXIT_CANNOT_UPDATE, EXIT_NO_CONFIG};
 
 mod commit;
@@ -50,10 +54,10 @@ async fn update_config_or_stop(config: GitmojiConfig) -> GitmojiConfig {
     }
 }
 
-#[derive(Debug, Clone)]
-struct CommitTitleDescription {
-    title: String,
-    description: Option<String>,
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CommitTitleDescription {
+    pub title: String,
+    pub description: Option<String>,
 }
 
 #[tracing::instrument(skip(term))]
@@ -92,15 +96,47 @@ pub async fn commit(all: bool, amend: bool, term: &Term) -> Result<()> {
         return Ok(());
     }
 
-    let CommitTitleDescription { title, description } =
-        ask_commit_title_description(&config, term).await?;
+    let commit = match read_recovery_file() {
+        Ok(Some(commit)) => match ask_for_recovery(term, commit.clone()) {
+            Ok(true) => commit,
+            _ => ask_commit_title_description(&config, term).await?,
+        },
+        Ok(None) => ask_commit_title_description(&config, term).await?,
+        Err(err) => {
+            warn!("Cannot read recovery file: {err}");
+            ask_commit_title_description(&config, term).await?
+        }
+    };
 
     // Add before commit
     let all = all || config.auto_add();
 
     // Commit
-    let status = git::commit(all, amend, config.signed(), &title, description.as_deref()).await?;
-    status.success().then_some(()).ok_or(Error::FailToCommit)
+    let status = git::commit(
+        all,
+        amend,
+        config.signed(),
+        &commit.title,
+        commit.description.as_deref(),
+    )
+    .await?;
+
+    match status.success().then_some(()).ok_or(Error::FailToCommit) {
+        Ok(()) => {
+            if let Err(recovery_err) = clear_recovery_file() {
+                warn!("{recovery_err}");
+            }
+
+            Ok(())
+        }
+        Err(err) => {
+            if let Err(recovery_err) = write_recovery_file(commit) {
+                warn!("{recovery_err}");
+            }
+
+            Err(err)
+        }
+    }
 }
 
 /// Configure Gitmoji

diff --git a/src/lib.rs b/src/lib.rs
@@ -14,6 +14,7 @@ mod cmd;
 mod error;
 mod git;
 mod model;
+mod recover;
 
 use std::io::stdout;
 

diff --git a/src/recover.rs b/src/recover.rs
@@ -0,0 +1,113 @@
+use console::Term;
+use dialoguer::{theme::ColorfulTheme, Confirm};
+
+use crate::cmd::CommitTitleDescription;
+use std::{
+    fs,
+    io::{Error, ErrorKind::NotFound},
+};
+
+#[derive(Debug, derive_more::Error, derive_more::Display)]
+#[display("Could not {action} recovery file: {source}")]
+pub struct RecoveryError {
+    // The source error
+    #[error(source)]
+    source: Error,
+
+    action: String,
+}
+
+type Result<T> = std::result::Result<T, RecoveryError>;
+
+pub fn ask_for_recovery(
+    term: &Term,
+    recovered: CommitTitleDescription,
+) -> std::result::Result<bool, dialoguer::Error> {
+    Ok(Confirm::with_theme(&ColorfulTheme::default())
+        .with_prompt(format!(
+            "Last commit failed. Reuse recovered commit message “{}” ?",
+            recovered.title
+        ))
+        .default(true)
+        .interact_on(term)?)
+}
+
+pub fn write_recovery_file(params: CommitTitleDescription) -> Result<()> {
+    let path = directories::BaseDirs::new()
+        .ok_or(RecoveryError {
+            source: Error::new(NotFound, "Base directories not found"),
+            action: "write".to_string(),
+        })?
+        .cache_dir()
+        .join("gitmoji-rs")
+        .join("lastmessage.json");
+
+    if !path.exists() {
+        let dir = path.parent().ok_or(RecoveryError {
+            source: Error::new(NotFound, "path to file is has no parent"),
+            action: "create directory for".to_string(),
+        })?;
+
+        fs::create_dir_all(dir).expect("Failed to create recovery directory");
+    }
+
+    let content = serde_json::to_string(&params).map_err(|source| RecoveryError {
+        source: source.into(),
+        action: "serialize".to_string(),
+    })?;
+
+    fs::write(path, content).map_err(|source| RecoveryError {
+        source,
+        action: "write".to_string(),
+    })?;
+
+    Ok(())
+}
+
+pub fn read_recovery_file() -> Result<Option<CommitTitleDescription>> {
+    let path = directories::BaseDirs::new()
+        .ok_or(RecoveryError {
+            source: Error::new(NotFound, "Base directories not found"),
+            action: "read".to_string(),
+        })?
+        .cache_dir()
+        .join("gitmoji-rs")
+        .join("lastmessage.json");
+
+    if !path.exists() {
+        return Ok(None);
+    }
+
+    let content = fs::read_to_string(&path).map_err(|source| RecoveryError {
+        source,
+        action: "read".to_string(),
+    })?;
+
+    let params: CommitTitleDescription =
+        serde_json::from_str(&content).map_err(|source| RecoveryError {
+            source: source.into(),
+            action: "deserialize".to_string(),
+        })?;
+
+    Ok(Some(params))
+}
+
+pub fn clear_recovery_file() -> Result<()> {
+    let path = directories::BaseDirs::new()
+        .ok_or(RecoveryError {
+            source: Error::new(NotFound, "Base directories not found"),
+            action: "clear".to_string(),
+        })?
+        .cache_dir()
+        .join("gitmoji-rs")
+        .join("lastmessage.json");
+
+    if path.exists() {
+        fs::remove_file(path).map_err(|source| RecoveryError {
+            source,
+            action: "remove".to_string(),
+        })?;
+    }
+
+    Ok(())
+}