SteelDynamite/onyx-tasks
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor(tauri): extract parse_uuid helper

Browse source 
17 Tauri commands repeated `Uuid::parse_str(&s).map_err(|e| e.to_string())`
for each UUID argument. Collapse the pattern into a `parse_uuid`
helper so callers read as `let id = parse_uuid(&list_id)?;`.
This commit is contained in:
Claude 2026-04-20 07:35:50 +00:00
parent 7754ea4b45
commit f42697f4ed
No known key found for this signature in database
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
apps/tauri/src-tauri/src/lib.rs
View file

@ -60,6 +60,11 @@ fn lock_state(state: &Mutex<AppState>) -> Result<std::sync::MutexGuard<'_, AppSt
state.lock().map_err(|e| format!("State lock poisoned: {}", e))
}
/// Parse a UUID from a string, converting errors to the String format Tauri commands use.
fn parse_uuid(s: &str) -> Result<Uuid, String> {
Uuid::parse_str(s).map_err(|e| e.to_string())
}
impl AppState {
/// Persist config to disk, converting errors to String for Tauri commands.
fn save_config(&self) -> Result<(), String> {
@ -366,7 +371,7 @@ fn delete_list(
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
mute_watcher(&mut s);
let id = Uuid::parse_str(&list_id).map_err(|e| e.to_string())?;
let id = parse_uuid(&list_id)?;
repo_mut(&mut s)?
.delete_list(id)
.map_err(|e| e.to_string())
@ -381,7 +386,7 @@ fn list_tasks(
) -> Result<Vec<Task>, String> {
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
let id = Uuid::parse_str(&list_id).map_err(|e| e.to_string())?;
let id = parse_uuid(&list_id)?;
repo_ref(&s)?
.list_tasks(id)
.map_err(|e| e.to_string())
@ -400,13 +405,13 @@ fn create_task(
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
mute_watcher(&mut s);
let id = Uuid::parse_str(&list_id).map_err(|e| e.to_string())?;
let id = parse_uuid(&list_id)?;
let mut task = Task::new(title);
if let Some(desc) = description.filter(|d| !d.is_empty()) {
task.description = desc;
}
if let Some(pid) = parent_id {
let parent_uuid = Uuid::parse_str(&pid).map_err(|e| e.to_string())?;
let parent_uuid = parse_uuid(&pid)?;
task.parent_id = Some(parent_uuid);
}
// Accept the date fields at creation time so callers don't have to do a
@ -428,7 +433,7 @@ fn update_task(
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
mute_watcher(&mut s);
let id = Uuid::parse_str(&list_id).map_err(|e| e.to_string())?;
let id = parse_uuid(&list_id)?;
repo_mut(&mut s)?
.update_task(id, task)
.map_err(|e| e.to_string())
@ -443,8 +448,8 @@ fn delete_task(
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
mute_watcher(&mut s);
let lid = Uuid::parse_str(&list_id).map_err(|e| e.to_string())?;
let tid = Uuid::parse_str(&task_id).map_err(|e| e.to_string())?;
let lid = parse_uuid(&list_id)?;
let tid = parse_uuid(&task_id)?;
let repo = repo_mut(&mut s)?;
// Cascade-delete the full descendant subtree (not just direct children)
// so deleting a parent can't leave grandchildren orphaned with a
@ -477,8 +482,8 @@ fn toggle_task(
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
mute_watcher(&mut s);
let lid = Uuid::parse_str(&list_id).map_err(|e| e.to_string())?;
let tid = Uuid::parse_str(&task_id).map_err(|e| e.to_string())?;
let lid = parse_uuid(&list_id)?;
let tid = parse_uuid(&task_id)?;
let repo = repo_mut(&mut s)?;
let mut task = repo.get_task(lid, tid).map_err(|e| e.to_string())?;
match task.status {
@ -513,8 +518,8 @@ fn reorder_task(
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
mute_watcher(&mut s);
let lid = Uuid::parse_str(&list_id).map_err(|e| e.to_string())?;
let tid = Uuid::parse_str(&task_id).map_err(|e| e.to_string())?;
let lid = parse_uuid(&list_id)?;
let tid = parse_uuid(&task_id)?;
repo_mut(&mut s)?
.reorder_task(lid, tid, new_position)
.map_err(|e| e.to_string())
@ -532,9 +537,9 @@ fn move_task(
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
mute_watcher(&mut s);
let from = Uuid::parse_str(&from_list_id).map_err(|e| e.to_string())?;
let to = Uuid::parse_str(&to_list_id).map_err(|e| e.to_string())?;
let tid = Uuid::parse_str(&task_id).map_err(|e| e.to_string())?;
let from = parse_uuid(&from_list_id)?;
let to = parse_uuid(&to_list_id)?;
let tid = parse_uuid(&task_id)?;
repo_mut(&mut s)?
.move_task(from, to, tid)
.map_err(|e| e.to_string())
@ -549,7 +554,7 @@ fn rename_list(
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
mute_watcher(&mut s);
let id = Uuid::parse_str(&list_id).map_err(|e| e.to_string())?;
let id = parse_uuid(&list_id)?;
repo_mut(&mut s)?
.rename_list(id, new_name)
.map_err(|e| e.to_string())
@ -564,7 +569,7 @@ fn set_group_by_date(
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
mute_watcher(&mut s);
let id = Uuid::parse_str(&list_id).map_err(|e| e.to_string())?;
let id = parse_uuid(&list_id)?;
repo_mut(&mut s)?
.set_group_by_date(id, enabled)
.map_err(|e| e.to_string())
@ -577,7 +582,7 @@ fn get_group_by_date(
) -> Result<bool, String> {
let mut s = lock_state(&state)?;
ensure_repo(&mut s)?;
let id = Uuid::parse_str(&list_id).map_err(|e| e.to_string())?;
let id = parse_uuid(&list_id)?;
repo_ref(&s)?
.get_group_by_date(id)
.map_err(|e| e.to_string())