From cd745f5f36078cce0c6381f129821e860e80706c Mon Sep 17 00:00:00 2001 From: Kasper Date: Wed, 25 Sep 2024 22:04:22 +0200 Subject: [PATCH] Remove ViewAs --- ferrum-addon/addon.d.ts | 14 +------------- src-native/page.rs | 24 +----------------------- src/lib/data.ts | 4 ---- 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/ferrum-addon/addon.d.ts b/ferrum-addon/addon.d.ts index 3d163f1..c498af0 100644 --- a/ferrum-addon/addon.d.ts +++ b/ferrum-addon/addon.d.ts @@ -122,19 +122,6 @@ export interface TracksPage { itemIds: Array } export declare function get_tracks_page(options: TracksPageOptions): TracksPage -export const enum ViewAs { - Songs = 0, - Artists = 1 -} -export interface PageInfo { - id: string - viewAs: ViewAs - tracklist: TrackList - sortKey: string - sortDesc: boolean - length: number -} -export declare function move_tracks(playlistId: string, itemIds: Array, toIndex: number): void export interface TrackListDetails { id: string name: string @@ -153,6 +140,7 @@ export declare function delete_tracks_with_item_ids(itemIds: Array): voi 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, 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 export interface TrackMd { diff --git a/src-native/page.rs b/src-native/page.rs index 0c78435..0b08fae 100644 --- a/src-native/page.rs +++ b/src-native/page.rs @@ -3,7 +3,7 @@ use crate::data_js::get_data; use crate::filter::filter; use crate::library_types::{ItemId, TrackList}; use crate::sort::sort; -use napi::{Env, JsUnknown, Result}; +use napi::{Env, Result}; #[napi(object)] #[derive(Clone)] @@ -57,25 +57,3 @@ pub fn get_tracks_page(options: TracksPageOptions, env: Env) -> Result Self { - Self::Songs - } -} - -#[napi(object)] -pub struct PageInfo { - pub id: String, - pub view_as: ViewAs, - #[napi(ts_type = "TrackList")] - pub tracklist: JsUnknown, - pub sort_key: String, - pub sort_desc: bool, - pub length: i64, -} diff --git a/src/lib/data.ts b/src/lib/data.ts index fa2f33c..f858ad5 100644 --- a/src/lib/data.ts +++ b/src/lib/data.ts @@ -8,7 +8,6 @@ import type { ItemId, TrackMd, TracksPageOptions, - ViewAs, ViewOptions, } from '../../ferrum-addon' import { queue } from './queue' @@ -26,9 +25,6 @@ export const ItunesImport = inner_addon.ItunesImport call((addon) => addon.load_data(is_dev, local_data_path, library_path)) -export const view_as_songs: ViewAs.Songs = 0 -export const view_as_artists: ViewAs.Artists = 1 - function get_error_message(err: unknown): string { if (typeof err === 'object' && err !== null) { const obj = err as { [key: string]: unknown }