From 5996044ff0cb9902f47f40a7a64d0328bfc675f5 Mon Sep 17 00:00:00 2001
From: Kasper <kasperkh.kh@gmail.com>
Date: Sun, 16 Aug 2026 12:09:30 +0200
Subject: [PATCH] Use runes for track_lists_details_map

---
 src/components/ItunesImport.svelte |  4 ++--
 src/components/QuickNav.svelte     |  4 ++--
 src/components/Sidebar.svelte      | 12 ++++++------
 src/components/SidebarItems.svelte | 16 ++++++++--------
 src/lib/data.svelte.ts             | 27 +++++++++++----------------
 src/lib/menus.ts                   |  5 ++---
 6 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/src/components/ItunesImport.svelte b/src/components/ItunesImport.svelte
index 283dedc..a4a418f 100644
--- a/src/components/ItunesImport.svelte
+++ b/src/components/ItunesImport.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { ItunesImport, track_lists_details_map, save, refreshers } from '$lib/data.svelte'
+	import { ItunesImport, track_lists_details, save, refreshers } from '$lib/data.svelte'
 	import { ipc_renderer } from '$lib/window'
 	import type { ImportStatus } from 'ferrum-addon'
 	import Button from './Button.svelte'
@@ -41,7 +41,7 @@
 		itunes_import.finish()
 		save()
 		refreshers.tracklist++
