Stricter error handling

Author: probablykasper

ferrum-addon/addon.d.ts

@@ -23,7 +23,11 @@ export interface CountObject {
 /** Returns the deleted track lists, including folder children */
 export declare function delete_track_list(id: string): void
 
-export declare function delete_tracks_with_item_ids(itemIds: Array<ItemId>): void
+export declare function delete_tracks_with_item_ids(itemIds: Array<ItemId>): FerrumStatus
+
+export type FerrumStatus =
+  | { type: 'Ok' }
+  | { type: 'FileDeletionError', field0: string }
 
 export interface Folder {
   id: TrackListID
@@ -133,7 +137,7 @@ export declare function save_view_options(viewOptions: ViewOptions): void
 
 export declare function set_image(index: number, pathStr: string): void
 
-export declare function set_image_data(index: number, bytes: Uint8Array): void
+export declare function set_image_data(index: number, bytes: ArrayBuffer): void
 
 export interface Special {
   id: TrackListID

src-native/lib.rs

@@ -20,6 +20,20 @@ mod sort;
 mod tracks;
 mod view_options;
 
+#[napi]
+pub enum FerrumStatus {
+	Ok,
+	FileDeletionError(String),
+}
+impl FerrumStatus {
+	pub fn is_err(&self) -> bool {
+		match self {
+			FerrumStatus::Ok => false,
+			FerrumStatus::FileDeletionError(_) => true,
+		}
+	}
+}
+
 fn get_now_timestamp() -> i64 {
 	let timestamp = match SystemTime::now().duration_since(UNIX_EPOCH) {
 		Ok(n) => n.as_millis() as i64,

src-native/library.rs

@@ -149,16 +149,16 @@ pub fn get_track_field_type(field: &str) -> Result<TrackField> {
 
 #[napi(js_name = "get_genres")]
 #[allow(dead_code)]
-pub fn get_genres(env: Env) -> Result<Vec<String>> {
+pub fn get_genres(env: Env) -> Vec<String> {
 	let data: &mut Data = get_data(&env);
 	let genres = data.library.get_genres();
-	Ok(genres.clone())
+	genres.clone()
 }
 
 #[napi(js_name = "get_artists")]
 #[allow(dead_code)]
-pub fn get_artists(env: Env) -> Result<Vec<String>> {
+pub fn get_artists(env: Env) -> Vec<String> {
 	let data: &mut Data = get_data(&env);
 	let genres = data.library.get_artists();
-	Ok(genres.clone())
+	genres.clone()
 }

src-native/library_types.rs

@@ -1,7 +1,7 @@
 #![allow(non_snake_case)]
 
-use crate::get_now_timestamp;
 use crate::playlists::{delete_file, remove_from_all_playlists};
+use crate::{FerrumStatus, get_now_timestamp};
 use anyhow::{Context, Result, bail};
 use linked_hash_map::{Entry, LinkedHashMap};
 use nanoid::nanoid;
@@ -138,13 +138,20 @@ impl Library {
 		track_id_map.push(id.clone());
 		self.track_item_ids.insert(id, item_id);
 	}
-	pub fn delete_track_and_file(&mut self, id: &TrackID, tracks_dir: &PathBuf) -> Result<()> {
+	pub fn delete_track_and_file(
+		&mut self,
+		id: &TrackID,
+		tracks_dir: &PathBuf,
+	) -> Result<FerrumStatus> {
 		let file_path = {
 			let track = self.get_track(id)?;
 			tracks_dir.join(&track.file)
 		};
 		if !file_path.exists() {
-			bail!("File does not exist: {}", file_path.to_string_lossy());
+			return Ok(FerrumStatus::FileDeletionError(format!(
+				"File does not exist: {}",
+				file_path.to_string_lossy()
+			)));
 		}
 
 		remove_from_all_playlists(self, id);
@@ -154,8 +161,10 @@ impl Library {
 		self.track_item_ids
 			.remove(id)
 			.expect("Track ID not found when deleting (2)");
-		delete_file(&file_path)?;
-		Ok(())
+		Ok(match delete_file(&file_path) {
+			Ok(_) => FerrumStatus::Ok,
+			Err(err) => FerrumStatus::FileDeletionError(err.to_string()),
+		})
 	}
 	pub fn generate_id(&self) -> String {
 		let alphabet: [char; 32] = [

src-native/playlists.rs

@@ -4,7 +4,7 @@ use crate::library_types::{
 	ItemId, Library, SpecialTrackListName, TRACK_ID_MAP, TrackID, TrackList,
 	get_track_ids_from_item_ids, new_item_ids_from_track_ids,
 };
-use crate::str_to_option;
+use crate::{FerrumStatus, str_to_option};
 use anyhow::{Context, Result, bail};
 use linked_hash_map::LinkedHashMap;
 use napi::{Env, Unknown};
@@ -25,10 +25,9 @@ pub struct TrackListDetails {
 
 #[napi(js_name = "get_track_lists_details")]
 #[allow(dead_code)]
-pub fn get_track_lists_details(env: Env) -> Result<HashMap<String, TrackListDetails>> {
+pub fn get_track_lists_details(env: Env) -> HashMap<String, TrackListDetails> {
 	let data: &Data = get_data(&env);
-	Ok(data
-		.library
+	data.library
 		.trackLists
 		.iter()
 		.map(|(id, tracklist)| {
@@ -54,7 +53,7 @@ pub fn get_track_lists_details(env: Env) -> Result<HashMap<String, TrackListDeta
 				},
 			);
 		})
-		.collect())
+		.collect()
 }
 
 #[napi(js_name = "get_track_list", ts_return_type = "TrackList")]
@@ -217,14 +216,17 @@ pub fn delete_file(path: &PathBuf) -> Result<()> {
 
 #[napi(js_name = "delete_tracks_with_item_ids")]
 #[allow(dead_code)]
-pub fn delete_tracks_with_item_ids(item_ids: Vec<ItemId>, env: Env) -> Result<()> {
+pub fn delete_tracks_with_item_ids(item_ids: Vec<ItemId>, env: Env) -> Result<FerrumStatus> {
 	let data: &mut Data = get_data(&env);
 	let library = &mut data.library;
 	let track_ids = get_track_ids_from_item_ids(&item_ids);
 	for track_id in &track_ids {
-		library.delete_track_and_file(track_id, &data.paths.tracks_dir)?;
+		let status = library.delete_track_and_file(track_id, &data.paths.tracks_dir)?;
+		if status.is_err() {
+			return Ok(status);
+		}
 	}
-	return Ok(());
+	return Ok(FerrumStatus::Ok);
 }
 
 #[napi(js_name = "new_playlist")]

src-native/tracks/mod.rs

@@ -218,13 +218,12 @@ pub fn set_image(index: u32, path_str: String, env: Env) -> Result<()> {
 #[napi(js_name = "set_image_data")]
 #[allow(dead_code)]
 pub fn set_image_data(index: u32, bytes: ArrayBuffer, env: Env) -> Result<()> {
-	let bytes: Vec<u8> = bytes.to_vec();
 	let data: &mut Data = get_data(&env);
 	let tag = match &mut data.current_tag {
 		Some(tag) => tag,
 		None => bail!("No tag loaded"),
 	};
-	tag.set_image(index as usize, bytes)?;
+	tag.set_image(index as usize, bytes.to_vec())?;
 	Ok(())
 }
 

src/lib/data.ts

@@ -13,7 +13,7 @@ import type {
 import { queue } from './queue'
 import { current_playlist_id } from '@/components/TrackList.svelte'
 import { navigate } from './router'
-import { call, get_error_message, strict_call } from './error'
+import { call, error_popup, get_error_message, strict_call } from './error'
 
 export const is_dev = window.is_dev
 export const local_data_path = window.local_data_path
@@ -23,21 +23,21 @@ export const is_windws = window.is_windows
 const inner_addon = window.addon
 export const ItunesImport = inner_addon.ItunesImport
 
-call((addon) => addon.load_data(is_dev, local_data_path, library_path))
+strict_call((addon) => addon.load_data(is_dev, local_data_path, library_path))
 
-export const paths = call((addon) => addon.get_paths())
+export const paths = strict_call((addon) => addon.get_paths())
 export function join_paths(...args: string[]) {
 	return args.join(paths.pathSeparator)
 }
 
 export const track_lists_details_map = (() => {
-	const initial = call((addon) => addon.get_track_lists_details())
+	const initial = strict_call((addon) => addon.get_track_lists_details())
 
 	const { subscribe, set } = writable(initial)
 	return {
 		subscribe,
 		refresh() {
-			set(call((addon) => addon.get_track_lists_details()))
+			set(strict_call((addon) => addon.get_track_lists_details()))
 		},
 	}
 })()
@@ -47,7 +47,9 @@ export async function add_tracks_to_playlist(
 	check_duplicates = true,
 ) {
 	if (check_duplicates) {
-		const filtered_ids = call((addon) => addon.playlist_filter_duplicates(playlist_id, track_ids))
+		const filtered_ids = strict_call((addon) =>
+			addon.playlist_filter_duplicates(playlist_id, track_ids),
+		)
 		const duplicates = track_ids.length - filtered_ids.length
 		if (duplicates > 0) {
 			const result = await ipc_renderer.invoke('showMessageBox', false, {
@@ -68,18 +70,21 @@ export async function add_tracks_to_playlist(
 		}
 	}
 	if (track_ids.length >= 1) {
-		call((addon) => addon.add_tracks_to_playlist(playlist_id, track_ids))
+		strict_call((addon) => addon.add_tracks_to_playlist(playlist_id, track_ids))
 		tracklist_updated.emit()
 		save()
 	}
 }
 export function remove_from_playlist(playlist_id: TrackListID, item_ids: ItemId[]) {
-	call((addon) => addon.remove_from_playlist(playlist_id, item_ids))
+	strict_call((addon) => addon.remove_from_playlist(playlist_id, item_ids))
 	tracklist_updated.emit()
 	save()
 }
 export function delete_tracks_with_item_ids(item_ids: ItemId[]) {
-	call((addon) => addon.delete_tracks_with_item_ids(item_ids))
+	const result = strict_call((addon) => addon.delete_tracks_with_item_ids(item_ids))
+	if (result.type === 'FileDeletionError') {
+		error_popup(result.field0)
+	}
 	tracklist_updated.emit()
 	queue.removeDeleted()
 	save()

src/lib/error.ts

@@ -8,6 +8,8 @@ export function get_error_message(err: unknown): string {
 		} else if (obj.code) {
 			return 'Code: ' + String(obj.message)
 		}
+	} else if (typeof err === 'string') {
+		return err
 	}
 	return 'No reason or code provided'
 }
@@ -20,7 +22,7 @@ function get_error_stack(err: unknown): string {
 	}
 	return ''
 }
-function error_popup(err: unknown, crash = false) {
+export function error_popup(err: unknown, crash = false) {
 	ipc_renderer.invoke(
 		'showMessageBox',
 		false,

src/lib/selection.ts

@@ -196,11 +196,9 @@ class Selection<T> {
 		} else if (this.items.size === 0) {
 			this.add_index_unchecked(0)
 		} else if (this.last_added !== null) {
-			console.log('go_forward', { ...this })
 			const next_index = this.last_added.index + 1
 			this.clear()
 			this.add_index_unchecked(Math.min(next_index, this.all.length - 1))
-			console.log('.', { ...this })
 		}
 	}
 	/** Expand or shrink selection backwards (shift+up) */