Add ItemIds & remove open playlist state

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Add queue panel slide-out transition
 - Add `Ctrl+Tab` and `Ctrl+Shift+Tab` to select next/previous playlist
 - Add `Back` and `Forward` shortcuts
+- Selection no longer gets cleared when the page updates
 - Make time & volume sliders look ok
 - Small design updates to tracklist header & filter textbox
 - Respect user's locale time

ferrum-addon/addon.d.ts

@@ -14,14 +14,12 @@ export interface PathsJs {
 }
 export declare function get_paths(): PathsJs
 export declare function save(): void
-export declare function filter_open_playlist(query: string): void
 export interface ImportStatus {
   errors: Array<string>
   tracksCount: number
   playlistsCount: number
 }
-export declare function copyFile(from: string, to: string): void
-export declare function atomicFileSave(filePath: string, content: string): void
+export declare function get_default_sort_desc(field: string): boolean
 export interface Track {
   size: number
   duration: number
@@ -82,7 +80,7 @@ export interface Playlist {
   originalId?: string
   dateImported?: MsSinceUnixEpoch
   dateCreated?: MsSinceUnixEpoch
-  tracks: Array<TrackID>
+  tracks: Array<ItemId>
 }
 export interface Folder {
   id: TrackListID
@@ -107,31 +105,21 @@ export interface Special {
 export const enum SpecialTrackListName {
   Root = 0
 }
-export declare function open_playlist(openPlaylistId: string, viewAs?: ViewAs | undefined | null): void
-export declare function get_page_track(index: number): Track
-export declare function get_page_track_id(index: number): string
-export declare function refresh_page(): void
-export declare function get_page_track_ids(): Array<TrackID>
-export const enum ViewAs {
-  Songs = 0,
-  Artists = 1
-}
-export interface PageInfo {
-  id: string
-  viewAs: ViewAs
-  tracklist: TrackList
+export interface TracksPageOptions {
+  playlistId: string
   sortKey: string
   sortDesc: boolean
-  length: number
+  filterQuery: string
+  groupAlbumTracks: boolean
 }
-export declare function get_page_info(): PageInfo
-export declare function set_group_album_tracks(value: boolean): void
-export declare function sort(sortKey: string, keepFilter: boolean): void
-export interface SelectionInfo {
-  from: number
-  to: number
+export interface TracksPage {
+  playlistKind: string
+  playlistName: string
+  playlistDescription?: string
+  playlistLength: number
+  itemIds: Array<ItemId>
 }
-export declare function move_tracks(indexesToMove: Array<number>, toIndex: number): SelectionInfo
+export declare function get_tracks_page(options: TracksPageOptions): TracksPage
 export interface TrackListDetails {
   id: string
   name: string
@@ -144,12 +132,13 @@ export declare function get_track_list(id: string): TrackList
 /** Returns the deleted track lists, including folder children */
 export declare function delete_track_list(id: string): void
 export declare function add_tracks_to_playlist(playlistId: string, trackIds: Array<string>): void
-export declare function playlist_filter_duplicates(playlistId: string, ids: Array<string>): Array<TrackID>
-export declare function remove_from_open_playlist(indexesToRemove: Array<number>): void
-export declare function delete_tracks_in_open(indexesToDelete: Array<number>): void
+export declare function playlist_filter_duplicates(playlistId: TrackID, ids: Array<string>): Array<TrackID>
+export declare function remove_from_playlist(playlistId: TrackID, itemIds: Array<ItemId>): void
+export declare function delete_tracks_with_item_ids(itemIds: Array<ItemId>): void
 export declare function new_playlist(name: string, description: string, isFolder: boolean, parentId: string): void
 export declare function update_playlist(id: string, name: string, description: string): void
 export declare function move_playlist(id: string, fromId: string, toId: string, toIndex: number): void
+export declare function move_tracks(playlistId: string, itemIds: Array<ItemId>, toIndex: number): void
 /** Returns `None` if the file does not have an image */
 export declare function read_small_cover_async(path: string, index: number, cacheDbPath: string): Promise<Buffer | null>
 export interface TrackMd {
@@ -169,12 +158,17 @@ export interface TrackMd {
   comments: string
 }
 export declare function get_track(id: string): Track
+export interface KeyedTrack {
+  id: TrackID
+  track: Track
+}
+export declare function get_track_by_item_id(itemId: ItemId): KeyedTrack
+export declare function get_track_ids(itemIds: Array<ItemId>): Array<TrackID>
 export declare function track_exists(id: string): boolean
 export declare function add_play(trackId: string): void
 export declare function add_skip(trackId: string): void
 export declare function add_play_time(id: TrackID, start: MsSinceUnixEpoch, durMs: number): void
 export declare function read_cover_async(trackId: string, index: number): Promise<ArrayBuffer>
-export declare function read_cover_async_path(path: string, index: number): Promise<ArrayBuffer>
 export declare function import_file(path: string, now: MsSinceUnixEpoch): void
 export declare function load_tags(trackId: string): void
 export interface JsImage {

ferrum-addon/main.d.ts

@@ -4,6 +4,7 @@
 export * from './addon.d'
 
 declare module 'ferrum-addon/addon' {
+	export type ItemId = number
 	export type TrackID = string
 	export type TrackListID = string
 	export type PercentInteger = number

package.json

@@ -67,7 +67,6 @@
 		"@sveltejs/vite-plugin-svelte": "^3.1.2",
 		"@tailwindcss/vite": "4.0.0-alpha.23",
 		"@tsconfig/svelte": "^5.0.4",
-		"concurrently": "^8.2.2",
 		"electron": "^28.3.3",
 		"electron-builder": "^25.0.5",
 		"eslint": "^9.10.0",

src-native/artists.rs

@@ -8,7 +8,7 @@ use std::time::Instant;
 pub fn load_artists(library: &Library) -> HashSet<String> {
 	let now = Instant::now();
 	let mut artists = HashSet::new();
-	for (_, track) in &library.tracks {
+	for (_, track) in library.get_tracks() {
 		if !artists.contains(&track.artist) {
 			artists.insert(track.artist.clone());
 		}