TrackInfo: Improve error handling & update to Svelte 5

Author: probablykasper

CHANGELOG.md

@@ -3,7 +3,7 @@
 ## Next
 - Add genre autocomplete
 - Make macOS media key permission request non-intrusive
-- Improve crashing behaviour
+- Improve error and crashing behaviour
 
 ## 0.19.9 - 2025 Jul 4
 - Fix column size not updating when resizing window

src-native/tracks/cover.rs

@@ -1,14 +1,12 @@
-use super::{Tag, id_to_track};
-use crate::data_js::get_data;
+use super::Tag;
 use anyhow::{Context, Result, anyhow, bail};
 use fast_image_resize::images::Image;
 use fast_image_resize::{IntoImageView, Resizer};
 use image::codecs::jpeg::JpegEncoder;
 use image::codecs::png::PngEncoder;
 use image::{ImageEncoder, ImageFormat, ImageReader};
 use lazy_static::lazy_static;
-use napi::Env;
-use napi::bindgen_prelude::{Buffer, PromiseRaw};
+use napi::bindgen_prelude::Buffer;
 use redb::{Database, TableDefinition};
 use std::fs;
 use std::io::{BufWriter, Cursor};

src-native/tracks/mod.rs

@@ -162,10 +162,10 @@ pub fn import_file(path: String, now: MsSinceUnixEpoch, env: Env) -> Result<()>
 pub fn load_tags(track_id: String, env: Env) -> Result<()> {
 	let data: &mut Data = get_data(&env);
 	data.current_tag = None;
-	let track = id_to_track(&env, &track_id)?;
+	let track = id_to_track(&env, &track_id).context("Could not load tags")?;
 
 	let path = data.paths.tracks_dir.join(&track.file);
-	let tag = Tag::read_from_path(&path)?;
+	let tag = Tag::read_from_path(&path).context("Could not load tags")?;
 	data.current_tag = Some(tag);
 	Ok(())
 }
@@ -185,9 +185,12 @@ pub fn get_image(index: u32, env: Env) -> Result<Option<JsImage>> {
 
 	let tag = match &data.current_tag {
 		Some(tag) => tag,
-		None => return Ok(None),
+		None => bail!("Could not load image: No tag loaded"),
 	};
-	let img = match tag.get_image_ref(index as usize)? {
+	let img = match tag
+		.get_image_ref(index as usize)
+		.context("Could not load image")?
+	{
 		Some(image) => image,
 		None => return Ok(None),
 	};
@@ -229,15 +232,14 @@ pub fn set_image_data(index: u32, bytes: ArrayBuffer, env: Env) -> Result<()> {
 
 #[napi(js_name = "remove_image")]
 #[allow(dead_code)]
-pub fn remove_image(index: u32, env: Env) -> Result<()> {
+pub fn remove_image(index: u32, env: Env) -> () {
 	let data: &mut Data = get_data(&env);
 	match data.current_tag {
 		Some(ref mut tag) => {
 			tag.remove_image(index as usize);
 		}
 		None => {}
 	};
-	Ok(())
 }
 
 #[napi(js_name = "update_track_info")]

src/App.svelte

@@ -5,7 +5,7 @@
 	import Player from './components/Player.svelte'
 	import Sidebar from './components/Sidebar.svelte'
 	import Queue from './components/Queue.svelte'
-	import TrackInfo, { current_list } from './components/TrackInfo.svelte'
+	import TrackInfo, { track_info_state } from './components/TrackInfo.svelte'
 	import PlaylistInfoModal from './components/PlaylistInfo.svelte'
 	import { queue_visible } from './lib/queue'
 	import { ipc_listen, ipc_renderer } from '@/lib/window'
@@ -294,8 +294,8 @@
 </main>
 
 <QuickNav />
-{#if $current_list}
-	<TrackInfo />
+{#if track_info_state.instance}
+	<TrackInfo bind:instance={track_info_state.instance} />
 {/if}
 {#if playlist_info}
 	<PlaylistInfoModal info={playlist_info} cancel={() => (playlist_info = null)} />