-		track_lists_details_map.refresh()
+		track_lists_details.refresh()
 		cancel()
 	}
 	async function submit() {
diff --git a/src/components/QuickNav.svelte b/src/components/QuickNav.svelte
index 0359eb8..70b5960 100644
--- a/src/components/QuickNav.svelte
+++ b/src/components/QuickNav.svelte
@@ -3,7 +3,7 @@
 	import { check_shortcut } from '../lib/helpers'
 	import { ipc_listen } from '$lib/window'
 	import fuzzysort from 'fuzzysort'
-	import { track_lists_details_map } from '$lib/data.svelte'
+	import { track_lists_details } from '$lib/data.svelte'
 	import type { TrackListDetails } from 'ferrum-addon'
 	import Modal from './Modal.svelte'
 	import { special_playlists_nav } from './Sidebar.svelte'
@@ -17,7 +17,7 @@
 	let playlists: Result[] = $derived(show ? get_playlists() : [])
 	function get_playlists() {
 		const playlists: Result[] = [...special_playlists_nav]
-		for (const playlist of Object.values($track_lists_details_map)) {
+		for (const playlist of Object.values(track_lists_details.map)) {
 			if (playlist.kind === 'playlist' || playlist.kind === 'folder') {
 				playlists.push(playlist)
 			}
diff --git a/src/components/Sidebar.svelte b/src/components/Sidebar.svelte
index 8263a29..5738e4e 100644
--- a/src/components/Sidebar.svelte
+++ b/src/components/Sidebar.svelte
@@ -8,7 +8,7 @@
 <script lang="ts">
 	import SidebarItems, { type SidebarItemHandle } from './SidebarItems.svelte'
 	import Filter from './Filter.svelte'
-	import { is_mac, track_lists_details_map, move_playlist } from '$lib/data.svelte'
+	import { is_mac, track_lists_details, move_playlist } from '$lib/data.svelte'
 	import { ipc_listen, ipc_renderer } from '../lib/window'
 	import { writable } from 'svelte/store'
 	import { onDestroy, setContext, tick } from 'svelte'
@@ -53,7 +53,7 @@
 	}
 	function drop(e: DragEvent) {
 		if (e.currentTarget && e.dataTransfer?.types[0] === 'ferrum.playlist' && dragged.playlist) {
-			const root = $track_lists_details_map['root']
+			const root = track_lists_details.map['root']
 			if (!root.children) {
 				return
 			}
@@ -170,8 +170,8 @@
 				parent_id={null}
 				children={special_playlists_nav}
 				on_select_down={() => {
-					if ($track_lists_details_map.root.children && $track_lists_details_map.root.children[0]) {
-						const id = $track_lists_details_map.root.children[0]
+					if (track_lists_details.map.root.children && track_lists_details.map.root.children[0]) {
+						const id = track_lists_details.map.root.children[0]
 						goto(resolve('/playlist/[id]', { id }))
 					}
 				}}
@@ -179,8 +179,8 @@
 			<div class="spacer"></div>
 			<SidebarItems
 				parent_id="root"
-				children={($track_lists_details_map['root'].children || []).map(
-					(child_id) => $track_lists_details_map[child_id],
+				children={(track_lists_details.map['root'].children || []).map(
+					(child_id) => track_lists_details.map[child_id],
 				)}
 			/>
 		</nav>
diff --git a/src/components/SidebarItems.svelte b/src/components/SidebarItems.svelte
index 75b61eb..86396fc 100644
--- a/src/components/SidebarItems.svelte
+++ b/src/components/SidebarItems.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" module>
 	import {
-		track_lists_details_map,
+		track_lists_details,
 		add_tracks_to_playlist,
 		move_playlist,
 		view_options,
@@ -49,7 +49,7 @@
 	}
 
 	function has_showing_children(id: string) {
-		const list = $track_lists_details_map[id]
+		const list = track_lists_details.map[id]
 		return list.children && list.children.length > 0 && shown_folders.includes(id)
 	}
 
@@ -73,16 +73,16 @@
 	function select_first(item: Child) {
 		const child_id = item.children?.[0]
 		if (child_id) {
-			const id = $track_lists_details_map[child_id].id
+			const id = track_lists_details.map[child_id].id
 			goto(resolve('/playlist/[id]', { id }))
 		}
 	}
 	function select_last(in_id: string) {
-		const children = $track_lists_details_map[in_id].children
+		const children = track_lists_details.map[in_id].children
 		if (children && (has_showing_children(in_id) || in_id === 'root')) {
 			select_last(children[children.length - 1])
 		} else {
-			const id = $track_lists_details_map[in_id].id
+			const id = track_lists_details.map[in_id].id
 			goto(resolve('/playlist/[id]', { id }))
 		}
 	}
@@ -114,7 +114,7 @@
 			return
 		}
 
-		const selected_list = $track_lists_details_map[$current_playlist_id]
+		const selected_list = track_lists_details.map[$current_playlist_id]
 		if (check_shortcut(e, 'ArrowUp')) {
 			select_up(index)
 		} else if (check_shortcut(e, 'ArrowUp', { alt: true })) {
@@ -260,8 +260,8 @@
 			<Self
 				show={shown_folders.includes(child_list.id)}
 				parent_id={child_list.id}
-				children={($track_lists_details_map[child_list.id].children || []).map(
-					(child_id) => $track_lists_details_map[child_id],
+				children={(track_lists_details.map[child_list.id].children || []).map(
+					(child_id) => track_lists_details.map[child_id],
 				)}
 				level={level + 1}
 				prevent_drop={prevent_drop || dragged.playlist?.id === child_list.id}
diff --git a/src/lib/data.svelte.ts b/src/lib/data.svelte.ts
index bd9228d..d6b1ca9 100644
--- a/src/lib/data.svelte.ts
+++ b/src/lib/data.svelte.ts
@@ -1,4 +1,4 @@
-import { get, writable } from 'svelte/store'
+import { get } from 'svelte/store'
 import { ipc_renderer } from '$lib/window'
 import type {
 	MsSinceUnixEpoch,
@@ -32,17 +32,12 @@ export function join_paths(...args: string[]) {
 	return args.join(paths.pathSeparator)
 }
 
-export const track_lists_details_map = (() => {
-	const initial = strict_call((addon) => addon.get_track_lists_details())
-
-	const { subscribe, set } = writable(initial)
-	return {
-		subscribe,
-		refresh() {
-			set(strict_call((addon) => addon.get_track_lists_details()))
-		},
-	}
-})()
+export const track_lists_details = $state({
+	map: strict_call((addon) => addon.get_track_lists_details()),
+	refresh() {
+		track_lists_details.map = strict_call((addon) => addon.get_track_lists_details())
+	},
+})
 export async function add_tracks_to_playlist(
 	playlist_id: TrackListID,
 	track_ids: TrackID[],
@@ -99,12 +94,12 @@ export type PlaylistInfo = {
 }
 export function new_playlist(info: PlaylistInfo) {
 	strict_call((addon) => addon.new_playlist(info.name, info.description, info.isFolder, info.id))
-	track_lists_details_map.refresh()
+	track_lists_details.refresh()
 	save()
 }
 export function update_playlist(id: string, name: string, description: string) {
 	strict_call((addon) => addon.update_playlist(id, name, description))
-	track_lists_details_map.refresh()
+	track_lists_details.refresh()
 	refreshers.tracklist++
 	save()
 }
@@ -115,7 +110,7 @@ export function move_playlist(
 	to_index: number,
 ) {
 	strict_call((addon) => addon.move_playlist(id, from_parent, to_parent, to_index))
-	track_lists_details_map.refresh()
+	track_lists_details.refresh()
 	save()
 }
 
@@ -176,7 +171,7 @@ export function delete_track_list(id: TrackListID) {
 	if (id === get(current_playlist_id)) {
 		goto(resolve('/playlist/root'))
 	}
-	track_lists_details_map.refresh()
+	track_lists_details.refresh()
 	save()
 }
 export function save() {
diff --git a/src/lib/menus.ts b/src/lib/menus.ts
index b23c02b..1858ca2 100644
--- a/src/lib/menus.ts
+++ b/src/lib/menus.ts
@@ -4,12 +4,11 @@ import {
 	get_track_list,
 	get_track_playlist_ids,
 	paths,
-	track_lists_details_map,
+	track_lists_details,
 } from '$lib/data.svelte'
 import { flatten_child_lists } from '$lib/helpers'
 import { ipc_renderer } from '$lib/window'
 import type { TrackID } from 'ferrum-addon'
-import { get } from 'svelte/store'
 import { append_to_user_queue, prepend_to_user_queue } from './queue'
 import type { SelectedTracksAction } from '$electron/typed_ipc'
 import { open_track_info } from '$components/TrackInfo.svelte'
@@ -19,7 +18,7 @@ import { goto } from '$app/navigation'
 import { resolve } from '$app/paths'
 
 export function get_flattened_tracklists() {
-	const track_lists = get(track_lists_details_map)
+	const track_lists = track_lists_details.map
 	return flatten_child_lists(track_lists.root, track_lists, '')
 }
 
-- 
2.51.2