Merge branch 'main' into feat/waveform-loudness-cache

# Conflicts:
#	src/store/playerStore.ts
This commit is contained in:
Psychotoxical
2026-04-25 21:47:48 +02:00
76 changed files with 9658 additions and 263 deletions
+2 -2
View File
@@ -4305,9 +4305,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
[[package]]
name = "rustls-webpki"
version = "0.103.12"
version = "0.103.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06"
checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
dependencies = [
"ring",
"rustls-pki-types",
+36
View File
@@ -557,6 +557,33 @@ async fn nd_delete_user(
Ok(())
}
/// GET `/api/song?_sort=...&_order=...&_start=...&_end=...` — paginated song list.
/// Available to any authenticated user (no admin required). Returns raw JSON array.
#[tauri::command]
async fn nd_list_songs(
server_url: String,
token: String,
sort: String,
order: String,
start: u32,
end: u32,
) -> Result<serde_json::Value, String> {
let url = format!(
"{}/api/song?_sort={}&_order={}&_start={}&_end={}",
server_url, sort, order, start, end
);
let resp = nd_retry(|| {
nd_http_client()
.get(&url)
.header("X-ND-Authorization", format!("Bearer {}", token))
.send()
}).await?;
if !resp.status().is_success() {
return Err(format!("HTTP {}", resp.status()));
}
resp.json::<serde_json::Value>().await.map_err(nd_err)
}
/// GET `/api/library` — list all libraries (admin only). Returns the raw JSON array.
#[tauri::command]
async fn nd_list_libraries(
@@ -3803,6 +3830,14 @@ pub fn run() {
}
}
#[cfg(debug_assertions)]
{
use tauri::Manager;
if let Some(win) = app.get_webview_window("main") {
win.open_devtools();
}
}
// ── System tray ───────────────────────────────────────────────
// Always build on startup when possible; the frontend calls toggle_tray_icon(false)
// immediately after load if the user has disabled the tray icon.
@@ -4048,6 +4083,7 @@ pub fn run() {
nd_update_user,
nd_delete_user,
nd_list_libraries,
nd_list_songs,
nd_set_user_libraries,
nd_list_playlists,
nd_create_playlist,
+1 -2
View File
@@ -23,8 +23,7 @@
"decorations": true,
"transparent": false,
"visible": true,
"dragDropEnabled": false,
"devtools": false
"dragDropEnabled": false
}
],
"security": {