asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow deleteing more than one item at once

Browse Source
This commit is contained in:
Andrew Phillips
2023-09-01 15:38:05 +00:00
parent 0ac453408f
commit 3d91385b42
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main.rs
View File

@@ -578,25 +578,24 @@ fn mode_update(cmd: &mut Command, args: Args, ids: &mut Vec<i64>, tags: &mut Vec
fn mode_delete(cmd: &mut Command, _args: Args, ids: &mut Vec<i64>, tags: &mut Vec<String>, conn: &mut Connection, data_path: PathBuf) -> Result<()> { fn mode_delete(cmd: &mut Command, _args: Args, ids: &mut Vec<i64>, tags: &mut Vec<String>, conn: &mut Connection, data_path: PathBuf) -> Result<()> {
if ids.is_empty() { if ids.is_empty() {
cmd.error(ErrorKind::InvalidValue, "No ID given, you must supply one ID when using --delete").exit(); cmd.error(ErrorKind::InvalidValue, "No ID given, you must supply atleast one ID when using --delete").exit();
} else if ! tags.is_empty() { } else if ! tags.is_empty() {
cmd.error(ErrorKind::InvalidValue, "Tags given, you must supply one ID when using --delete").exit(); cmd.error(ErrorKind::InvalidValue, "Tags given but not supported, you must supply atleast one ID when using --delete").exit();
} else if ids.len() > 1 {
cmd.error(ErrorKind::InvalidValue, "More than one ID given, you must supply one ID when using --delete").exit();
} }
let item_id = ids.iter().next().expect("Unable to determine item id"); for item_id in ids.iter() {
let item_maybe = db::get_item(conn, *item_id)?; if let Some(item) = db::get_item(conn, *item_id)? {
debug!("MAIN: Found item {:?}", item);
db::delete_item(conn, item)?;
let item = item_maybe.expect("Unable to find item in database"); let mut item_path = data_path.clone();
debug!("MAIN: Found item {:?}", item); item_path.push(item_id.to_string());
db::delete_item(conn, item)?; fs::remove_file(&item_path).context(anyhow!("Unable to remove item file {:?}", item_path))?;
} else {
let mut item_path = data_path.clone(); warn!("Unable to find item {item_id} in database");
item_path.push(item_id.to_string()); }
}
fs::remove_file(&item_path).context(anyhow!("Unable to remove item file {:?}", item_path))?;
Ok(()) Ok(())
} }