giers10/auto-git-gui
1
0
Fork 0
Code Releases Activity

Refactor: Improves error handling syntax, cleans up option binding, and fixes return type consistency in src-tauri/src/main.rs

Browse Source
This commit is contained in:
Victor Giers
2026-07-12 11:25:13 +02:00
parent a0cb179d6e
commit 8769d32855
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src-tauri/src/main.rs
View File

@@ -909,10 +909,12 @@ fn generate_llm_message_for_commit(
let llm_raw = stream_ollama(&prompt, model, 0.3, app)?;
let parsed = parse_llm_commit_messages(&llm_raw)?;
let validated = validate_llm_commit_messages(parsed, &hashes)?;
validated
.get(hash)
.cloned()
.ok_or_else(|| format!("No validated message was returned for {}.", short_hash(hash)))
validated.get(hash).cloned().ok_or_else(|| {
format!(
"No validated message was returned for {}.",
short_hash(hash)
)
})
}
fn get_commits_for_llm(folder_path: &str, hashes: &[String]) -> CommandResult<Vec<Value>> {
@@ -2890,7 +2892,11 @@ fn run_manual_rewrite_job(
let total = hashes.len();
let (model, queued_before, original_birthday) = match state.store.lock() {
Ok(store) => {
let Some(folder) = store.folders.iter().find(|folder| folder.path == folder_path) else {
let Some(folder) = store
.folders
.iter()
.find(|folder| folder.path == folder_path)
else {
return;
};
(
@@ -3142,7 +3148,9 @@ fn rewrite_pending_commits(
}
let hashes = pending_rewrite_hashes(&folder_path, &folder.llm_candidates);
if hashes.is_empty() {
return Ok(json!({ "success": false, "error": "There are no pending commits to rewrite." }));
return Ok(
json!({ "success": false, "error": "There are no pending commits to rewrite." }),
);
}
folder.rewrite_in_progress = true;
folder.rewrite_started_at = Some(now_ms());