Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 538a6f6abf | |||
| 04c30bc4b8 | |||
| c0342ed987 | |||
| 4b8797bb2e |
Generated
+117
-1
@@ -501,6 +501,12 @@ version = "1.5.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "byteorder-lite"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytes"
|
name = "bytes"
|
||||||
version = "1.11.1"
|
version = "1.11.1"
|
||||||
@@ -599,6 +605,12 @@ version = "0.1.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b9e769b5c8c8283982a987c6e948e540254f1058d5a74b8794914d4ef5fc2a24"
|
checksum = "b9e769b5c8c8283982a987c6e948e540254f1058d5a74b8794914d4ef5fc2a24"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "color_quant"
|
||||||
|
version = "1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "colorchoice"
|
name = "colorchoice"
|
||||||
version = "1.0.5"
|
version = "1.0.5"
|
||||||
@@ -1304,6 +1316,15 @@ version = "2.4.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
|
checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fdeflate"
|
||||||
|
version = "0.3.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
|
||||||
|
dependencies = [
|
||||||
|
"simd-adler32",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ff"
|
name = "ff"
|
||||||
version = "0.13.1"
|
version = "0.13.1"
|
||||||
@@ -1397,7 +1418,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "furumusic"
|
name = "furumusic"
|
||||||
version = "0.1.13"
|
version = "0.1.17"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -1407,6 +1428,7 @@ dependencies = [
|
|||||||
"croner",
|
"croner",
|
||||||
"encoding_rs",
|
"encoding_rs",
|
||||||
"id3",
|
"id3",
|
||||||
|
"image",
|
||||||
"librqbit",
|
"librqbit",
|
||||||
"openidconnect",
|
"openidconnect",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
@@ -1588,6 +1610,16 @@ dependencies = [
|
|||||||
"wasip3",
|
"wasip3",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "gif"
|
||||||
|
version = "0.14.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ee8cfcc411d9adbbaba82fb72661cc1bcca13e8bba98b364e62b2dba8f960159"
|
||||||
|
dependencies = [
|
||||||
|
"color_quant",
|
||||||
|
"weezl",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gimli"
|
name = "gimli"
|
||||||
version = "0.32.3"
|
version = "0.32.3"
|
||||||
@@ -2026,6 +2058,34 @@ dependencies = [
|
|||||||
"icu_properties",
|
"icu_properties",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "image"
|
||||||
|
version = "0.25.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
|
||||||
|
dependencies = [
|
||||||
|
"bytemuck",
|
||||||
|
"byteorder-lite",
|
||||||
|
"color_quant",
|
||||||
|
"gif",
|
||||||
|
"image-webp",
|
||||||
|
"moxcms",
|
||||||
|
"num-traits",
|
||||||
|
"png",
|
||||||
|
"zune-core",
|
||||||
|
"zune-jpeg",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "image-webp"
|
||||||
|
version = "0.2.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3"
|
||||||
|
dependencies = [
|
||||||
|
"byteorder-lite",
|
||||||
|
"quick-error",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indexmap"
|
name = "indexmap"
|
||||||
version = "1.9.3"
|
version = "1.9.3"
|
||||||
@@ -2522,6 +2582,16 @@ dependencies = [
|
|||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "moxcms"
|
||||||
|
version = "0.8.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
|
||||||
|
dependencies = [
|
||||||
|
"num-traits",
|
||||||
|
"pxfm",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "multer"
|
name = "multer"
|
||||||
version = "3.1.0"
|
version = "3.1.0"
|
||||||
@@ -3000,6 +3070,19 @@ version = "0.2.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
|
checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "png"
|
||||||
|
version = "0.18.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.11.1",
|
||||||
|
"crc32fast",
|
||||||
|
"fdeflate",
|
||||||
|
"flate2",
|
||||||
|
"miniz_oxide",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "portable-atomic"
|
name = "portable-atomic"
|
||||||
version = "1.13.1"
|
version = "1.13.1"
|
||||||
@@ -3067,6 +3150,12 @@ dependencies = [
|
|||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pxfm"
|
||||||
|
version = "0.1.29"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quanta"
|
name = "quanta"
|
||||||
version = "0.12.6"
|
version = "0.12.6"
|
||||||
@@ -3082,6 +3171,12 @@ dependencies = [
|
|||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "quick-error"
|
||||||
|
version = "2.0.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quick-xml"
|
name = "quick-xml"
|
||||||
version = "0.37.5"
|
version = "0.37.5"
|
||||||
@@ -5142,6 +5237,12 @@ dependencies = [
|
|||||||
"rustls-pki-types",
|
"rustls-pki-types",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "weezl"
|
||||||
|
version = "0.1.12"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "whoami"
|
name = "whoami"
|
||||||
version = "1.6.1"
|
version = "1.6.1"
|
||||||
@@ -5690,3 +5791,18 @@ name = "zmij"
|
|||||||
version = "1.0.21"
|
version = "1.0.21"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
|
checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zune-core"
|
||||||
|
version = "0.5.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zune-jpeg"
|
||||||
|
version = "0.5.15"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
|
||||||
|
dependencies = [
|
||||||
|
"zune-core",
|
||||||
|
]
|
||||||
|
|||||||
+2
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "furumusic"
|
name = "furumusic"
|
||||||
version = "0.1.14"
|
version = "0.1.18"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
description = "Reusable web-app boilerplate: auth, OIDC/SSO, admin panel, user management, i18n, PostgreSQL"
|
description = "Reusable web-app boilerplate: auth, OIDC/SSO, admin panel, user management, i18n, PostgreSQL"
|
||||||
|
|
||||||
@@ -20,6 +20,7 @@ symphonia = { version = "0.5", default-features = false, features = ["mp3","aac"
|
|||||||
id3 = "1"
|
id3 = "1"
|
||||||
encoding_rs = "0.8"
|
encoding_rs = "0.8"
|
||||||
sha2 = "0.10"
|
sha2 = "0.10"
|
||||||
|
image = { version = "0.25", default-features = false, features = ["jpeg", "png", "webp", "gif", "bmp"] }
|
||||||
sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres"] }
|
sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres"] }
|
||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
tokio-cron-scheduler = "0.15"
|
tokio-cron-scheduler = "0.15"
|
||||||
|
|||||||
@@ -264,6 +264,27 @@ impl App for AdminApp {
|
|||||||
}),
|
}),
|
||||||
"admin_v2_job_run",
|
"admin_v2_job_run",
|
||||||
),
|
),
|
||||||
|
Route::with_handler_and_name(
|
||||||
|
"/v2/api/settings",
|
||||||
|
get(move |session: Session, db: Database| async move {
|
||||||
|
v2::settings(session, db).await
|
||||||
|
})
|
||||||
|
.post(
|
||||||
|
move |session: Session,
|
||||||
|
db: Database,
|
||||||
|
json: Json<v2::UpdateSettingsRequest>| async move {
|
||||||
|
v2::update_settings(session, db, json).await
|
||||||
|
},
|
||||||
|
),
|
||||||
|
"admin_v2_settings",
|
||||||
|
),
|
||||||
|
Route::with_handler_and_name(
|
||||||
|
"/v2/api/settings/probe",
|
||||||
|
get(move |session: Session, db: Database| async move {
|
||||||
|
v2::settings_probe(session, db).await
|
||||||
|
}),
|
||||||
|
"admin_v2_settings_probe",
|
||||||
|
),
|
||||||
Route::with_handler_and_name(
|
Route::with_handler_and_name(
|
||||||
"/v2/api/jobs/{name}/toggle",
|
"/v2/api/jobs/{name}/toggle",
|
||||||
cot::router::method::post({
|
cot::router::method::post({
|
||||||
|
|||||||
+249
-1
@@ -1,6 +1,6 @@
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use cot::db::Database;
|
use cot::db::{Database, Model};
|
||||||
use cot::html::Html;
|
use cot::html::Html;
|
||||||
use cot::http::StatusCode;
|
use cot::http::StatusCode;
|
||||||
use cot::http::header::CONTENT_TYPE;
|
use cot::http::header::CONTENT_TYPE;
|
||||||
@@ -13,7 +13,9 @@ use serde::{Deserialize, Serialize};
|
|||||||
use sqlx::{PgPool, Postgres, QueryBuilder};
|
use sqlx::{PgPool, Postgres, QueryBuilder};
|
||||||
|
|
||||||
use super::BUILD_INFO;
|
use super::BUILD_INFO;
|
||||||
|
use crate::agent;
|
||||||
use crate::auth::{self, AuthenticatedUser, Role};
|
use crate::auth::{self, AuthenticatedUser, Role};
|
||||||
|
use crate::config::{AppConfig, ConfigEntry, ConfigSources};
|
||||||
use crate::i18n::{I18n, Translations};
|
use crate::i18n::{I18n, Translations};
|
||||||
use crate::scheduler::{JobRegistry, ScheduledJob};
|
use crate::scheduler::{JobRegistry, ScheduledJob};
|
||||||
|
|
||||||
@@ -214,6 +216,95 @@ struct MutationResponse {
|
|||||||
affected: u64,
|
affected: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, JsonSchema)]
|
||||||
|
struct AdminSettingsDto {
|
||||||
|
values: AdminSettingsValues,
|
||||||
|
sources: AdminSettingsSources,
|
||||||
|
lastfm_api_key_configured: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
|
||||||
|
struct AdminSettingsValues {
|
||||||
|
auth_password_enabled: bool,
|
||||||
|
auth_sso_enabled: bool,
|
||||||
|
oidc_button_text: String,
|
||||||
|
oidc_issuer: String,
|
||||||
|
oidc_client_id: String,
|
||||||
|
oidc_client_secret: String,
|
||||||
|
oidc_admin_groups: String,
|
||||||
|
oidc_user_groups: String,
|
||||||
|
swagger_enabled: bool,
|
||||||
|
lastfm_api_key: String,
|
||||||
|
agent_enabled: bool,
|
||||||
|
agent_inbox_dir: String,
|
||||||
|
agent_storage_dir: String,
|
||||||
|
agent_llm_url: String,
|
||||||
|
agent_llm_model: String,
|
||||||
|
agent_llm_auth: String,
|
||||||
|
agent_confidence_threshold: String,
|
||||||
|
agent_context_limit: String,
|
||||||
|
agent_concurrency: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, JsonSchema)]
|
||||||
|
struct AdminSettingsSources {
|
||||||
|
auth_password_enabled: &'static str,
|
||||||
|
auth_sso_enabled: &'static str,
|
||||||
|
oidc_button_text: &'static str,
|
||||||
|
oidc_issuer: &'static str,
|
||||||
|
oidc_client_id: &'static str,
|
||||||
|
oidc_client_secret: &'static str,
|
||||||
|
oidc_admin_groups: &'static str,
|
||||||
|
oidc_user_groups: &'static str,
|
||||||
|
swagger_enabled: &'static str,
|
||||||
|
lastfm_api_key: &'static str,
|
||||||
|
agent_enabled: &'static str,
|
||||||
|
agent_inbox_dir: &'static str,
|
||||||
|
agent_storage_dir: &'static str,
|
||||||
|
agent_llm_url: &'static str,
|
||||||
|
agent_llm_model: &'static str,
|
||||||
|
agent_llm_auth: &'static str,
|
||||||
|
agent_confidence_threshold: &'static str,
|
||||||
|
agent_context_limit: &'static str,
|
||||||
|
agent_concurrency: &'static str,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub(super) struct UpdateSettingsRequest {
|
||||||
|
auth_password_enabled: bool,
|
||||||
|
auth_sso_enabled: bool,
|
||||||
|
oidc_button_text: String,
|
||||||
|
oidc_issuer: String,
|
||||||
|
oidc_client_id: String,
|
||||||
|
oidc_client_secret: String,
|
||||||
|
oidc_admin_groups: String,
|
||||||
|
oidc_user_groups: String,
|
||||||
|
swagger_enabled: bool,
|
||||||
|
lastfm_api_key: String,
|
||||||
|
agent_enabled: bool,
|
||||||
|
agent_inbox_dir: String,
|
||||||
|
agent_storage_dir: String,
|
||||||
|
agent_llm_url: String,
|
||||||
|
agent_llm_model: String,
|
||||||
|
agent_llm_auth: String,
|
||||||
|
agent_confidence_threshold: String,
|
||||||
|
agent_context_limit: String,
|
||||||
|
agent_concurrency: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, JsonSchema)]
|
||||||
|
struct AgentProbeDto {
|
||||||
|
status: String,
|
||||||
|
ok: bool,
|
||||||
|
model_intro: String,
|
||||||
|
model_name: String,
|
||||||
|
prompt_tokens: Option<u32>,
|
||||||
|
completion_tokens: Option<u32>,
|
||||||
|
tokens_per_sec: Option<f64>,
|
||||||
|
latency_ms: u64,
|
||||||
|
error: String,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, JsonSchema)]
|
#[derive(Debug, Serialize, JsonSchema)]
|
||||||
struct LibraryOverviewDto {
|
struct LibraryOverviewDto {
|
||||||
artists: i64,
|
artists: i64,
|
||||||
@@ -458,6 +549,163 @@ pub async fn jobs(
|
|||||||
Json(jobs).into_response()
|
Json(jobs).into_response()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn settings(session: Session, db: Database) -> cot::Result<cot::response::Response> {
|
||||||
|
if let Err(response) = require_admin_json(&session, &db).await {
|
||||||
|
return Ok(response);
|
||||||
|
}
|
||||||
|
let (config, sources) = AppConfig::load_with_db(&db).await;
|
||||||
|
Json(settings_dto(config, sources)).into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_settings(
|
||||||
|
session: Session,
|
||||||
|
db: Database,
|
||||||
|
Json(body): Json<UpdateSettingsRequest>,
|
||||||
|
) -> cot::Result<cot::response::Response> {
|
||||||
|
if let Err(response) = require_admin_json(&session, &db).await {
|
||||||
|
return Ok(response);
|
||||||
|
}
|
||||||
|
let fields = [
|
||||||
|
(
|
||||||
|
"auth_password_enabled",
|
||||||
|
body.auth_password_enabled.to_string(),
|
||||||
|
),
|
||||||
|
("auth_sso_enabled", body.auth_sso_enabled.to_string()),
|
||||||
|
("oidc_button_text", body.oidc_button_text.trim().to_string()),
|
||||||
|
("oidc_issuer", body.oidc_issuer.trim().to_string()),
|
||||||
|
("oidc_client_id", body.oidc_client_id.trim().to_string()),
|
||||||
|
(
|
||||||
|
"oidc_client_secret",
|
||||||
|
body.oidc_client_secret.trim().to_string(),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"oidc_admin_groups",
|
||||||
|
body.oidc_admin_groups.trim().to_string(),
|
||||||
|
),
|
||||||
|
("oidc_user_groups", body.oidc_user_groups.trim().to_string()),
|
||||||
|
("swagger_enabled", body.swagger_enabled.to_string()),
|
||||||
|
("lastfm_api_key", body.lastfm_api_key.trim().to_string()),
|
||||||
|
("agent_enabled", body.agent_enabled.to_string()),
|
||||||
|
("agent_inbox_dir", body.agent_inbox_dir.trim().to_string()),
|
||||||
|
(
|
||||||
|
"agent_storage_dir",
|
||||||
|
body.agent_storage_dir.trim().to_string(),
|
||||||
|
),
|
||||||
|
("agent_llm_url", body.agent_llm_url.trim().to_string()),
|
||||||
|
("agent_llm_model", body.agent_llm_model.trim().to_string()),
|
||||||
|
("agent_llm_auth", body.agent_llm_auth.trim().to_string()),
|
||||||
|
(
|
||||||
|
"agent_confidence_threshold",
|
||||||
|
body.agent_confidence_threshold.trim().to_string(),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"agent_context_limit",
|
||||||
|
body.agent_context_limit.trim().to_string(),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"agent_concurrency",
|
||||||
|
body.agent_concurrency.trim().to_string(),
|
||||||
|
),
|
||||||
|
];
|
||||||
|
for (key, value) in fields {
|
||||||
|
let mut entry = ConfigEntry::new(key.to_string(), value);
|
||||||
|
entry
|
||||||
|
.save(&db)
|
||||||
|
.await
|
||||||
|
.map_err(|e| cot::Error::internal(e.to_string()))?;
|
||||||
|
}
|
||||||
|
Json(serde_json::json!({ "ok": true })).into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn settings_probe(
|
||||||
|
session: Session,
|
||||||
|
db: Database,
|
||||||
|
) -> cot::Result<cot::response::Response> {
|
||||||
|
if let Err(response) = require_admin_json(&session, &db).await {
|
||||||
|
return Ok(response);
|
||||||
|
}
|
||||||
|
let (config, _) = AppConfig::load_with_db(&db).await;
|
||||||
|
let probe = if config.agent_enabled && !config.agent_llm_url.is_empty() {
|
||||||
|
agent::probe_llm(
|
||||||
|
&config.agent_llm_url,
|
||||||
|
&config.agent_llm_model,
|
||||||
|
&config.agent_llm_auth,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
} else {
|
||||||
|
agent::AgentProbeResult::default()
|
||||||
|
};
|
||||||
|
let status = if !config.agent_enabled {
|
||||||
|
"disabled"
|
||||||
|
} else if config.agent_llm_url.is_empty() {
|
||||||
|
"not_configured"
|
||||||
|
} else if probe.ok {
|
||||||
|
"ok"
|
||||||
|
} else {
|
||||||
|
"error"
|
||||||
|
};
|
||||||
|
Json(AgentProbeDto {
|
||||||
|
status: status.to_string(),
|
||||||
|
ok: probe.ok,
|
||||||
|
model_intro: probe.model_intro,
|
||||||
|
model_name: probe.model_name,
|
||||||
|
prompt_tokens: probe.prompt_tokens,
|
||||||
|
completion_tokens: probe.completion_tokens,
|
||||||
|
tokens_per_sec: probe.tokens_per_sec,
|
||||||
|
latency_ms: probe.latency_ms,
|
||||||
|
error: probe.error,
|
||||||
|
})
|
||||||
|
.into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn settings_dto(config: AppConfig, sources: ConfigSources) -> AdminSettingsDto {
|
||||||
|
AdminSettingsDto {
|
||||||
|
lastfm_api_key_configured: !config.lastfm_api_key.trim().is_empty(),
|
||||||
|
values: AdminSettingsValues {
|
||||||
|
auth_password_enabled: config.auth_password_enabled,
|
||||||
|
auth_sso_enabled: config.auth_sso_enabled,
|
||||||
|
oidc_button_text: config.oidc_button_text,
|
||||||
|
oidc_issuer: config.oidc_issuer,
|
||||||
|
oidc_client_id: config.oidc_client_id,
|
||||||
|
oidc_client_secret: config.oidc_client_secret,
|
||||||
|
oidc_admin_groups: config.oidc_admin_groups,
|
||||||
|
oidc_user_groups: config.oidc_user_groups,
|
||||||
|
swagger_enabled: config.swagger_enabled,
|
||||||
|
lastfm_api_key: config.lastfm_api_key,
|
||||||
|
agent_enabled: config.agent_enabled,
|
||||||
|
agent_inbox_dir: config.agent_inbox_dir,
|
||||||
|
agent_storage_dir: config.agent_storage_dir,
|
||||||
|
agent_llm_url: config.agent_llm_url,
|
||||||
|
agent_llm_model: config.agent_llm_model,
|
||||||
|
agent_llm_auth: config.agent_llm_auth,
|
||||||
|
agent_confidence_threshold: config.agent_confidence_threshold.to_string(),
|
||||||
|
agent_context_limit: config.agent_context_limit.to_string(),
|
||||||
|
agent_concurrency: config.agent_concurrency.to_string(),
|
||||||
|
},
|
||||||
|
sources: AdminSettingsSources {
|
||||||
|
auth_password_enabled: sources.auth_password_enabled.code(),
|
||||||
|
auth_sso_enabled: sources.auth_sso_enabled.code(),
|
||||||
|
oidc_button_text: sources.oidc_button_text.code(),
|
||||||
|
oidc_issuer: sources.oidc_issuer.code(),
|
||||||
|
oidc_client_id: sources.oidc_client_id.code(),
|
||||||
|
oidc_client_secret: sources.oidc_client_secret.code(),
|
||||||
|
oidc_admin_groups: sources.oidc_admin_groups.code(),
|
||||||
|
oidc_user_groups: sources.oidc_user_groups.code(),
|
||||||
|
swagger_enabled: sources.swagger_enabled.code(),
|
||||||
|
lastfm_api_key: sources.lastfm_api_key.code(),
|
||||||
|
agent_enabled: sources.agent_enabled.code(),
|
||||||
|
agent_inbox_dir: sources.agent_inbox_dir.code(),
|
||||||
|
agent_storage_dir: sources.agent_storage_dir.code(),
|
||||||
|
agent_llm_url: sources.agent_llm_url.code(),
|
||||||
|
agent_llm_model: sources.agent_llm_model.code(),
|
||||||
|
agent_llm_auth: sources.agent_llm_auth.code(),
|
||||||
|
agent_confidence_threshold: sources.agent_confidence_threshold.code(),
|
||||||
|
agent_context_limit: sources.agent_context_limit.code(),
|
||||||
|
agent_concurrency: sources.agent_concurrency.code(),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn run_job(
|
pub async fn run_job(
|
||||||
session: Session,
|
session: Session,
|
||||||
db: Database,
|
db: Database,
|
||||||
|
|||||||
+2
-2
@@ -799,7 +799,7 @@ pub async fn artists_edit(
|
|||||||
.await
|
.await
|
||||||
.ok()
|
.ok()
|
||||||
.flatten()
|
.flatten()
|
||||||
.map(|mf| format!("/api/player/cover/{}", mf.id_val())),
|
.map(|mf| format!("/api/player/cover/{}/large", mf.id_val())),
|
||||||
None => None,
|
None => None,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -879,7 +879,7 @@ pub async fn artists_available_covers(
|
|||||||
covers.push(AvailableCover {
|
covers.push(AvailableCover {
|
||||||
media_file_id: cover_fid,
|
media_file_id: cover_fid,
|
||||||
release_title: release.title_str().to_owned(),
|
release_title: release.title_str().to_owned(),
|
||||||
cover_url: format!("/api/player/cover/{cover_fid}"),
|
cover_url: format!("/api/player/cover/{cover_fid}/medium"),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -328,6 +328,23 @@ pub async fn save_cover_to_storage(
|
|||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
if let Some((id,)) = existing {
|
if let Some((id,)) = existing {
|
||||||
|
if let Some((file_path,)) = sqlx::query_as::<_, (String,)>(
|
||||||
|
"SELECT file_path FROM furumusic__media_file WHERE id = $1",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.fetch_optional(pool)
|
||||||
|
.await?
|
||||||
|
{
|
||||||
|
let path = PathBuf::from(&file_path);
|
||||||
|
let path = if path.is_absolute() {
|
||||||
|
path
|
||||||
|
} else {
|
||||||
|
Path::new(storage_dir).join(path)
|
||||||
|
};
|
||||||
|
if let Err(err) = crate::agent::cover_variants::ensure_cover_variants(&path).await {
|
||||||
|
tracing::warn!(media_file_id = id, error = %err, "Failed to generate cover variants");
|
||||||
|
}
|
||||||
|
}
|
||||||
return Ok(id);
|
return Ok(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -374,6 +391,14 @@ pub async fn save_cover_to_storage(
|
|||||||
"Saved cover art"
|
"Saved cover art"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if let Err(err) = crate::agent::cover_variants::ensure_cover_variants(&dest_path).await {
|
||||||
|
tracing::warn!(
|
||||||
|
media_file_id = media_file.id_val(),
|
||||||
|
error = %err,
|
||||||
|
"Failed to generate cover variants"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(media_file.id_val())
|
Ok(media_file.id_val())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,102 @@
|
|||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use image::codecs::jpeg::JpegEncoder;
|
||||||
|
use image::imageops::FilterType;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy)]
|
||||||
|
pub struct CoverVariant {
|
||||||
|
pub name: &'static str,
|
||||||
|
pub max_edge: u32,
|
||||||
|
pub quality: u8,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub const COVER_VARIANTS: &[CoverVariant] = &[
|
||||||
|
CoverVariant {
|
||||||
|
name: "small",
|
||||||
|
max_edge: 96,
|
||||||
|
quality: 80,
|
||||||
|
},
|
||||||
|
CoverVariant {
|
||||||
|
name: "medium",
|
||||||
|
max_edge: 256,
|
||||||
|
quality: 82,
|
||||||
|
},
|
||||||
|
CoverVariant {
|
||||||
|
name: "large",
|
||||||
|
max_edge: 512,
|
||||||
|
quality: 85,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
pub fn variant_by_name(name: &str) -> Option<CoverVariant> {
|
||||||
|
COVER_VARIANTS
|
||||||
|
.iter()
|
||||||
|
.copied()
|
||||||
|
.find(|variant| variant.name == name)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn variant_path(original_path: &Path, variant: CoverVariant) -> PathBuf {
|
||||||
|
let stem = original_path
|
||||||
|
.file_stem()
|
||||||
|
.and_then(|value| value.to_str())
|
||||||
|
.filter(|value| !value.is_empty())
|
||||||
|
.unwrap_or("cover");
|
||||||
|
let filename = format!("{stem}.{}.jpg", variant.name);
|
||||||
|
original_path.with_file_name(filename)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn missing_variants(original_path: &Path) -> Vec<CoverVariant> {
|
||||||
|
COVER_VARIANTS
|
||||||
|
.iter()
|
||||||
|
.copied()
|
||||||
|
.filter(|variant| !variant_path(original_path, *variant).exists())
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn ensure_cover_variants(original_path: &Path) -> anyhow::Result<usize> {
|
||||||
|
let missing = missing_variants(original_path);
|
||||||
|
if missing.is_empty() {
|
||||||
|
return Ok(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
let original_path = original_path.to_path_buf();
|
||||||
|
tokio::task::spawn_blocking(move || generate_missing_variants_sync(&original_path, &missing))
|
||||||
|
.await
|
||||||
|
.map_err(|err| anyhow::anyhow!("cover variant task failed: {err}"))?
|
||||||
|
}
|
||||||
|
|
||||||
|
fn generate_missing_variants_sync(
|
||||||
|
original_path: &Path,
|
||||||
|
variants: &[CoverVariant],
|
||||||
|
) -> anyhow::Result<usize> {
|
||||||
|
let data = std::fs::read(original_path)?;
|
||||||
|
let image = image::load_from_memory(&data)?;
|
||||||
|
|
||||||
|
let mut created = 0usize;
|
||||||
|
for variant in variants {
|
||||||
|
let path = variant_path(original_path, *variant);
|
||||||
|
if path.exists() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(parent) = path.parent() {
|
||||||
|
std::fs::create_dir_all(parent)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let resized = image
|
||||||
|
.resize(variant.max_edge, variant.max_edge, FilterType::Lanczos3)
|
||||||
|
.to_rgb8();
|
||||||
|
let mut output = Vec::new();
|
||||||
|
let mut encoder = JpegEncoder::new_with_quality(&mut output, variant.quality);
|
||||||
|
encoder.encode(
|
||||||
|
&resized,
|
||||||
|
resized.width(),
|
||||||
|
resized.height(),
|
||||||
|
image::ExtendedColorType::Rgb8,
|
||||||
|
)?;
|
||||||
|
std::fs::write(path, output)?;
|
||||||
|
created += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(created)
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
pub mod cover_art;
|
pub mod cover_art;
|
||||||
|
pub mod cover_variants;
|
||||||
pub mod dto;
|
pub mod dto;
|
||||||
pub mod metadata;
|
pub mod metadata;
|
||||||
pub mod mover;
|
pub mod mover;
|
||||||
|
|||||||
@@ -133,6 +133,7 @@ pub struct ConfigSources {
|
|||||||
pub agent_confidence_threshold: ConfigSource,
|
pub agent_confidence_threshold: ConfigSource,
|
||||||
pub agent_context_limit: ConfigSource,
|
pub agent_context_limit: ConfigSource,
|
||||||
pub agent_concurrency: ConfigSource,
|
pub agent_concurrency: ConfigSource,
|
||||||
|
pub lastfm_api_key: ConfigSource,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for ConfigSources {
|
impl Default for ConfigSources {
|
||||||
@@ -158,6 +159,7 @@ impl Default for ConfigSources {
|
|||||||
agent_confidence_threshold: ConfigSource::Default,
|
agent_confidence_threshold: ConfigSource::Default,
|
||||||
agent_context_limit: ConfigSource::Default,
|
agent_context_limit: ConfigSource::Default,
|
||||||
agent_concurrency: ConfigSource::Default,
|
agent_concurrency: ConfigSource::Default,
|
||||||
|
lastfm_api_key: ConfigSource::Default,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -262,6 +264,8 @@ pub struct AppConfig {
|
|||||||
pub agent_context_limit: u64,
|
pub agent_context_limit: u64,
|
||||||
/// Number of files to process in parallel via the LLM.
|
/// Number of files to process in parallel via the LLM.
|
||||||
pub agent_concurrency: u64,
|
pub agent_concurrency: u64,
|
||||||
|
/// Last.fm API key for weekly popularity enrichment.
|
||||||
|
pub lastfm_api_key: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for AppConfig {
|
impl Default for AppConfig {
|
||||||
@@ -287,6 +291,7 @@ impl Default for AppConfig {
|
|||||||
agent_confidence_threshold: 0.85,
|
agent_confidence_threshold: 0.85,
|
||||||
agent_context_limit: 8192,
|
agent_context_limit: 8192,
|
||||||
agent_concurrency: 2,
|
agent_concurrency: 2,
|
||||||
|
lastfm_api_key: String::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -313,6 +318,7 @@ impl_env_overrides!(
|
|||||||
agent_confidence_threshold,
|
agent_confidence_threshold,
|
||||||
agent_context_limit,
|
agent_context_limit,
|
||||||
agent_concurrency,
|
agent_concurrency,
|
||||||
|
lastfm_api_key,
|
||||||
);
|
);
|
||||||
|
|
||||||
impl AppConfig {
|
impl AppConfig {
|
||||||
@@ -396,6 +402,7 @@ impl AppConfig {
|
|||||||
apply_db_field!(agent_confidence_threshold);
|
apply_db_field!(agent_confidence_threshold);
|
||||||
apply_db_field!(agent_context_limit);
|
apply_db_field!(agent_context_limit);
|
||||||
apply_db_field!(agent_concurrency);
|
apply_db_field!(agent_concurrency);
|
||||||
|
apply_db_field!(lastfm_api_key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -321,6 +321,11 @@ translations! {
|
|||||||
player_audio: "Audio" , "Аудио";
|
player_audio: "Audio" , "Аудио";
|
||||||
player_size: "Size" , "Размер";
|
player_size: "Size" , "Размер";
|
||||||
player_uploader: "Uploader" , "Загрузил";
|
player_uploader: "Uploader" , "Загрузил";
|
||||||
|
player_lastfm_rating: "Last.fm popularity" , "Популярность Last.fm";
|
||||||
|
player_lastfm_listeners: "Last.fm listeners" , "Слушатели Last.fm";
|
||||||
|
player_lastfm_playcount: "Last.fm plays" , "Прослушивания Last.fm";
|
||||||
|
player_lastfm_updated: "Last.fm updated" , "Last.fm обновлён";
|
||||||
|
player_lastfm_not_loaded: "not loaded yet" , "ещё не загружено";
|
||||||
player_play: "Play" , "Играть";
|
player_play: "Play" , "Играть";
|
||||||
player_like: "Like" , "Лайк";
|
player_like: "Like" , "Лайк";
|
||||||
player_add_to_queue: "Add to queue" , "Добавить в очередь";
|
player_add_to_queue: "Add to queue" , "Добавить в очередь";
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use crate::agent::cover_variants;
|
||||||
|
use crate::scheduler::{Job, JobContext, JobLog};
|
||||||
|
|
||||||
|
pub struct CoverVariantBackfillJob;
|
||||||
|
|
||||||
|
#[async_trait::async_trait]
|
||||||
|
impl Job for CoverVariantBackfillJob {
|
||||||
|
fn name(&self) -> &'static str {
|
||||||
|
"cover_variant_backfill"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn description(&self) -> &'static str {
|
||||||
|
"Generate missing resized cover image variants"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn default_cron(&self) -> &'static str {
|
||||||
|
// Once a day after cover extraction and artist image assignment.
|
||||||
|
"0 45 3 * * *"
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run(&self, ctx: &JobContext, log: &mut JobLog) -> anyhow::Result<()> {
|
||||||
|
let storage_dir = &ctx.config.agent_storage_dir;
|
||||||
|
if storage_dir.is_empty() {
|
||||||
|
log.warn("agent_storage_dir is not configured, skipping cover variant backfill");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let rows: Vec<(i64, String)> = sqlx::query_as(
|
||||||
|
"SELECT id, file_path FROM furumusic__media_file WHERE file_type = 'cover_art' ORDER BY id",
|
||||||
|
)
|
||||||
|
.fetch_all(&ctx.pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
if rows.is_empty() {
|
||||||
|
log.info("No cover art media files found");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info(&format!(
|
||||||
|
"Found {} cover art media file(s), checking variants...",
|
||||||
|
rows.len()
|
||||||
|
));
|
||||||
|
|
||||||
|
let mut created = 0usize;
|
||||||
|
let mut unchanged = 0usize;
|
||||||
|
let mut missing_original = 0usize;
|
||||||
|
let mut failed = 0usize;
|
||||||
|
|
||||||
|
for (media_file_id, file_path) in rows {
|
||||||
|
let path = resolve_media_path(storage_dir, &file_path);
|
||||||
|
if !path.exists() {
|
||||||
|
missing_original += 1;
|
||||||
|
log.warn(&format!(
|
||||||
|
"Media file {media_file_id}: original cover not found at {}",
|
||||||
|
path.display()
|
||||||
|
));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
match cover_variants::ensure_cover_variants(&path).await {
|
||||||
|
Ok(0) => unchanged += 1,
|
||||||
|
Ok(count) => {
|
||||||
|
created += count;
|
||||||
|
log.info(&format!(
|
||||||
|
"Media file {media_file_id}: created {count} variant(s)"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
failed += 1;
|
||||||
|
log.warn(&format!(
|
||||||
|
"Media file {media_file_id}: failed to create variants: {err}"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info(&format!(
|
||||||
|
"Cover variant backfill complete: {created} variant(s) created, \
|
||||||
|
{unchanged} original(s) already complete, {missing_original} missing original(s), \
|
||||||
|
{failed} failed original(s)"
|
||||||
|
));
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn resolve_media_path(storage_dir: &str, file_path: &str) -> PathBuf {
|
||||||
|
let path = PathBuf::from(file_path);
|
||||||
|
if path.is_absolute() {
|
||||||
|
path
|
||||||
|
} else {
|
||||||
|
Path::new(storage_dir).join(path)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,249 @@
|
|||||||
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
use crate::scheduler::{Job, JobContext, JobLog};
|
||||||
|
|
||||||
|
pub struct LastfmPopularityJob;
|
||||||
|
|
||||||
|
const LASTFM_REQUEST_DELAY: std::time::Duration = std::time::Duration::from_millis(1200);
|
||||||
|
|
||||||
|
#[derive(Debug, sqlx::FromRow)]
|
||||||
|
struct TrackLookupRow {
|
||||||
|
id: i64,
|
||||||
|
title: String,
|
||||||
|
artist_name: Option<String>,
|
||||||
|
lastfm_updated_at: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
struct LastfmTrackInfoResponse {
|
||||||
|
track: Option<LastfmTrack>,
|
||||||
|
error: Option<i32>,
|
||||||
|
message: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
struct LastfmTrack {
|
||||||
|
listeners: Option<String>,
|
||||||
|
playcount: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait::async_trait]
|
||||||
|
impl Job for LastfmPopularityJob {
|
||||||
|
fn name(&self) -> &'static str {
|
||||||
|
"lastfm_popularity"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn description(&self) -> &'static str {
|
||||||
|
"Update Last.fm playcount/listener popularity for library tracks"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn default_cron(&self) -> &'static str {
|
||||||
|
// Sundays at 04:15
|
||||||
|
"0 15 4 * * Sun"
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run(&self, ctx: &JobContext, log: &mut JobLog) -> anyhow::Result<()> {
|
||||||
|
let api_key = ctx.config.lastfm_api_key.trim();
|
||||||
|
if api_key.is_empty() {
|
||||||
|
log.warn("lastfm_api_key is not configured, skipping Last.fm popularity update");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let tracks = sqlx::query_as::<_, TrackLookupRow>(
|
||||||
|
r#"SELECT t.id,
|
||||||
|
t.title::text AS title,
|
||||||
|
t.lastfm_updated_at::text AS lastfm_updated_at,
|
||||||
|
(
|
||||||
|
SELECT a.name::text
|
||||||
|
FROM furumusic__track_artist ta
|
||||||
|
JOIN furumusic__artist a ON a.id = ta.artist_id
|
||||||
|
WHERE ta.track_id = t.id AND ta.role <> 'featuring'
|
||||||
|
ORDER BY ta.position
|
||||||
|
LIMIT 1
|
||||||
|
) AS artist_name
|
||||||
|
FROM furumusic__track t
|
||||||
|
WHERE t.is_hidden = false
|
||||||
|
ORDER BY t.lastfm_updated_at IS NOT NULL, t.lastfm_updated_at ASC, t.id ASC"#,
|
||||||
|
)
|
||||||
|
.fetch_all(&ctx.pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
if tracks.is_empty() {
|
||||||
|
log.info("No visible tracks found for Last.fm popularity update");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info(&format!(
|
||||||
|
"Starting Last.fm popularity update for {} visible tracks; oldest or missing ratings are processed first; request delay is {} ms; rating formula is ln(playcount + 1) * ln(listeners + 1)",
|
||||||
|
tracks.len(),
|
||||||
|
LASTFM_REQUEST_DELAY.as_millis()
|
||||||
|
));
|
||||||
|
|
||||||
|
let client = reqwest::Client::builder()
|
||||||
|
.user_agent("furumusic-lastfm-popularity/0.1")
|
||||||
|
.timeout(std::time::Duration::from_secs(15))
|
||||||
|
.build()?;
|
||||||
|
let mut updated = 0u64;
|
||||||
|
let mut skipped = 0u64;
|
||||||
|
let mut failed = 0u64;
|
||||||
|
|
||||||
|
for (index, track) in tracks.iter().enumerate() {
|
||||||
|
let Some(artist) = track
|
||||||
|
.artist_name
|
||||||
|
.as_deref()
|
||||||
|
.map(str::trim)
|
||||||
|
.filter(|v| !v.is_empty())
|
||||||
|
else {
|
||||||
|
skipped += 1;
|
||||||
|
log.warn(&format!(
|
||||||
|
"Skipping track {} \"{}\": no primary artist",
|
||||||
|
track.id, track.title
|
||||||
|
));
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
log.info(&format!(
|
||||||
|
"Last.fm lookup {}/{}: track {} \"{}\" by \"{}\" (previous update: {})",
|
||||||
|
index + 1,
|
||||||
|
tracks.len(),
|
||||||
|
track.id,
|
||||||
|
track.title,
|
||||||
|
artist,
|
||||||
|
track.lastfm_updated_at.as_deref().unwrap_or("never")
|
||||||
|
));
|
||||||
|
let result = fetch_track_info(&client, api_key, artist, &track.title).await;
|
||||||
|
match result {
|
||||||
|
Ok(Some((listeners, playcount))) => {
|
||||||
|
let rating = popularity_rating(listeners, playcount);
|
||||||
|
let fetched_at = chrono::Utc::now().format("%Y-%m-%dT%H:%M:%SZ").to_string();
|
||||||
|
sqlx::query(
|
||||||
|
r#"UPDATE furumusic__track
|
||||||
|
SET lastfm_listeners = $2,
|
||||||
|
lastfm_playcount = $3,
|
||||||
|
lastfm_rating = $4,
|
||||||
|
lastfm_updated_at = $5
|
||||||
|
WHERE id = $1"#,
|
||||||
|
)
|
||||||
|
.bind(track.id)
|
||||||
|
.bind(listeners)
|
||||||
|
.bind(playcount)
|
||||||
|
.bind(rating)
|
||||||
|
.bind(&fetched_at)
|
||||||
|
.execute(&ctx.pool)
|
||||||
|
.await?;
|
||||||
|
sqlx::query(
|
||||||
|
r#"INSERT INTO furumusic__track_popularity_history
|
||||||
|
(track_id, source, listeners, playcount, rating, fetched_at)
|
||||||
|
VALUES ($1, 'lastfm', $2, $3, $4, $5)"#,
|
||||||
|
)
|
||||||
|
.bind(track.id)
|
||||||
|
.bind(listeners)
|
||||||
|
.bind(playcount)
|
||||||
|
.bind(rating)
|
||||||
|
.bind(&fetched_at)
|
||||||
|
.execute(&ctx.pool)
|
||||||
|
.await?;
|
||||||
|
updated += 1;
|
||||||
|
log.info(&format!(
|
||||||
|
"Updated track {} \"{}\" by \"{}\": listeners={listeners}, playcount={playcount}, rating={rating:.4}",
|
||||||
|
track.id, track.title, artist
|
||||||
|
));
|
||||||
|
}
|
||||||
|
Ok(None) => {
|
||||||
|
skipped += 1;
|
||||||
|
log.warn(&format!(
|
||||||
|
"Last.fm has no usable match for track {} \"{}\" by \"{}\"",
|
||||||
|
track.id, track.title, artist
|
||||||
|
));
|
||||||
|
}
|
||||||
|
Err(err) if err.to_string().contains("Last.fm rate limit exceeded") => {
|
||||||
|
failed += 1;
|
||||||
|
log.error("Last.fm rate limit exceeded; stopping this run early");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
failed += 1;
|
||||||
|
log.warn(&format!(
|
||||||
|
"Last.fm lookup failed for track {} \"{}\" / \"{}\": {err}",
|
||||||
|
track.id, artist, track.title
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (index + 1) % 50 == 0 {
|
||||||
|
log.info(&format!(
|
||||||
|
"Last.fm progress: {}/{} tracks, {updated} updated, {skipped} skipped, {failed} failed",
|
||||||
|
index + 1,
|
||||||
|
tracks.len()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
tokio::time::sleep(LASTFM_REQUEST_DELAY).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info(&format!(
|
||||||
|
"Last.fm popularity update finished: {updated} updated, {skipped} skipped, {failed} failed, {} considered",
|
||||||
|
tracks.len()
|
||||||
|
));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn fetch_track_info(
|
||||||
|
client: &reqwest::Client,
|
||||||
|
api_key: &str,
|
||||||
|
artist: &str,
|
||||||
|
track: &str,
|
||||||
|
) -> anyhow::Result<Option<(i64, i64)>> {
|
||||||
|
let response = client
|
||||||
|
.get("https://ws.audioscrobbler.com/2.0/")
|
||||||
|
.query(&[
|
||||||
|
("method", "track.getInfo"),
|
||||||
|
("api_key", api_key),
|
||||||
|
("artist", artist),
|
||||||
|
("track", track),
|
||||||
|
("autocorrect", "1"),
|
||||||
|
("format", "json"),
|
||||||
|
])
|
||||||
|
.send()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
if response.status() == reqwest::StatusCode::NOT_FOUND {
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
let response = response.error_for_status()?;
|
||||||
|
let body: LastfmTrackInfoResponse = response.json().await?;
|
||||||
|
if let Some(code) = body.error {
|
||||||
|
if code == 29 {
|
||||||
|
anyhow::bail!("Last.fm rate limit exceeded");
|
||||||
|
}
|
||||||
|
if code == 6 || code == 7 {
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
anyhow::bail!(
|
||||||
|
"Last.fm API error {code}: {}",
|
||||||
|
body.message.unwrap_or_else(|| "unknown error".to_string())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
let Some(info) = body.track else {
|
||||||
|
return Ok(None);
|
||||||
|
};
|
||||||
|
let listeners = info
|
||||||
|
.listeners
|
||||||
|
.as_deref()
|
||||||
|
.unwrap_or("0")
|
||||||
|
.parse::<i64>()
|
||||||
|
.unwrap_or(0);
|
||||||
|
let playcount = info
|
||||||
|
.playcount
|
||||||
|
.as_deref()
|
||||||
|
.unwrap_or("0")
|
||||||
|
.parse::<i64>()
|
||||||
|
.unwrap_or(0);
|
||||||
|
Ok(Some((listeners.max(0), playcount.max(0))))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn popularity_rating(listeners: i64, playcount: i64) -> f64 {
|
||||||
|
let listeners = listeners.max(0) as f64;
|
||||||
|
let playcount = playcount.max(0) as f64;
|
||||||
|
playcount.ln_1p() * listeners.ln_1p()
|
||||||
|
}
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
pub mod artist_image_backfill;
|
pub mod artist_image_backfill;
|
||||||
pub mod artist_track_image_backfill;
|
pub mod artist_track_image_backfill;
|
||||||
pub mod cover_backfill;
|
pub mod cover_backfill;
|
||||||
|
pub mod cover_variant_backfill;
|
||||||
pub mod inbox_discover;
|
pub mod inbox_discover;
|
||||||
pub mod inbox_process;
|
pub mod inbox_process;
|
||||||
|
pub mod lastfm_popularity;
|
||||||
pub mod metadata_backfill;
|
pub mod metadata_backfill;
|
||||||
|
|
||||||
use std::path::{Component, Path, PathBuf};
|
use std::path::{Component, Path, PathBuf};
|
||||||
|
|||||||
@@ -52,7 +52,9 @@ fn build_registry() -> Arc<JobRegistry> {
|
|||||||
registry.register(jobs::cover_backfill::CoverBackfillJob);
|
registry.register(jobs::cover_backfill::CoverBackfillJob);
|
||||||
registry.register(jobs::artist_image_backfill::ArtistImageBackfillJob);
|
registry.register(jobs::artist_image_backfill::ArtistImageBackfillJob);
|
||||||
registry.register(jobs::artist_track_image_backfill::ArtistTrackImageBackfillJob);
|
registry.register(jobs::artist_track_image_backfill::ArtistTrackImageBackfillJob);
|
||||||
|
registry.register(jobs::cover_variant_backfill::CoverVariantBackfillJob);
|
||||||
registry.register(jobs::metadata_backfill::MetadataBackfillJob);
|
registry.register(jobs::metadata_backfill::MetadataBackfillJob);
|
||||||
|
registry.register(jobs::lastfm_popularity::LastfmPopularityJob);
|
||||||
Arc::new(registry)
|
Arc::new(registry)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1637,6 +1637,61 @@ pub mod db_migrations {
|
|||||||
&[Operation::custom(create_torrent_session).build()];
|
&[Operation::custom(create_torrent_session).build()];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// -- M0032: Last.fm track popularity ------------------------------------
|
||||||
|
|
||||||
|
#[cot::db::migrations::migration_op]
|
||||||
|
async fn create_lastfm_track_popularity(
|
||||||
|
ctx: migrations::MigrationContext<'_>,
|
||||||
|
) -> cot::db::Result<()> {
|
||||||
|
ctx.db
|
||||||
|
.raw("ALTER TABLE furumusic__track ADD COLUMN lastfm_listeners BIGINT")
|
||||||
|
.await?;
|
||||||
|
ctx.db
|
||||||
|
.raw("ALTER TABLE furumusic__track ADD COLUMN lastfm_playcount BIGINT")
|
||||||
|
.await?;
|
||||||
|
ctx.db
|
||||||
|
.raw("ALTER TABLE furumusic__track ADD COLUMN lastfm_rating DOUBLE PRECISION")
|
||||||
|
.await?;
|
||||||
|
ctx.db
|
||||||
|
.raw("ALTER TABLE furumusic__track ADD COLUMN lastfm_updated_at VARCHAR(32)")
|
||||||
|
.await?;
|
||||||
|
ctx.db
|
||||||
|
.raw(
|
||||||
|
"CREATE TABLE IF NOT EXISTS furumusic__track_popularity_history (
|
||||||
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
track_id BIGINT NOT NULL,
|
||||||
|
source VARCHAR(32) NOT NULL,
|
||||||
|
listeners BIGINT NOT NULL,
|
||||||
|
playcount BIGINT NOT NULL,
|
||||||
|
rating DOUBLE PRECISION NOT NULL,
|
||||||
|
fetched_at VARCHAR(32) NOT NULL
|
||||||
|
)",
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
ctx.db
|
||||||
|
.raw(
|
||||||
|
"CREATE INDEX IF NOT EXISTS idx_track_popularity_history_track
|
||||||
|
ON furumusic__track_popularity_history (track_id, fetched_at DESC)",
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Copy, Clone)]
|
||||||
|
pub struct M0032CreateLastfmTrackPopularity;
|
||||||
|
|
||||||
|
impl migrations::Migration for M0032CreateLastfmTrackPopularity {
|
||||||
|
const APP_NAME: &'static str = "furumusic";
|
||||||
|
const MIGRATION_NAME: &'static str = "m_0032_create_lastfm_track_popularity";
|
||||||
|
const DEPENDENCIES: &'static [migrations::MigrationDependency] =
|
||||||
|
&[migrations::MigrationDependency::migration(
|
||||||
|
"furumusic",
|
||||||
|
"m_0031_create_torrent_session",
|
||||||
|
)];
|
||||||
|
const OPERATIONS: &'static [Operation] =
|
||||||
|
&[Operation::custom(create_lastfm_track_popularity).build()];
|
||||||
|
}
|
||||||
|
|
||||||
pub const MIGRATIONS: &[&SyncDynMigration] = &[
|
pub const MIGRATIONS: &[&SyncDynMigration] = &[
|
||||||
&M0006CreateMediaFile,
|
&M0006CreateMediaFile,
|
||||||
&M0007CreateArtist,
|
&M0007CreateArtist,
|
||||||
@@ -1659,5 +1714,6 @@ pub mod db_migrations {
|
|||||||
&M0029AddPlaybackVolume,
|
&M0029AddPlaybackVolume,
|
||||||
&M0030AddMediaFileUploader,
|
&M0030AddMediaFileUploader,
|
||||||
&M0031CreateTorrentSession,
|
&M0031CreateTorrentSession,
|
||||||
|
&M0032CreateLastfmTrackPopularity,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-5
@@ -389,11 +389,7 @@ pub async fn oidc_callback_handler(
|
|||||||
config.oidc_user_groups,
|
config.oidc_user_groups,
|
||||||
);
|
);
|
||||||
|
|
||||||
if !is_allowed_by_groups(
|
if !is_allowed_by_groups(&groups, &config.oidc_user_groups, &config.oidc_admin_groups) {
|
||||||
&groups,
|
|
||||||
&config.oidc_user_groups,
|
|
||||||
&config.oidc_admin_groups,
|
|
||||||
) {
|
|
||||||
tracing::warn!(
|
tracing::warn!(
|
||||||
"OIDC login denied by group allowlist: sub={sub}, groups={groups:?}, user_groups={:?}, admin_groups={:?}",
|
"OIDC login denied by group allowlist: sub={sub}, groups={groups:?}, user_groups={:?}, admin_groups={:?}",
|
||||||
config.oidc_user_groups,
|
config.oidc_user_groups,
|
||||||
|
|||||||
@@ -64,6 +64,10 @@ pub(super) struct TrackItem {
|
|||||||
pub(super) audio_sample_rate: Option<i32>,
|
pub(super) audio_sample_rate: Option<i32>,
|
||||||
pub(super) audio_bit_depth: Option<i32>,
|
pub(super) audio_bit_depth: Option<i32>,
|
||||||
pub(super) file_size_bytes: Option<i64>,
|
pub(super) file_size_bytes: Option<i64>,
|
||||||
|
pub(super) lastfm_listeners: Option<i64>,
|
||||||
|
pub(super) lastfm_playcount: Option<i64>,
|
||||||
|
pub(super) lastfm_rating: Option<f64>,
|
||||||
|
pub(super) lastfm_updated_at: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, JsonSchema)]
|
#[derive(Debug, Serialize, JsonSchema)]
|
||||||
@@ -84,6 +88,10 @@ pub(super) struct ArtistAppearanceTrack {
|
|||||||
pub(super) audio_sample_rate: Option<i32>,
|
pub(super) audio_sample_rate: Option<i32>,
|
||||||
pub(super) audio_bit_depth: Option<i32>,
|
pub(super) audio_bit_depth: Option<i32>,
|
||||||
pub(super) file_size_bytes: Option<i64>,
|
pub(super) file_size_bytes: Option<i64>,
|
||||||
|
pub(super) lastfm_listeners: Option<i64>,
|
||||||
|
pub(super) lastfm_playcount: Option<i64>,
|
||||||
|
pub(super) lastfm_rating: Option<f64>,
|
||||||
|
pub(super) lastfm_updated_at: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, JsonSchema)]
|
#[derive(Debug, Serialize, JsonSchema)]
|
||||||
|
|||||||
@@ -1,15 +1,16 @@
|
|||||||
use crate::player::dto::UploaderSummary;
|
use crate::player::dto::UploaderSummary;
|
||||||
use crate::player::rows::ReleaseUploaderRow;
|
use crate::player::rows::ReleaseUploaderRow;
|
||||||
|
|
||||||
pub(super) fn cover_url(file_id: Option<i64>) -> Option<String> {
|
pub(super) fn cover_variant_url(file_id: Option<i64>, variant: &str) -> Option<String> {
|
||||||
file_id.map(|id| format!("/api/player/cover/{id}"))
|
file_id.map(|id| format!("/api/player/cover/{id}/{variant}"))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn track_cover_url(
|
pub(super) fn track_cover_variant_url(
|
||||||
track_cover: Option<i64>,
|
track_cover: Option<i64>,
|
||||||
release_cover: Option<i64>,
|
release_cover: Option<i64>,
|
||||||
|
variant: &str,
|
||||||
) -> Option<String> {
|
) -> Option<String> {
|
||||||
cover_url(track_cover.or(release_cover))
|
cover_variant_url(track_cover.or(release_cover), variant)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) async fn load_release_uploaders(
|
pub(super) async fn load_release_uploaders(
|
||||||
|
|||||||
+174
-33
@@ -25,7 +25,7 @@ mod queries;
|
|||||||
mod rows;
|
mod rows;
|
||||||
|
|
||||||
use dto::*;
|
use dto::*;
|
||||||
use helpers::{cover_url, load_release_uploaders, track_cover_url};
|
use helpers::{cover_variant_url, load_release_uploaders, track_cover_variant_url};
|
||||||
use queries::*;
|
use queries::*;
|
||||||
use rows::*;
|
use rows::*;
|
||||||
|
|
||||||
@@ -203,7 +203,7 @@ async fn artists_handler(
|
|||||||
.map(|r| ArtistCard {
|
.map(|r| ArtistCard {
|
||||||
id: r.id,
|
id: r.id,
|
||||||
name: r.name,
|
name: r.name,
|
||||||
image_url: cover_url(r.image_file_id),
|
image_url: cover_variant_url(r.image_file_id, "medium"),
|
||||||
release_count: r.release_count,
|
release_count: r.release_count,
|
||||||
track_count: r.track_count,
|
track_count: r.track_count,
|
||||||
})
|
})
|
||||||
@@ -279,7 +279,7 @@ async fn artist_detail_handler(
|
|||||||
title: r.title,
|
title: r.title,
|
||||||
release_type: r.release_type,
|
release_type: r.release_type,
|
||||||
year: r.year,
|
year: r.year,
|
||||||
cover_url: cover_url(r.cover_file_id),
|
cover_url: cover_variant_url(r.cover_file_id, "medium"),
|
||||||
track_count: r.track_count,
|
track_count: r.track_count,
|
||||||
uploaders: release_uploaders.remove(&r.id).unwrap_or_default(),
|
uploaders: release_uploaders.remove(&r.id).unwrap_or_default(),
|
||||||
})
|
})
|
||||||
@@ -313,7 +313,11 @@ async fn artist_detail_handler(
|
|||||||
mf.audio_bitrate,
|
mf.audio_bitrate,
|
||||||
mf.audio_sample_rate,
|
mf.audio_sample_rate,
|
||||||
mf.audio_bit_depth,
|
mf.audio_bit_depth,
|
||||||
mf.file_size_bytes
|
mf.file_size_bytes,
|
||||||
|
t.lastfm_listeners,
|
||||||
|
t.lastfm_playcount,
|
||||||
|
t.lastfm_rating,
|
||||||
|
t.lastfm_updated_at
|
||||||
FROM furumusic__track_artist ta
|
FROM furumusic__track_artist ta
|
||||||
JOIN furumusic__track t ON t.id = ta.track_id
|
JOIN furumusic__track t ON t.id = ta.track_id
|
||||||
JOIN furumusic__release r ON r.id = t.release_id
|
JOIN furumusic__release r ON r.id = t.release_id
|
||||||
@@ -382,7 +386,11 @@ async fn artist_detail_handler(
|
|||||||
duration_seconds: t.duration_seconds,
|
duration_seconds: t.duration_seconds,
|
||||||
artists: featured_main_artists.remove(&tid).unwrap_or_default(),
|
artists: featured_main_artists.remove(&tid).unwrap_or_default(),
|
||||||
featured_artists: featured_feat_artists.remove(&tid).unwrap_or_default(),
|
featured_artists: featured_feat_artists.remove(&tid).unwrap_or_default(),
|
||||||
cover_url: track_cover_url(t.cover_file_id, t.release_cover_file_id),
|
cover_url: track_cover_variant_url(
|
||||||
|
t.cover_file_id,
|
||||||
|
t.release_cover_file_id,
|
||||||
|
"medium",
|
||||||
|
),
|
||||||
stream_url: format!("/api/player/stream/{tid}"),
|
stream_url: format!("/api/player/stream/{tid}"),
|
||||||
uploader_name: t.uploader_name,
|
uploader_name: t.uploader_name,
|
||||||
audio_format: t.audio_format,
|
audio_format: t.audio_format,
|
||||||
@@ -390,6 +398,10 @@ async fn artist_detail_handler(
|
|||||||
audio_sample_rate: t.audio_sample_rate,
|
audio_sample_rate: t.audio_sample_rate,
|
||||||
audio_bit_depth: t.audio_bit_depth,
|
audio_bit_depth: t.audio_bit_depth,
|
||||||
file_size_bytes: t.file_size_bytes,
|
file_size_bytes: t.file_size_bytes,
|
||||||
|
lastfm_listeners: t.lastfm_listeners,
|
||||||
|
lastfm_playcount: t.lastfm_playcount,
|
||||||
|
lastfm_rating: t.lastfm_rating,
|
||||||
|
lastfm_updated_at: t.lastfm_updated_at,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
@@ -397,7 +409,7 @@ async fn artist_detail_handler(
|
|||||||
Json(ArtistDetail {
|
Json(ArtistDetail {
|
||||||
id: artist.id,
|
id: artist.id,
|
||||||
name: artist.name,
|
name: artist.name,
|
||||||
image_url: cover_url(image_file_id),
|
image_url: cover_variant_url(image_file_id, "large"),
|
||||||
total_track_count,
|
total_track_count,
|
||||||
total_play_count,
|
total_play_count,
|
||||||
releases: release_cards,
|
releases: release_cards,
|
||||||
@@ -459,7 +471,11 @@ async fn release_detail_handler(
|
|||||||
mf.audio_bitrate,
|
mf.audio_bitrate,
|
||||||
mf.audio_sample_rate,
|
mf.audio_sample_rate,
|
||||||
mf.audio_bit_depth,
|
mf.audio_bit_depth,
|
||||||
mf.file_size_bytes
|
mf.file_size_bytes,
|
||||||
|
t.lastfm_listeners,
|
||||||
|
t.lastfm_playcount,
|
||||||
|
t.lastfm_rating,
|
||||||
|
t.lastfm_updated_at
|
||||||
FROM furumusic__track t
|
FROM furumusic__track t
|
||||||
JOIN furumusic__release r ON r.id = t.release_id
|
JOIN furumusic__release r ON r.id = t.release_id
|
||||||
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
||||||
@@ -527,7 +543,11 @@ async fn release_detail_handler(
|
|||||||
artists: track_main_artists.remove(&tid).unwrap_or_default(),
|
artists: track_main_artists.remove(&tid).unwrap_or_default(),
|
||||||
featured_artists: track_feat_artists.remove(&tid).unwrap_or_default(),
|
featured_artists: track_feat_artists.remove(&tid).unwrap_or_default(),
|
||||||
release_year: t.release_year,
|
release_year: t.release_year,
|
||||||
cover_url: track_cover_url(t.cover_file_id, t.release_cover_file_id),
|
cover_url: track_cover_variant_url(
|
||||||
|
t.cover_file_id,
|
||||||
|
t.release_cover_file_id,
|
||||||
|
"medium",
|
||||||
|
),
|
||||||
stream_url: format!("/api/player/stream/{tid}"),
|
stream_url: format!("/api/player/stream/{tid}"),
|
||||||
uploader_name: t.uploader_name,
|
uploader_name: t.uploader_name,
|
||||||
audio_format: t.audio_format,
|
audio_format: t.audio_format,
|
||||||
@@ -535,6 +555,10 @@ async fn release_detail_handler(
|
|||||||
audio_sample_rate: t.audio_sample_rate,
|
audio_sample_rate: t.audio_sample_rate,
|
||||||
audio_bit_depth: t.audio_bit_depth,
|
audio_bit_depth: t.audio_bit_depth,
|
||||||
file_size_bytes: t.file_size_bytes,
|
file_size_bytes: t.file_size_bytes,
|
||||||
|
lastfm_listeners: t.lastfm_listeners,
|
||||||
|
lastfm_playcount: t.lastfm_playcount,
|
||||||
|
lastfm_rating: t.lastfm_rating,
|
||||||
|
lastfm_updated_at: t.lastfm_updated_at,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
@@ -549,7 +573,7 @@ async fn release_detail_handler(
|
|||||||
title: release.title,
|
title: release.title,
|
||||||
release_type: release.release_type,
|
release_type: release.release_type,
|
||||||
year: release.year,
|
year: release.year,
|
||||||
cover_url: cover_url(release.cover_file_id),
|
cover_url: cover_variant_url(release.cover_file_id, "large"),
|
||||||
artists: release_artists
|
artists: release_artists
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|a| ArtistRef {
|
.map(|a| ArtistRef {
|
||||||
@@ -689,7 +713,11 @@ async fn playlist_detail_handler(
|
|||||||
mf.audio_bitrate,
|
mf.audio_bitrate,
|
||||||
mf.audio_sample_rate,
|
mf.audio_sample_rate,
|
||||||
mf.audio_bit_depth,
|
mf.audio_bit_depth,
|
||||||
mf.file_size_bytes
|
mf.file_size_bytes,
|
||||||
|
t.lastfm_listeners,
|
||||||
|
t.lastfm_playcount,
|
||||||
|
t.lastfm_rating,
|
||||||
|
t.lastfm_updated_at
|
||||||
FROM furumusic__playlist_track pt
|
FROM furumusic__playlist_track pt
|
||||||
JOIN furumusic__track t ON t.id = pt.track_id
|
JOIN furumusic__track t ON t.id = pt.track_id
|
||||||
JOIN furumusic__release r ON r.id = t.release_id
|
JOIN furumusic__release r ON r.id = t.release_id
|
||||||
@@ -777,7 +805,11 @@ async fn build_track_items(
|
|||||||
artists: track_main_artists.remove(&tid).unwrap_or_default(),
|
artists: track_main_artists.remove(&tid).unwrap_or_default(),
|
||||||
featured_artists: track_feat_artists.remove(&tid).unwrap_or_default(),
|
featured_artists: track_feat_artists.remove(&tid).unwrap_or_default(),
|
||||||
release_year: t.release_year,
|
release_year: t.release_year,
|
||||||
cover_url: track_cover_url(t.cover_file_id, t.release_cover_file_id),
|
cover_url: track_cover_variant_url(
|
||||||
|
t.cover_file_id,
|
||||||
|
t.release_cover_file_id,
|
||||||
|
"medium",
|
||||||
|
),
|
||||||
stream_url: format!("/api/player/stream/{tid}"),
|
stream_url: format!("/api/player/stream/{tid}"),
|
||||||
uploader_name: t.uploader_name,
|
uploader_name: t.uploader_name,
|
||||||
audio_format: t.audio_format,
|
audio_format: t.audio_format,
|
||||||
@@ -785,6 +817,10 @@ async fn build_track_items(
|
|||||||
audio_sample_rate: t.audio_sample_rate,
|
audio_sample_rate: t.audio_sample_rate,
|
||||||
audio_bit_depth: t.audio_bit_depth,
|
audio_bit_depth: t.audio_bit_depth,
|
||||||
file_size_bytes: t.file_size_bytes,
|
file_size_bytes: t.file_size_bytes,
|
||||||
|
lastfm_listeners: t.lastfm_listeners,
|
||||||
|
lastfm_playcount: t.lastfm_playcount,
|
||||||
|
lastfm_rating: t.lastfm_rating,
|
||||||
|
lastfm_updated_at: t.lastfm_updated_at,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.collect())
|
.collect())
|
||||||
@@ -962,7 +998,10 @@ async fn local_upload_handler(
|
|||||||
.await
|
.await
|
||||||
.map_err(|err| cot::Error::internal(err.to_string()))?;
|
.map_err(|err| cot::Error::internal(err.to_string()))?;
|
||||||
if bytes.is_empty() {
|
if bytes.is_empty() {
|
||||||
return Ok(json_error(StatusCode::BAD_REQUEST, "uploaded file is empty"));
|
return Ok(json_error(
|
||||||
|
StatusCode::BAD_REQUEST,
|
||||||
|
"uploaded file is empty",
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
let upload_dir = inbox_root
|
let upload_dir = inbox_root
|
||||||
@@ -1111,13 +1150,40 @@ async fn cover_handler(
|
|||||||
pool: &sqlx::PgPool,
|
pool: &sqlx::PgPool,
|
||||||
config: &AppConfig,
|
config: &AppConfig,
|
||||||
path: Path<PathMediaFileId>,
|
path: Path<PathMediaFileId>,
|
||||||
|
) -> cot::Result<cot::http::Response<Body>> {
|
||||||
|
cover_response(session, db, pool, config, path.0.media_file_id, None).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn cover_variant_handler(
|
||||||
|
session: Session,
|
||||||
|
db: Database,
|
||||||
|
pool: &sqlx::PgPool,
|
||||||
|
config: &AppConfig,
|
||||||
|
path: Path<PathMediaFileVariant>,
|
||||||
|
) -> cot::Result<cot::http::Response<Body>> {
|
||||||
|
cover_response(
|
||||||
|
session,
|
||||||
|
db,
|
||||||
|
pool,
|
||||||
|
config,
|
||||||
|
path.0.media_file_id,
|
||||||
|
Some(path.0.variant.as_str()),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn cover_response(
|
||||||
|
session: Session,
|
||||||
|
db: Database,
|
||||||
|
pool: &sqlx::PgPool,
|
||||||
|
config: &AppConfig,
|
||||||
|
media_file_id: i64,
|
||||||
|
variant_name: Option<&str>,
|
||||||
) -> cot::Result<cot::http::Response<Body>> {
|
) -> cot::Result<cot::http::Response<Body>> {
|
||||||
let Some(_user) = auth::get_session_user(&session, &db).await else {
|
let Some(_user) = auth::get_session_user(&session, &db).await else {
|
||||||
return Ok(json_error(StatusCode::UNAUTHORIZED, "not authenticated"));
|
return Ok(json_error(StatusCode::UNAUTHORIZED, "not authenticated"));
|
||||||
};
|
};
|
||||||
|
|
||||||
let media_file_id = path.0.media_file_id;
|
|
||||||
|
|
||||||
let media = sqlx::query_as::<_, MediaFileRow>(
|
let media = sqlx::query_as::<_, MediaFileRow>(
|
||||||
"SELECT file_path, mime_type::text as mime_type, file_size_bytes FROM furumusic__media_file WHERE id = $1",
|
"SELECT file_path, mime_type::text as mime_type, file_size_bytes FROM furumusic__media_file WHERE id = $1",
|
||||||
)
|
)
|
||||||
@@ -1136,13 +1202,25 @@ async fn cover_handler(
|
|||||||
return Ok(json_error(StatusCode::NOT_FOUND, "file not found on disk"));
|
return Ok(json_error(StatusCode::NOT_FOUND, "file not found on disk"));
|
||||||
}
|
}
|
||||||
|
|
||||||
let data = tokio::fs::read(&full_path)
|
let (response_path, content_type) = variant_name
|
||||||
|
.and_then(crate::agent::cover_variants::variant_by_name)
|
||||||
|
.map(|variant| {
|
||||||
|
let variant_path = crate::agent::cover_variants::variant_path(&full_path, variant);
|
||||||
|
if variant_path.exists() {
|
||||||
|
(variant_path, "image/jpeg")
|
||||||
|
} else {
|
||||||
|
(full_path.clone(), media.mime_type.as_str())
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.unwrap_or_else(|| (full_path.clone(), media.mime_type.as_str()));
|
||||||
|
|
||||||
|
let data = tokio::fs::read(&response_path)
|
||||||
.await
|
.await
|
||||||
.map_err(|e| cot::Error::internal(e.to_string()))?;
|
.map_err(|e| cot::Error::internal(e.to_string()))?;
|
||||||
|
|
||||||
let response = cot::http::Response::builder()
|
let response = cot::http::Response::builder()
|
||||||
.status(StatusCode::OK)
|
.status(StatusCode::OK)
|
||||||
.header(CONTENT_TYPE, media.mime_type.as_str())
|
.header(CONTENT_TYPE, content_type)
|
||||||
.header(CONTENT_LENGTH, data.len().to_string())
|
.header(CONTENT_LENGTH, data.len().to_string())
|
||||||
.header("Cache-Control", "public, max-age=86400")
|
.header("Cache-Control", "public, max-age=86400")
|
||||||
.body(Body::fixed(data))
|
.body(Body::fixed(data))
|
||||||
@@ -1404,7 +1482,11 @@ async fn search_handler(
|
|||||||
mf.audio_bitrate,
|
mf.audio_bitrate,
|
||||||
mf.audio_sample_rate,
|
mf.audio_sample_rate,
|
||||||
mf.audio_bit_depth,
|
mf.audio_bit_depth,
|
||||||
mf.file_size_bytes
|
mf.file_size_bytes,
|
||||||
|
t.lastfm_listeners,
|
||||||
|
t.lastfm_playcount,
|
||||||
|
t.lastfm_rating,
|
||||||
|
t.lastfm_updated_at
|
||||||
FROM furumusic__track t
|
FROM furumusic__track t
|
||||||
JOIN furumusic__release rel ON rel.id = t.release_id
|
JOIN furumusic__release rel ON rel.id = t.release_id
|
||||||
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
||||||
@@ -1469,7 +1551,7 @@ async fn search_handler(
|
|||||||
let t = sqlx::query_as::<_, SearchTrackRow>(
|
let t = sqlx::query_as::<_, SearchTrackRow>(
|
||||||
r#"SELECT id, title, track_number, disc_number, duration_seconds, cover_file_id,
|
r#"SELECT id, title, track_number, disc_number, duration_seconds, cover_file_id,
|
||||||
release_cover_file_id, release_year, uploader_name, audio_format, audio_bitrate,
|
release_cover_file_id, release_year, uploader_name, audio_format, audio_bitrate,
|
||||||
audio_sample_rate, audio_bit_depth, file_size_bytes FROM (
|
audio_sample_rate, audio_bit_depth, file_size_bytes, lastfm_listeners, lastfm_playcount, lastfm_rating, lastfm_updated_at FROM (
|
||||||
SELECT t.id, t.title::text AS title, t.track_number, t.disc_number,
|
SELECT t.id, t.title::text AS title, t.track_number, t.disc_number,
|
||||||
t.duration_seconds, t.cover_file_id,
|
t.duration_seconds, t.cover_file_id,
|
||||||
rel.cover_file_id AS release_cover_file_id,
|
rel.cover_file_id AS release_cover_file_id,
|
||||||
@@ -1480,20 +1562,27 @@ async fn search_handler(
|
|||||||
mf.audio_sample_rate,
|
mf.audio_sample_rate,
|
||||||
mf.audio_bit_depth,
|
mf.audio_bit_depth,
|
||||||
mf.file_size_bytes,
|
mf.file_size_bytes,
|
||||||
|
t.lastfm_listeners,
|
||||||
|
t.lastfm_playcount,
|
||||||
|
t.lastfm_rating,
|
||||||
|
t.lastfm_updated_at,
|
||||||
MAX(sim) AS similarity
|
MAX(sim) AS similarity
|
||||||
FROM (
|
FROM (
|
||||||
SELECT id, title, title_sort, track_number, disc_number, duration_seconds, cover_file_id, release_id, audio_file_id,
|
SELECT id, title, title_sort, track_number, disc_number, duration_seconds, cover_file_id, release_id, audio_file_id,
|
||||||
|
lastfm_listeners, lastfm_playcount, lastfm_rating, lastfm_updated_at,
|
||||||
similarity(title_sort, $1) AS sim
|
similarity(title_sort, $1) AS sim
|
||||||
FROM furumusic__track WHERE is_hidden = false AND title_sort % $1
|
FROM furumusic__track WHERE is_hidden = false AND title_sort % $1
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT id, title, title_sort, track_number, disc_number, duration_seconds, cover_file_id, release_id, audio_file_id,
|
SELECT id, title, title_sort, track_number, disc_number, duration_seconds, cover_file_id, release_id, audio_file_id,
|
||||||
|
lastfm_listeners, lastfm_playcount, lastfm_rating, lastfm_updated_at,
|
||||||
0.01::real AS sim
|
0.01::real AS sim
|
||||||
FROM furumusic__track WHERE is_hidden = false AND title_sort ILIKE '%' || $1 || '%'
|
FROM furumusic__track WHERE is_hidden = false AND title_sort ILIKE '%' || $1 || '%'
|
||||||
) t
|
) t
|
||||||
JOIN furumusic__release rel ON rel.id = t.release_id
|
JOIN furumusic__release rel ON rel.id = t.release_id
|
||||||
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
||||||
GROUP BY t.id, t.title, t.track_number, t.disc_number, t.duration_seconds, t.cover_file_id, rel.cover_file_id, rel.year,
|
GROUP BY t.id, t.title, t.track_number, t.disc_number, t.duration_seconds, t.cover_file_id, rel.cover_file_id, rel.year,
|
||||||
mf.uploader_name, mf.audio_format, mf.audio_bitrate, mf.audio_sample_rate, mf.audio_bit_depth, mf.file_size_bytes
|
mf.uploader_name, mf.audio_format, mf.audio_bitrate, mf.audio_sample_rate, mf.audio_bit_depth, mf.file_size_bytes,
|
||||||
|
t.lastfm_listeners, t.lastfm_playcount, t.lastfm_rating, t.lastfm_updated_at
|
||||||
ORDER BY similarity DESC
|
ORDER BY similarity DESC
|
||||||
LIMIT $2
|
LIMIT $2
|
||||||
) sub"#,
|
) sub"#,
|
||||||
@@ -1552,7 +1641,7 @@ async fn search_handler(
|
|||||||
.map(|r| ArtistCard {
|
.map(|r| ArtistCard {
|
||||||
id: r.id,
|
id: r.id,
|
||||||
name: r.name,
|
name: r.name,
|
||||||
image_url: cover_url(r.image_file_id),
|
image_url: cover_variant_url(r.image_file_id, "medium"),
|
||||||
release_count: r.release_count,
|
release_count: r.release_count,
|
||||||
track_count: r.track_count,
|
track_count: r.track_count,
|
||||||
})
|
})
|
||||||
@@ -1570,7 +1659,7 @@ async fn search_handler(
|
|||||||
title: r.title,
|
title: r.title,
|
||||||
release_type: r.release_type,
|
release_type: r.release_type,
|
||||||
year: r.year,
|
year: r.year,
|
||||||
cover_url: cover_url(r.cover_file_id),
|
cover_url: cover_variant_url(r.cover_file_id, "medium"),
|
||||||
track_count: r.track_count,
|
track_count: r.track_count,
|
||||||
uploaders: release_uploaders.remove(&r.id).unwrap_or_default(),
|
uploaders: release_uploaders.remove(&r.id).unwrap_or_default(),
|
||||||
})
|
})
|
||||||
@@ -1589,7 +1678,11 @@ async fn search_handler(
|
|||||||
artists: track_main_artists.remove(&tid).unwrap_or_default(),
|
artists: track_main_artists.remove(&tid).unwrap_or_default(),
|
||||||
featured_artists: track_feat_artists.remove(&tid).unwrap_or_default(),
|
featured_artists: track_feat_artists.remove(&tid).unwrap_or_default(),
|
||||||
release_year: t.release_year,
|
release_year: t.release_year,
|
||||||
cover_url: track_cover_url(t.cover_file_id, t.release_cover_file_id),
|
cover_url: track_cover_variant_url(
|
||||||
|
t.cover_file_id,
|
||||||
|
t.release_cover_file_id,
|
||||||
|
"medium",
|
||||||
|
),
|
||||||
stream_url: format!("/api/player/stream/{tid}"),
|
stream_url: format!("/api/player/stream/{tid}"),
|
||||||
uploader_name: t.uploader_name,
|
uploader_name: t.uploader_name,
|
||||||
audio_format: t.audio_format,
|
audio_format: t.audio_format,
|
||||||
@@ -1597,6 +1690,10 @@ async fn search_handler(
|
|||||||
audio_sample_rate: t.audio_sample_rate,
|
audio_sample_rate: t.audio_sample_rate,
|
||||||
audio_bit_depth: t.audio_bit_depth,
|
audio_bit_depth: t.audio_bit_depth,
|
||||||
file_size_bytes: t.file_size_bytes,
|
file_size_bytes: t.file_size_bytes,
|
||||||
|
lastfm_listeners: t.lastfm_listeners,
|
||||||
|
lastfm_playcount: t.lastfm_playcount,
|
||||||
|
lastfm_rating: t.lastfm_rating,
|
||||||
|
lastfm_updated_at: t.lastfm_updated_at,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
@@ -2055,7 +2152,7 @@ async fn followed_artists_handler(
|
|||||||
.map(|r| ArtistCard {
|
.map(|r| ArtistCard {
|
||||||
id: r.id,
|
id: r.id,
|
||||||
name: r.name,
|
name: r.name,
|
||||||
image_url: cover_url(r.image_file_id),
|
image_url: cover_variant_url(r.image_file_id, "small"),
|
||||||
release_count: r.release_count,
|
release_count: r.release_count,
|
||||||
track_count: r.track_count,
|
track_count: r.track_count,
|
||||||
})
|
})
|
||||||
@@ -2161,7 +2258,11 @@ async fn tracks_by_ids_handler(
|
|||||||
mf.audio_bitrate,
|
mf.audio_bitrate,
|
||||||
mf.audio_sample_rate,
|
mf.audio_sample_rate,
|
||||||
mf.audio_bit_depth,
|
mf.audio_bit_depth,
|
||||||
mf.file_size_bytes
|
mf.file_size_bytes,
|
||||||
|
t.lastfm_listeners,
|
||||||
|
t.lastfm_playcount,
|
||||||
|
t.lastfm_rating,
|
||||||
|
t.lastfm_updated_at
|
||||||
FROM furumusic__track t
|
FROM furumusic__track t
|
||||||
JOIN furumusic__release r ON r.id = t.release_id
|
JOIN furumusic__release r ON r.id = t.release_id
|
||||||
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
||||||
@@ -2228,7 +2329,11 @@ async fn tracks_by_ids_handler(
|
|||||||
artists: track_main_artists.remove(&tid).unwrap_or_default(),
|
artists: track_main_artists.remove(&tid).unwrap_or_default(),
|
||||||
featured_artists: track_feat_artists.remove(&tid).unwrap_or_default(),
|
featured_artists: track_feat_artists.remove(&tid).unwrap_or_default(),
|
||||||
release_year: t.release_year,
|
release_year: t.release_year,
|
||||||
cover_url: track_cover_url(t.cover_file_id, t.release_cover_file_id),
|
cover_url: track_cover_variant_url(
|
||||||
|
t.cover_file_id,
|
||||||
|
t.release_cover_file_id,
|
||||||
|
"medium",
|
||||||
|
),
|
||||||
stream_url: format!("/api/player/stream/{tid}"),
|
stream_url: format!("/api/player/stream/{tid}"),
|
||||||
uploader_name: t.uploader_name,
|
uploader_name: t.uploader_name,
|
||||||
audio_format: t.audio_format,
|
audio_format: t.audio_format,
|
||||||
@@ -2236,6 +2341,10 @@ async fn tracks_by_ids_handler(
|
|||||||
audio_sample_rate: t.audio_sample_rate,
|
audio_sample_rate: t.audio_sample_rate,
|
||||||
audio_bit_depth: t.audio_bit_depth,
|
audio_bit_depth: t.audio_bit_depth,
|
||||||
file_size_bytes: t.file_size_bytes,
|
file_size_bytes: t.file_size_bytes,
|
||||||
|
lastfm_listeners: t.lastfm_listeners,
|
||||||
|
lastfm_playcount: t.lastfm_playcount,
|
||||||
|
lastfm_rating: t.lastfm_rating,
|
||||||
|
lastfm_updated_at: t.lastfm_updated_at,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -2408,9 +2517,7 @@ impl App for PlayerApp {
|
|||||||
.await;
|
.await;
|
||||||
let service = torrent_service
|
let service = torrent_service
|
||||||
.get_or_init(|| async {
|
.get_or_init(|| async {
|
||||||
Arc::new(TorrentService::new(Arc::clone(
|
Arc::new(TorrentService::new(Arc::clone(&scheduler_handle)))
|
||||||
&scheduler_handle,
|
|
||||||
)))
|
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
match service.details(pg_pool, user.id, &path.0.id).await {
|
match service.details(pg_pool, user.id, &path.0.id).await {
|
||||||
@@ -2422,7 +2529,8 @@ impl App for PlayerApp {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.delete(move |session: Session, db: Database, path: Path<PathStringId>| {
|
.delete(
|
||||||
|
move |session: Session, db: Database, path: Path<PathStringId>| {
|
||||||
let pool = Arc::clone(&pool);
|
let pool = Arc::clone(&pool);
|
||||||
let pool_config = Arc::clone(&pool_config);
|
let pool_config = Arc::clone(&pool_config);
|
||||||
let torrent_service = Arc::clone(&torrent_service);
|
let torrent_service = Arc::clone(&torrent_service);
|
||||||
@@ -2449,13 +2557,16 @@ impl App for PlayerApp {
|
|||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
match service.remove(pg_pool, user.id, &path.0.id).await {
|
match service.remove(pg_pool, user.id, &path.0.id).await {
|
||||||
Ok(()) => Json(serde_json::json!({ "ok": true })).into_response(),
|
Ok(()) => {
|
||||||
|
Json(serde_json::json!({ "ok": true })).into_response()
|
||||||
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
Ok(json_error(StatusCode::NOT_FOUND, &err.to_string()))
|
Ok(json_error(StatusCode::NOT_FOUND, &err.to_string()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
},
|
||||||
|
)
|
||||||
},
|
},
|
||||||
"player_torrent_detail",
|
"player_torrent_detail",
|
||||||
),
|
),
|
||||||
@@ -2594,7 +2705,8 @@ impl App for PlayerApp {
|
|||||||
let pool_config = Arc::clone(&pool_config);
|
let pool_config = Arc::clone(&pool_config);
|
||||||
let torrent_service = Arc::clone(&torrent_service);
|
let torrent_service = Arc::clone(&torrent_service);
|
||||||
let scheduler_handle = Arc::clone(&self.scheduler_handle);
|
let scheduler_handle = Arc::clone(&self.scheduler_handle);
|
||||||
post(move |session: Session, db: Database, path: Path<PathStringId>| {
|
post(
|
||||||
|
move |session: Session, db: Database, path: Path<PathStringId>| {
|
||||||
let pool = Arc::clone(&pool);
|
let pool = Arc::clone(&pool);
|
||||||
let pool_config = Arc::clone(&pool_config);
|
let pool_config = Arc::clone(&pool_config);
|
||||||
let torrent_service = Arc::clone(&torrent_service);
|
let torrent_service = Arc::clone(&torrent_service);
|
||||||
@@ -2627,7 +2739,8 @@ impl App for PlayerApp {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
},
|
||||||
|
)
|
||||||
},
|
},
|
||||||
"player_torrent_pause",
|
"player_torrent_pause",
|
||||||
),
|
),
|
||||||
@@ -3076,6 +3189,34 @@ impl App for PlayerApp {
|
|||||||
"player_stream",
|
"player_stream",
|
||||||
),
|
),
|
||||||
// -- Cover art --
|
// -- Cover art --
|
||||||
|
Route::with_handler_and_name(
|
||||||
|
"/cover/{media_file_id}/{variant}",
|
||||||
|
{
|
||||||
|
let pool = Arc::clone(&pool);
|
||||||
|
let pool_config = Arc::clone(&pool_config);
|
||||||
|
let config = Arc::clone(&self.config);
|
||||||
|
get(
|
||||||
|
move |session: Session, db: Database, path: Path<PathMediaFileVariant>| {
|
||||||
|
let pool = Arc::clone(&pool);
|
||||||
|
let pool_config = Arc::clone(&pool_config);
|
||||||
|
let config = Arc::clone(&config);
|
||||||
|
async move {
|
||||||
|
let pg_pool = pool
|
||||||
|
.get_or_init(|| async {
|
||||||
|
sqlx::postgres::PgPoolOptions::new()
|
||||||
|
.max_connections(5)
|
||||||
|
.connect(&pool_config.database_url)
|
||||||
|
.await
|
||||||
|
.expect("player pool")
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
cover_variant_handler(session, db, pg_pool, &config, path).await
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
},
|
||||||
|
"player_cover_variant",
|
||||||
|
),
|
||||||
Route::with_handler_and_name(
|
Route::with_handler_and_name(
|
||||||
"/cover/{media_file_id}",
|
"/cover/{media_file_id}",
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -70,3 +70,9 @@ pub(super) struct PathTrackId {
|
|||||||
pub(super) struct PathMediaFileId {
|
pub(super) struct PathMediaFileId {
|
||||||
pub(super) media_file_id: i64,
|
pub(super) media_file_id: i64,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub(super) struct PathMediaFileVariant {
|
||||||
|
pub(super) media_file_id: i64,
|
||||||
|
pub(super) variant: String,
|
||||||
|
}
|
||||||
|
|||||||
@@ -44,6 +44,10 @@ pub(super) struct TrackRow {
|
|||||||
pub(super) audio_sample_rate: Option<i32>,
|
pub(super) audio_sample_rate: Option<i32>,
|
||||||
pub(super) audio_bit_depth: Option<i32>,
|
pub(super) audio_bit_depth: Option<i32>,
|
||||||
pub(super) file_size_bytes: Option<i64>,
|
pub(super) file_size_bytes: Option<i64>,
|
||||||
|
pub(super) lastfm_listeners: Option<i64>,
|
||||||
|
pub(super) lastfm_playcount: Option<i64>,
|
||||||
|
pub(super) lastfm_rating: Option<f64>,
|
||||||
|
pub(super) lastfm_updated_at: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(sqlx::FromRow)]
|
#[derive(sqlx::FromRow)]
|
||||||
@@ -110,6 +114,10 @@ pub(super) struct PlaylistTrackRow {
|
|||||||
pub(super) audio_sample_rate: Option<i32>,
|
pub(super) audio_sample_rate: Option<i32>,
|
||||||
pub(super) audio_bit_depth: Option<i32>,
|
pub(super) audio_bit_depth: Option<i32>,
|
||||||
pub(super) file_size_bytes: Option<i64>,
|
pub(super) file_size_bytes: Option<i64>,
|
||||||
|
pub(super) lastfm_listeners: Option<i64>,
|
||||||
|
pub(super) lastfm_playcount: Option<i64>,
|
||||||
|
pub(super) lastfm_rating: Option<f64>,
|
||||||
|
pub(super) lastfm_updated_at: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(sqlx::FromRow)]
|
#[derive(sqlx::FromRow)]
|
||||||
@@ -128,6 +136,10 @@ pub(super) struct AppearanceTrackRow {
|
|||||||
pub(super) audio_sample_rate: Option<i32>,
|
pub(super) audio_sample_rate: Option<i32>,
|
||||||
pub(super) audio_bit_depth: Option<i32>,
|
pub(super) audio_bit_depth: Option<i32>,
|
||||||
pub(super) file_size_bytes: Option<i64>,
|
pub(super) file_size_bytes: Option<i64>,
|
||||||
|
pub(super) lastfm_listeners: Option<i64>,
|
||||||
|
pub(super) lastfm_playcount: Option<i64>,
|
||||||
|
pub(super) lastfm_rating: Option<f64>,
|
||||||
|
pub(super) lastfm_updated_at: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(sqlx::FromRow)]
|
#[derive(sqlx::FromRow)]
|
||||||
@@ -165,6 +177,10 @@ pub(super) struct SearchTrackRow {
|
|||||||
pub(super) audio_sample_rate: Option<i32>,
|
pub(super) audio_sample_rate: Option<i32>,
|
||||||
pub(super) audio_bit_depth: Option<i32>,
|
pub(super) audio_bit_depth: Option<i32>,
|
||||||
pub(super) file_size_bytes: Option<i64>,
|
pub(super) file_size_bytes: Option<i64>,
|
||||||
|
pub(super) lastfm_listeners: Option<i64>,
|
||||||
|
pub(super) lastfm_playcount: Option<i64>,
|
||||||
|
pub(super) lastfm_rating: Option<f64>,
|
||||||
|
pub(super) lastfm_updated_at: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(sqlx::FromRow)]
|
#[derive(sqlx::FromRow)]
|
||||||
|
|||||||
@@ -1347,7 +1347,7 @@ async fn run_scheduled_job(
|
|||||||
|
|
||||||
// Check agent_enabled (re-read from DB every run)
|
// Check agent_enabled (re-read from DB every run)
|
||||||
let (live_config, _) = AppConfig::load_with_db(db).await;
|
let (live_config, _) = AppConfig::load_with_db(db).await;
|
||||||
if !live_config.agent_enabled {
|
if !live_config.agent_enabled && job_name != "lastfm_popularity" {
|
||||||
tracing::warn!(job = job_name, "Skipping: agent_enabled=false");
|
tracing::warn!(job = job_name, "Skipping: agent_enabled=false");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-4
@@ -746,9 +746,8 @@ impl TorrentService {
|
|||||||
self.stop_torrent(&handle).await;
|
self.stop_torrent(&handle).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
let result = sqlx::query(
|
let result =
|
||||||
"DELETE FROM furumusic__torrent_session WHERE id = $1 AND user_id = $2",
|
sqlx::query("DELETE FROM furumusic__torrent_session WHERE id = $1 AND user_id = $2")
|
||||||
)
|
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.bind(user_id)
|
.bind(user_id)
|
||||||
.execute(pool)
|
.execute(pool)
|
||||||
@@ -784,7 +783,12 @@ impl TorrentService {
|
|||||||
if job.user_id != uploader_user_id {
|
if job.user_id != uploader_user_id {
|
||||||
bail!("torrent job not found");
|
bail!("torrent job not found");
|
||||||
}
|
}
|
||||||
if job.handle.is_some() && matches!(job.status, TorrentJobStatus::Downloading | TorrentJobStatus::Moving) {
|
if job.handle.is_some()
|
||||||
|
&& matches!(
|
||||||
|
job.status,
|
||||||
|
TorrentJobStatus::Downloading | TorrentJobStatus::Moving
|
||||||
|
)
|
||||||
|
{
|
||||||
bail!("torrent job is already running");
|
bail!("torrent job is already running");
|
||||||
}
|
}
|
||||||
validate_selection(&job.files, &selected_files)?;
|
validate_selection(&job.files, &selected_files)?;
|
||||||
|
|||||||
+618
-12
@@ -667,6 +667,161 @@ tbody tr:hover {
|
|||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.settings-page {
|
||||||
|
max-width: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-layout {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(620px, 1fr) minmax(360px, 440px);
|
||||||
|
gap: 14px;
|
||||||
|
align-items: start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-column {
|
||||||
|
display: grid;
|
||||||
|
gap: 14px;
|
||||||
|
align-content: start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-side .settings-grid {
|
||||||
|
grid-template-columns: minmax(0, 1fr);
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-actions {
|
||||||
|
grid-column: 1 / -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
gap: 10px;
|
||||||
|
padding: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-card {
|
||||||
|
padding: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-field {
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-field label,
|
||||||
|
.setting-toggle label {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 8px;
|
||||||
|
margin-bottom: 6px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 800;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-field input {
|
||||||
|
width: 100%;
|
||||||
|
height: 34px;
|
||||||
|
padding: 0 10px;
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: 6px;
|
||||||
|
background: var(--bg-primary);
|
||||||
|
color: var(--text-primary);
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-field input:focus {
|
||||||
|
border-color: var(--accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-toggle {
|
||||||
|
min-height: 74px;
|
||||||
|
padding: 12px;
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: 8px;
|
||||||
|
background: var(--bg-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-toggle-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-toggle-row span {
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 800;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-toggle input {
|
||||||
|
width: 18px;
|
||||||
|
height: 18px;
|
||||||
|
accent-color: var(--accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-help {
|
||||||
|
margin-top: 6px;
|
||||||
|
color: var(--text-subdued);
|
||||||
|
font-size: 11px;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.source-pill {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
height: 18px;
|
||||||
|
padding: 0 6px;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
color: var(--text-subdued);
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: 850;
|
||||||
|
text-transform: lowercase;
|
||||||
|
}
|
||||||
|
|
||||||
|
.source-pill.env { background: rgba(90, 167, 255, 0.16); color: #9ccbff; }
|
||||||
|
.source-pill.database { background: rgba(29, 185, 84, 0.16); color: #8ef0b2; }
|
||||||
|
.source-pill.default { background: rgba(255, 255, 255, 0.08); color: var(--text-subdued); }
|
||||||
|
|
||||||
|
.settings-wide {
|
||||||
|
grid-column: 1 / -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-note {
|
||||||
|
padding: 14px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.55;
|
||||||
|
}
|
||||||
|
|
||||||
|
.probe-body {
|
||||||
|
padding: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.probe-intro {
|
||||||
|
margin: 0 0 12px;
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 1.45;
|
||||||
|
}
|
||||||
|
|
||||||
|
.probe-table {
|
||||||
|
display: grid;
|
||||||
|
gap: 7px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.probe-row {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.library-row {
|
.library-row {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: 38px minmax(0, 1fr) 300px 130px;
|
grid-template-columns: 38px minmax(0, 1fr) 300px 130px;
|
||||||
@@ -799,40 +954,45 @@ tbody tr:hover {
|
|||||||
|
|
||||||
<div class="nav-group">
|
<div class="nav-group">
|
||||||
<div class="nav-label">Operations</div>
|
<div class="nav-label">Operations</div>
|
||||||
<button class="nav-btn" :class="{active: activeView === 'reviews'}" @click="activeView = 'reviews'">
|
<button class="nav-btn" :class="{active: activeView === 'reviews'}" @click="openReviews()">
|
||||||
<i data-lucide="inbox"></i>
|
<i data-lucide="inbox"></i>
|
||||||
<span>Review Queue</span>
|
<span>Review Queue</span>
|
||||||
<span class="nav-count" x-text="reviews.total || 0"></span>
|
<span class="nav-count" x-text="reviews.total || 0"></span>
|
||||||
</button>
|
</button>
|
||||||
<button class="nav-btn" :class="{active: activeView === 'jobs'}" @click="activeView = 'jobs'; loadJobs()">
|
<button class="nav-btn" :class="{active: activeView === 'jobs'}" @click="openJobs()">
|
||||||
<i data-lucide="calendar-clock"></i>
|
<i data-lucide="calendar-clock"></i>
|
||||||
<span>Tasks</span>
|
<span>Tasks</span>
|
||||||
<span class="nav-count" x-text="jobs.length || 0"></span>
|
<span class="nav-count" x-text="jobs.length || 0"></span>
|
||||||
</button>
|
</button>
|
||||||
<button class="nav-btn" :class="{active: activeView === 'library'}" @click="activeView = 'library'; loadLibrary()">
|
<button class="nav-btn" :class="{active: activeView === 'library'}" @click="openLibrary(libraryKind)">
|
||||||
<i data-lucide="library"></i>
|
<i data-lucide="library"></i>
|
||||||
<span>Library Workbench</span>
|
<span>Library Workbench</span>
|
||||||
<span class="nav-count" x-text="fmt(stats.tracks || 0)"></span>
|
<span class="nav-count" x-text="fmt(stats.tracks || 0)"></span>
|
||||||
</button>
|
</button>
|
||||||
<button class="nav-btn" :class="{active: activeView === 'tools'}" @click="activeView = 'tools'">
|
<button class="nav-btn" :class="{active: activeView === 'tools'}" @click="openTools()">
|
||||||
<i data-lucide="wrench"></i>
|
<i data-lucide="wrench"></i>
|
||||||
<span>Future Tools</span>
|
<span>Future Tools</span>
|
||||||
</button>
|
</button>
|
||||||
|
<button class="nav-btn" :class="{active: activeView === 'settings'}" @click="openSettings()">
|
||||||
|
<i data-lucide="settings"></i>
|
||||||
|
<span>Settings</span>
|
||||||
|
<span class="nav-count" x-text="settings.lastfm_api_key_configured ? 'ok' : ''"></span>
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="nav-group">
|
<div class="nav-group">
|
||||||
<div class="nav-label">Entities</div>
|
<div class="nav-label">Entities</div>
|
||||||
<button class="nav-btn" @click="activeView = 'library'; libraryKind = 'artists'; loadLibrary()">
|
<button class="nav-btn" @click="openLibrary('artists')">
|
||||||
<i data-lucide="mic-2"></i>
|
<i data-lucide="mic-2"></i>
|
||||||
<span>Artists</span>
|
<span>Artists</span>
|
||||||
<span class="nav-count" x-text="fmt(libraryOverview.artists || 0)"></span>
|
<span class="nav-count" x-text="fmt(libraryOverview.artists || 0)"></span>
|
||||||
</button>
|
</button>
|
||||||
<button class="nav-btn" @click="activeView = 'library'; libraryKind = 'releases'; loadLibrary()">
|
<button class="nav-btn" @click="openLibrary('releases')">
|
||||||
<i data-lucide="disc-3"></i>
|
<i data-lucide="disc-3"></i>
|
||||||
<span>Releases</span>
|
<span>Releases</span>
|
||||||
<span class="nav-count" x-text="fmt(libraryOverview.releases || 0)"></span>
|
<span class="nav-count" x-text="fmt(libraryOverview.releases || 0)"></span>
|
||||||
</button>
|
</button>
|
||||||
<button class="nav-btn" @click="activeView = 'library'; libraryKind = 'playlists'; loadLibrary()">
|
<button class="nav-btn" @click="openLibrary('playlists')">
|
||||||
<i data-lucide="list-music"></i>
|
<i data-lucide="list-music"></i>
|
||||||
<span>Playlists</span>
|
<span>Playlists</span>
|
||||||
<span class="nav-count" x-text="fmt(libraryOverview.playlists || 0)"></span>
|
<span class="nav-count" x-text="fmt(libraryOverview.playlists || 0)"></span>
|
||||||
@@ -1130,9 +1290,9 @@ tbody tr:hover {
|
|||||||
</div>
|
</div>
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<div class="segmented">
|
<div class="segmented">
|
||||||
<button class="seg-btn" :class="{active: libraryKind === 'artists'}" @click="libraryKind = 'artists'; loadLibrary()">Artists</button>
|
<button class="seg-btn" :class="{active: libraryKind === 'artists'}" @click="openLibrary('artists')">Artists</button>
|
||||||
<button class="seg-btn" :class="{active: libraryKind === 'releases'}" @click="libraryKind = 'releases'; loadLibrary()">Releases</button>
|
<button class="seg-btn" :class="{active: libraryKind === 'releases'}" @click="openLibrary('releases')">Releases</button>
|
||||||
<button class="seg-btn" :class="{active: libraryKind === 'playlists'}" @click="libraryKind = 'playlists'; loadLibrary()">Playlists</button>
|
<button class="seg-btn" :class="{active: libraryKind === 'playlists'}" @click="openLibrary('playlists')">Playlists</button>
|
||||||
</div>
|
</div>
|
||||||
<input class="search" placeholder="Search library" x-model="librarySearch" @input.debounce.350ms="loadLibrary()" />
|
<input class="search" placeholder="Search library" x-model="librarySearch" @input.debounce.350ms="loadLibrary()" />
|
||||||
</div>
|
</div>
|
||||||
@@ -1236,6 +1396,253 @@ tbody tr:hover {
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="content" x-show="activeView === 'settings'">
|
||||||
|
<div class="settings-page">
|
||||||
|
<form class="settings-layout" @submit.prevent="saveSettings()">
|
||||||
|
<div class="settings-column">
|
||||||
|
<section class="panel">
|
||||||
|
<div class="panel-head">
|
||||||
|
<div class="panel-title">
|
||||||
|
<strong>OIDC</strong>
|
||||||
|
<span>Identity provider and group mapping</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="settings-grid">
|
||||||
|
<div class="setting-field settings-wide">
|
||||||
|
<label>Callback URL</label>
|
||||||
|
<input readonly :value="callbackUrl()" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>SSO button text</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('oidc_button_text')" x-text="settingSource('oidc_button_text')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.oidc_button_text" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>Issuer URL</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('oidc_issuer')" x-text="settingSource('oidc_issuer')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.oidc_issuer" placeholder="https://accounts.google.com" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>Client ID</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('oidc_client_id')" x-text="settingSource('oidc_client_id')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.oidc_client_id" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>Client secret</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('oidc_client_secret')" x-text="settingSource('oidc_client_secret')"></span>
|
||||||
|
</label>
|
||||||
|
<input type="password" x-model="settingsDraft.oidc_client_secret" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>Admin groups</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('oidc_admin_groups')" x-text="settingSource('oidc_admin_groups')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.oidc_admin_groups" placeholder="/admin,/furumusic-admins" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>User groups</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('oidc_user_groups')" x-text="settingSource('oidc_user_groups')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.oidc_user_groups" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="panel">
|
||||||
|
<div class="panel-head">
|
||||||
|
<div class="panel-title">
|
||||||
|
<strong>Agent</strong>
|
||||||
|
<span>AI processing directories, LLM endpoint, and execution limits</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="settings-grid">
|
||||||
|
<div class="setting-toggle">
|
||||||
|
<label>
|
||||||
|
<span>Agent enabled</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('agent_enabled')" x-text="settingSource('agent_enabled')"></span>
|
||||||
|
</label>
|
||||||
|
<div class="setting-toggle-row">
|
||||||
|
<span x-text="settingsDraft.agent_enabled ? 'Enabled' : 'Disabled'"></span>
|
||||||
|
<input type="checkbox" x-model="settingsDraft.agent_enabled" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>Concurrency</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('agent_concurrency')" x-text="settingSource('agent_concurrency')"></span>
|
||||||
|
</label>
|
||||||
|
<input type="number" min="1" max="32" x-model="settingsDraft.agent_concurrency" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field settings-wide">
|
||||||
|
<label>
|
||||||
|
<span>Inbox directory</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('agent_inbox_dir')" x-text="settingSource('agent_inbox_dir')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.agent_inbox_dir" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field settings-wide">
|
||||||
|
<label>
|
||||||
|
<span>Storage directory</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('agent_storage_dir')" x-text="settingSource('agent_storage_dir')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.agent_storage_dir" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field settings-wide">
|
||||||
|
<label>
|
||||||
|
<span>LLM API URL</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('agent_llm_url')" x-text="settingSource('agent_llm_url')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.agent_llm_url" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>LLM model</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('agent_llm_model')" x-text="settingSource('agent_llm_model')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.agent_llm_model" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>LLM auth header</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('agent_llm_auth')" x-text="settingSource('agent_llm_auth')"></span>
|
||||||
|
</label>
|
||||||
|
<input type="password" x-model="settingsDraft.agent_llm_auth" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>Confidence threshold</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('agent_confidence_threshold')" x-text="settingSource('agent_confidence_threshold')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.agent_confidence_threshold" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>Context limit</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('agent_context_limit')" x-text="settingSource('agent_context_limit')"></span>
|
||||||
|
</label>
|
||||||
|
<input x-model="settingsDraft.agent_context_limit" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="settings-column settings-side">
|
||||||
|
<section class="panel">
|
||||||
|
<div class="panel-head">
|
||||||
|
<div class="panel-title">
|
||||||
|
<strong>Authentication</strong>
|
||||||
|
<span>Password and SSO access switches</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="settings-grid">
|
||||||
|
<div class="setting-toggle">
|
||||||
|
<label>
|
||||||
|
<span>Password login</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('auth_password_enabled')" x-text="settingSource('auth_password_enabled')"></span>
|
||||||
|
</label>
|
||||||
|
<div class="setting-toggle-row">
|
||||||
|
<span x-text="settingsDraft.auth_password_enabled ? 'Enabled' : 'Disabled'"></span>
|
||||||
|
<input type="checkbox" x-model="settingsDraft.auth_password_enabled" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="setting-toggle">
|
||||||
|
<label>
|
||||||
|
<span>SSO login</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('auth_sso_enabled')" x-text="settingSource('auth_sso_enabled')"></span>
|
||||||
|
</label>
|
||||||
|
<div class="setting-toggle-row">
|
||||||
|
<span x-text="settingsDraft.auth_sso_enabled ? 'Enabled' : 'Disabled'"></span>
|
||||||
|
<input type="checkbox" x-model="settingsDraft.auth_sso_enabled" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="panel">
|
||||||
|
<div class="panel-head">
|
||||||
|
<div class="panel-title">
|
||||||
|
<strong>API</strong>
|
||||||
|
<span>Developer and enrichment integrations</span>
|
||||||
|
</div>
|
||||||
|
<span class="badge" :class="settings.lastfm_api_key_configured ? 'ok' : 'disabled'" x-text="settings.lastfm_api_key_configured ? 'Last.fm configured' : 'Last.fm missing'"></span>
|
||||||
|
</div>
|
||||||
|
<div class="settings-grid">
|
||||||
|
<div class="setting-toggle">
|
||||||
|
<label>
|
||||||
|
<span>Swagger UI</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('swagger_enabled')" x-text="settingSource('swagger_enabled')"></span>
|
||||||
|
</label>
|
||||||
|
<div class="setting-toggle-row">
|
||||||
|
<span x-text="settingsDraft.swagger_enabled ? 'Enabled' : 'Disabled'"></span>
|
||||||
|
<input type="checkbox" x-model="settingsDraft.swagger_enabled" />
|
||||||
|
</div>
|
||||||
|
<div class="setting-help">Interactive API docs at /swagger/ after restart.</div>
|
||||||
|
</div>
|
||||||
|
<div class="setting-field">
|
||||||
|
<label>
|
||||||
|
<span>Last.fm API key</span>
|
||||||
|
<span class="source-pill" :class="sourceClass('lastfm_api_key')" x-text="settingSource('lastfm_api_key')"></span>
|
||||||
|
</label>
|
||||||
|
<input type="password" x-model="settingsDraft.lastfm_api_key" autocomplete="off" />
|
||||||
|
<div class="setting-help">Used by the weekly Last.fm popularity task.</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="panel">
|
||||||
|
<div class="panel-head">
|
||||||
|
<div class="panel-title">
|
||||||
|
<strong>Agent Status</strong>
|
||||||
|
<span x-text="settingsProbeSubtitle()"></span>
|
||||||
|
</div>
|
||||||
|
<span class="badge" :class="settingsProbeBadge()" x-text="settingsProbe.status || 'idle'"></span>
|
||||||
|
</div>
|
||||||
|
<div class="probe-body">
|
||||||
|
<p class="probe-intro" x-show="settingsProbe.model_intro" x-text="settingsProbe.model_intro"></p>
|
||||||
|
<p class="probe-intro muted" x-show="!settingsProbe.model_intro" x-text="settingsProbeText()"></p>
|
||||||
|
<div class="probe-table" x-show="settingsProbe.ok">
|
||||||
|
<div class="probe-row"><span>Model</span><strong x-text="settingsProbe.model_name || 'unknown'"></strong></div>
|
||||||
|
<div class="probe-row"><span>Latency</span><strong x-text="settingsProbe.latency_ms + ' ms'"></strong></div>
|
||||||
|
<div class="probe-row"><span>Prompt tokens</span><strong x-text="settingsProbe.prompt_tokens ?? '-'"></strong></div>
|
||||||
|
<div class="probe-row"><span>Completion tokens</span><strong x-text="settingsProbe.completion_tokens ?? '-'"></strong></div>
|
||||||
|
<div class="probe-row"><span>Tokens/sec</span><strong x-text="settingsProbe.tokens_per_sec != null ? settingsProbe.tokens_per_sec.toFixed(1) : '-'"></strong></div>
|
||||||
|
</div>
|
||||||
|
<div class="toolbar" style="margin-top:14px">
|
||||||
|
<button class="btn" type="button" @click="loadSettingsProbe()" :disabled="settingsProbeLoading">
|
||||||
|
<i data-lucide="activity"></i>
|
||||||
|
Test agent
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="action-strip settings-actions">
|
||||||
|
<span class="selection-summary">Settings are stored as database overrides unless an environment variable wins.</span>
|
||||||
|
<div class="toolbar">
|
||||||
|
<button class="btn" type="button" @click="loadSettings()">
|
||||||
|
<i data-lucide="refresh-cw"></i>
|
||||||
|
Reload
|
||||||
|
</button>
|
||||||
|
<button class="btn primary" type="submit" :disabled="settingsSaving">
|
||||||
|
<i :data-lucide="settingsSaving ? 'loader-circle' : 'save'"></i>
|
||||||
|
<span x-text="settingsSaving ? 'Saving...' : 'Save settings'"></span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<div class="modal-backdrop" x-show="reviewModalOpen && activeReview" x-transition @click.self="reviewModalOpen = false">
|
<div class="modal-backdrop" x-show="reviewModalOpen && activeReview" x-transition @click.self="reviewModalOpen = false">
|
||||||
@@ -1366,10 +1773,43 @@ function adminV2() {
|
|||||||
activeLibraryItem: null,
|
activeLibraryItem: null,
|
||||||
editorOpen: false,
|
editorOpen: false,
|
||||||
editorDraft: { title: '', hidden: 'false' },
|
editorDraft: { title: '', hidden: 'false' },
|
||||||
|
settings: { values: {}, sources: {}, lastfm_api_key_configured: false },
|
||||||
|
settingsDraft: {
|
||||||
|
auth_password_enabled: false,
|
||||||
|
auth_sso_enabled: false,
|
||||||
|
oidc_button_text: '',
|
||||||
|
oidc_issuer: '',
|
||||||
|
oidc_client_id: '',
|
||||||
|
oidc_client_secret: '',
|
||||||
|
oidc_admin_groups: '',
|
||||||
|
oidc_user_groups: '',
|
||||||
|
swagger_enabled: false,
|
||||||
|
lastfm_api_key: '',
|
||||||
|
agent_enabled: false,
|
||||||
|
agent_inbox_dir: '',
|
||||||
|
agent_storage_dir: '',
|
||||||
|
agent_llm_url: '',
|
||||||
|
agent_llm_model: '',
|
||||||
|
agent_llm_auth: '',
|
||||||
|
agent_confidence_threshold: '',
|
||||||
|
agent_context_limit: '',
|
||||||
|
agent_concurrency: ''
|
||||||
|
},
|
||||||
|
settingsProbe: { status: 'idle', ok: false },
|
||||||
|
settingsProbeLoading: false,
|
||||||
|
settingsSaving: false,
|
||||||
|
routeReady: false,
|
||||||
poller: null,
|
poller: null,
|
||||||
|
|
||||||
async init() {
|
async init() {
|
||||||
|
this.applyRouteFromHash();
|
||||||
await this.refreshAll();
|
await this.refreshAll();
|
||||||
|
this.routeReady = true;
|
||||||
|
this.activateCurrentView(false);
|
||||||
|
window.addEventListener('hashchange', () => {
|
||||||
|
this.applyRouteFromHash();
|
||||||
|
this.activateCurrentView(false);
|
||||||
|
});
|
||||||
this.poller = setInterval(() => this.poll(), 6000);
|
this.poller = setInterval(() => this.poll(), 6000);
|
||||||
this.icons();
|
this.icons();
|
||||||
},
|
},
|
||||||
@@ -1399,6 +1839,7 @@ function adminV2() {
|
|||||||
this.jobs = data.jobs || [];
|
this.jobs = data.jobs || [];
|
||||||
this.recentRuns = data.recent_runs || [];
|
this.recentRuns = data.recent_runs || [];
|
||||||
if (!this.activeJobName && this.jobs.length) this.activeJobName = this.jobs[0].name;
|
if (!this.activeJobName && this.jobs.length) this.activeJobName = this.jobs[0].name;
|
||||||
|
await this.loadSettings(false);
|
||||||
await this.loadLibrary(false);
|
await this.loadLibrary(false);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.showToast(error.message);
|
this.showToast(error.message);
|
||||||
@@ -1413,6 +1854,84 @@ function adminV2() {
|
|||||||
await Promise.allSettled([this.loadJobs(false), this.loadReviews(false)]);
|
await Promise.allSettled([this.loadJobs(false), this.loadReviews(false)]);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
applyRouteFromHash() {
|
||||||
|
const raw = (window.location.hash || '#reviews').replace(/^#\/?/, '');
|
||||||
|
const parts = raw.split('/').filter(Boolean);
|
||||||
|
const view = parts[0] || 'reviews';
|
||||||
|
if (view === 'reviews') {
|
||||||
|
this.activeView = 'reviews';
|
||||||
|
this.reviewFilter.status = parts[1] || null;
|
||||||
|
} else if (view === 'jobs') {
|
||||||
|
this.activeView = 'jobs';
|
||||||
|
if (parts[1]) this.activeJobName = decodeURIComponent(parts[1]);
|
||||||
|
} else if (view === 'library') {
|
||||||
|
this.activeView = 'library';
|
||||||
|
this.libraryKind = ['artists', 'releases', 'playlists'].includes(parts[1]) ? parts[1] : 'artists';
|
||||||
|
} else if (view === 'settings') {
|
||||||
|
this.activeView = 'settings';
|
||||||
|
} else if (view === 'tools') {
|
||||||
|
this.activeView = 'tools';
|
||||||
|
} else {
|
||||||
|
this.activeView = 'reviews';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
setRoute(path) {
|
||||||
|
if (!path.startsWith('#')) path = '#' + path;
|
||||||
|
if (window.location.hash !== path) {
|
||||||
|
window.history.pushState(null, '', path);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async activateCurrentView(updateRoute = true) {
|
||||||
|
if (this.activeView === 'reviews') {
|
||||||
|
if (updateRoute) this.setRoute(this.reviewFilter.status ? `#reviews/${this.reviewFilter.status}` : '#reviews');
|
||||||
|
await this.loadReviews(false);
|
||||||
|
} else if (this.activeView === 'jobs') {
|
||||||
|
if (updateRoute) this.setRoute(this.activeJobName ? `#jobs/${encodeURIComponent(this.activeJobName)}` : '#jobs');
|
||||||
|
await this.loadJobs();
|
||||||
|
if (this.activeJobName) await this.loadRunsForJob(this.activeJobName);
|
||||||
|
} else if (this.activeView === 'library') {
|
||||||
|
if (updateRoute) this.setRoute(`#library/${this.libraryKind}`);
|
||||||
|
await this.loadLibrary(false);
|
||||||
|
} else if (this.activeView === 'settings') {
|
||||||
|
if (updateRoute) this.setRoute('#settings');
|
||||||
|
await this.loadSettings();
|
||||||
|
if (!this.settingsProbe.status || this.settingsProbe.status === 'idle') {
|
||||||
|
await this.loadSettingsProbe(false);
|
||||||
|
}
|
||||||
|
} else if (this.activeView === 'tools' && updateRoute) {
|
||||||
|
this.setRoute('#tools');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
openReviews(status = null) {
|
||||||
|
this.activeView = 'reviews';
|
||||||
|
this.reviewFilter.status = status;
|
||||||
|
this.setRoute(status ? `#reviews/${status}` : '#reviews');
|
||||||
|
this.loadReviews();
|
||||||
|
},
|
||||||
|
|
||||||
|
openJobs(name = this.activeJobName) {
|
||||||
|
this.activeView = 'jobs';
|
||||||
|
if (name) this.activeJobName = name;
|
||||||
|
this.setRoute(this.activeJobName ? `#jobs/${encodeURIComponent(this.activeJobName)}` : '#jobs');
|
||||||
|
this.loadJobs();
|
||||||
|
if (this.activeJobName) this.loadRunsForJob(this.activeJobName);
|
||||||
|
},
|
||||||
|
|
||||||
|
openLibrary(kind = this.libraryKind) {
|
||||||
|
this.activeView = 'library';
|
||||||
|
this.libraryKind = ['artists', 'releases', 'playlists'].includes(kind) ? kind : 'artists';
|
||||||
|
this.setRoute(`#library/${this.libraryKind}`);
|
||||||
|
this.loadLibrary();
|
||||||
|
},
|
||||||
|
|
||||||
|
openTools() {
|
||||||
|
this.activeView = 'tools';
|
||||||
|
this.setRoute('#tools');
|
||||||
|
},
|
||||||
|
|
||||||
async loadReviews(resetOffset = true) {
|
async loadReviews(resetOffset = true) {
|
||||||
if (resetOffset) this.reviews.offset = 0;
|
if (resetOffset) this.reviews.offset = 0;
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
@@ -1462,9 +1981,93 @@ function adminV2() {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
async loadSettings(showErrors = true) {
|
||||||
|
try {
|
||||||
|
this.settings = await this.request(`${this.apiBase}/settings`);
|
||||||
|
this.settingsDraft = Object.assign({}, this.settingsDraft, this.settings.values || {});
|
||||||
|
} catch (error) {
|
||||||
|
if (showErrors) this.showToast(error.message);
|
||||||
|
} finally {
|
||||||
|
this.icons();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async saveSettings() {
|
||||||
|
if (this.settingsSaving) return;
|
||||||
|
this.settingsSaving = true;
|
||||||
|
try {
|
||||||
|
await this.request(`${this.apiBase}/settings`, {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify(this.settingsDraft)
|
||||||
|
});
|
||||||
|
await this.loadSettings(false);
|
||||||
|
this.showToast('Settings saved');
|
||||||
|
} catch (error) {
|
||||||
|
this.showToast(error.message);
|
||||||
|
} finally {
|
||||||
|
this.settingsSaving = false;
|
||||||
|
this.icons();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async openSettings() {
|
||||||
|
this.activeView = 'settings';
|
||||||
|
this.setRoute('#settings');
|
||||||
|
await this.loadSettings();
|
||||||
|
if (!this.settingsProbe.status || this.settingsProbe.status === 'idle') {
|
||||||
|
await this.loadSettingsProbe(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async loadSettingsProbe(showErrors = true) {
|
||||||
|
this.settingsProbeLoading = true;
|
||||||
|
try {
|
||||||
|
this.settingsProbe = await this.request(`${this.apiBase}/settings/probe`);
|
||||||
|
} catch (error) {
|
||||||
|
this.settingsProbe = { status: 'error', ok: false, error: error.message };
|
||||||
|
if (showErrors) this.showToast(error.message);
|
||||||
|
} finally {
|
||||||
|
this.settingsProbeLoading = false;
|
||||||
|
this.icons();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
settingSource(key) {
|
||||||
|
return (this.settings.sources || {})[key] || 'default';
|
||||||
|
},
|
||||||
|
|
||||||
|
sourceClass(key) {
|
||||||
|
return this.settingSource(key);
|
||||||
|
},
|
||||||
|
|
||||||
|
callbackUrl() {
|
||||||
|
return `${window.location.origin}/auth/oidc/callback`;
|
||||||
|
},
|
||||||
|
|
||||||
|
settingsProbeBadge() {
|
||||||
|
if (this.settingsProbeLoading) return 'running';
|
||||||
|
if (this.settingsProbe.status === 'ok') return 'ok';
|
||||||
|
if (this.settingsProbe.status === 'error') return 'failed';
|
||||||
|
return 'disabled';
|
||||||
|
},
|
||||||
|
|
||||||
|
settingsProbeSubtitle() {
|
||||||
|
if (this.settingsProbeLoading) return 'Checking LLM connection';
|
||||||
|
if (this.settingsProbe.status === 'ok') return 'LLM connection OK';
|
||||||
|
if (this.settingsProbe.status === 'error') return 'LLM connection error';
|
||||||
|
if (this.settingsProbe.status === 'disabled') return 'Agent is disabled';
|
||||||
|
if (this.settingsProbe.status === 'not_configured') return 'LLM URL is not configured';
|
||||||
|
return 'Connection probe';
|
||||||
|
},
|
||||||
|
|
||||||
|
settingsProbeText() {
|
||||||
|
if (this.settingsProbeLoading) return 'Checking connection...';
|
||||||
|
if (this.settingsProbe.error) return this.settingsProbe.error;
|
||||||
|
return this.settingsProbeSubtitle();
|
||||||
|
},
|
||||||
|
|
||||||
setReviewStatus(status) {
|
setReviewStatus(status) {
|
||||||
this.reviewFilter.status = status;
|
this.openReviews(status);
|
||||||
this.loadReviews();
|
|
||||||
},
|
},
|
||||||
|
|
||||||
openReview(row) {
|
openReview(row) {
|
||||||
@@ -1590,6 +2193,7 @@ function adminV2() {
|
|||||||
|
|
||||||
async selectJob(name) {
|
async selectJob(name) {
|
||||||
this.activeJobName = name;
|
this.activeJobName = name;
|
||||||
|
this.setRoute(`#jobs/${encodeURIComponent(name)}`);
|
||||||
this.activeReview = null;
|
this.activeReview = null;
|
||||||
this.activeRunDetail = null;
|
this.activeRunDetail = null;
|
||||||
await this.loadRunsForJob(name);
|
await this.loadRunsForJob(name);
|
||||||
@@ -1770,6 +2374,7 @@ function adminV2() {
|
|||||||
if (this.activeView === 'library') return 'Library Workbench';
|
if (this.activeView === 'library') return 'Library Workbench';
|
||||||
if (this.activeView === 'jobs') return 'Tasks';
|
if (this.activeView === 'jobs') return 'Tasks';
|
||||||
if (this.activeView === 'tools') return 'Future Tools';
|
if (this.activeView === 'tools') return 'Future Tools';
|
||||||
|
if (this.activeView === 'settings') return 'Settings';
|
||||||
return 'Review Queue';
|
return 'Review Queue';
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -1777,6 +2382,7 @@ function adminV2() {
|
|||||||
if (this.activeView === 'library') return 'Fast entity control surface for artists, releases, and playlists';
|
if (this.activeView === 'library') return 'Fast entity control surface for artists, releases, and playlists';
|
||||||
if (this.activeView === 'jobs') return 'Scheduler state, recent runs, and manual controls in one place';
|
if (this.activeView === 'jobs') return 'Scheduler state, recent runs, and manual controls in one place';
|
||||||
if (this.activeView === 'tools') return 'Reserved space for merge, split, enrichment, and destructive workflows';
|
if (this.activeView === 'tools') return 'Reserved space for merge, split, enrichment, and destructive workflows';
|
||||||
|
if (this.activeView === 'settings') return 'Application configuration and external API credentials';
|
||||||
return 'Full-screen review triage with filter-aware bulk actions';
|
return 'Full-screen review triage with filter-aware bulk actions';
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
+141
-21
@@ -3,6 +3,7 @@
|
|||||||
const T = {
|
const T = {
|
||||||
info: "{{ t.player_info }}",
|
info: "{{ t.player_info }}",
|
||||||
noDetails: "{{ t.player_no_details }}",
|
noDetails: "{{ t.player_no_details }}",
|
||||||
|
trackInfoTitle: "{{ t.player_track_info }}",
|
||||||
loadingHistory: "{{ t.player_loading_history }}",
|
loadingHistory: "{{ t.player_loading_history }}",
|
||||||
failedLoadHistory: "{{ t.player_failed_load_history }}",
|
failedLoadHistory: "{{ t.player_failed_load_history }}",
|
||||||
totalPlays: "{{ t.player_total_plays }}",
|
totalPlays: "{{ t.player_total_plays }}",
|
||||||
@@ -21,6 +22,11 @@ const T = {
|
|||||||
audio: "{{ t.player_audio }}",
|
audio: "{{ t.player_audio }}",
|
||||||
size: "{{ t.player_size }}",
|
size: "{{ t.player_size }}",
|
||||||
uploader: "{{ t.player_uploader }}",
|
uploader: "{{ t.player_uploader }}",
|
||||||
|
lastfmRating: "{{ t.player_lastfm_rating }}",
|
||||||
|
lastfmListeners: "{{ t.player_lastfm_listeners }}",
|
||||||
|
lastfmPlaycount: "{{ t.player_lastfm_playcount }}",
|
||||||
|
lastfmUpdated: "{{ t.player_lastfm_updated }}",
|
||||||
|
lastfmNotLoaded: "{{ t.player_lastfm_not_loaded }}",
|
||||||
trackWord: "{{ t.player_tracks_count }}",
|
trackWord: "{{ t.player_tracks_count }}",
|
||||||
clientIdle: "{{ t.player_client_idle }}",
|
clientIdle: "{{ t.player_client_idle }}",
|
||||||
active: "{{ t.player_active }}",
|
active: "{{ t.player_active }}",
|
||||||
@@ -92,6 +98,11 @@ function formatTime(seconds) {
|
|||||||
return m + ':' + (sec < 10 ? '0' : '') + sec;
|
return m + ':' + (sec < 10 ? '0' : '') + sec;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function coverVariantUrl(url, variant) {
|
||||||
|
if (!url) return url;
|
||||||
|
return url.replace(/\/(small|medium|large)$/, '/' + variant);
|
||||||
|
}
|
||||||
|
|
||||||
document.addEventListener('alpine:init', () => {
|
document.addEventListener('alpine:init', () => {
|
||||||
// -----------------------------------------------------------------------
|
// -----------------------------------------------------------------------
|
||||||
// Audio element
|
// Audio element
|
||||||
@@ -435,7 +446,7 @@ document.addEventListener('alpine:init', () => {
|
|||||||
navigator.mediaSession.metadata = new MediaMetadata({
|
navigator.mediaSession.metadata = new MediaMetadata({
|
||||||
title: t.title,
|
title: t.title,
|
||||||
artist: t.artists.map(a => a.name).join(', '),
|
artist: t.artists.map(a => a.name).join(', '),
|
||||||
artwork: t.cover_url ? [{ src: t.cover_url, sizes: '512x512', type: 'image/jpeg' }] : [],
|
artwork: t.cover_url ? [{ src: coverVariantUrl(t.cover_url, 'large'), sizes: '512x512', type: 'image/jpeg' }] : [],
|
||||||
});
|
});
|
||||||
navigator.mediaSession.setActionHandler('play', () => this.resume());
|
navigator.mediaSession.setActionHandler('play', () => this.resume());
|
||||||
navigator.mediaSession.setActionHandler('pause', () => this.pause());
|
navigator.mediaSession.setActionHandler('pause', () => this.pause());
|
||||||
@@ -629,6 +640,8 @@ document.addEventListener('alpine:init', () => {
|
|||||||
searchResults: null,
|
searchResults: null,
|
||||||
searchLoading: false,
|
searchLoading: false,
|
||||||
_previousView: 'artists',
|
_previousView: 'artists',
|
||||||
|
_activeHash: location.hash || '#artists',
|
||||||
|
_scrollPositions: {},
|
||||||
|
|
||||||
_hashNav: false, // guard against circular hash updates
|
_hashNav: false, // guard against circular hash updates
|
||||||
|
|
||||||
@@ -638,26 +651,31 @@ document.addEventListener('alpine:init', () => {
|
|||||||
|
|
||||||
// Listen for browser back/forward
|
// Listen for browser back/forward
|
||||||
window.addEventListener('hashchange', () => {
|
window.addEventListener('hashchange', () => {
|
||||||
this._navigateFromHash();
|
if (this._hashNav) return;
|
||||||
|
const nextHash = location.hash || '#artists';
|
||||||
|
this._saveScrollPosition(this._activeHash);
|
||||||
|
this._activeHash = nextHash;
|
||||||
|
this._navigateFromHash({ fromHash: true, restoreScroll: true });
|
||||||
});
|
});
|
||||||
|
|
||||||
// Navigate to initial hash (if any)
|
// Navigate to initial hash (if any)
|
||||||
this._navigateFromHash();
|
this._navigateFromHash({ fromHash: true, restoreScroll: true });
|
||||||
},
|
},
|
||||||
|
|
||||||
_setHash(hash) {
|
_setHash(hash) {
|
||||||
this._hashNav = true;
|
this._hashNav = true;
|
||||||
|
this._activeHash = hash;
|
||||||
location.hash = hash;
|
location.hash = hash;
|
||||||
// Reset guard after a tick
|
// Reset guard after a tick
|
||||||
setTimeout(() => { this._hashNav = false; }, 0);
|
setTimeout(() => { this._hashNav = false; }, 0);
|
||||||
},
|
},
|
||||||
|
|
||||||
_navigateFromHash() {
|
_navigateFromHash(options = {}) {
|
||||||
if (this._hashNav) return;
|
if (this._hashNav) return;
|
||||||
const hash = location.hash || '#artists';
|
const hash = location.hash || '#artists';
|
||||||
const match = hash.match(/^#(\w+)(?:\/([-]?\d+))?(?:\?(.*))?$/);
|
const match = hash.match(/^#(\w+)(?:\/([-]?\d+))?(?:\?(.*))?$/);
|
||||||
if (!match) {
|
if (!match) {
|
||||||
this.goArtists();
|
this.goArtists(options);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const view = match[1];
|
const view = match[1];
|
||||||
@@ -665,26 +683,74 @@ document.addEventListener('alpine:init', () => {
|
|||||||
const params = match[3] || '';
|
const params = match[3] || '';
|
||||||
|
|
||||||
if (view === 'artists' && !id) {
|
if (view === 'artists' && !id) {
|
||||||
if (this.view !== 'artists') this.goArtists();
|
if (this.view !== 'artists') this.goArtists(options);
|
||||||
|
else if (options.restoreScroll) this._restoreScrollPosition(hash);
|
||||||
} else if (view === 'artist' && id) {
|
} else if (view === 'artist' && id) {
|
||||||
this.openArtist(id);
|
this.openArtist(id, options);
|
||||||
} else if (view === 'release' && id) {
|
} else if (view === 'release' && id) {
|
||||||
this.openRelease(id);
|
this.openRelease(id, options);
|
||||||
} else if (view === 'playlist' && id) {
|
} else if (view === 'playlist' && id) {
|
||||||
this.openPlaylist(id);
|
this.openPlaylist(id, options);
|
||||||
} else if (view === 'search') {
|
} else if (view === 'search') {
|
||||||
const qMatch = params.match(/q=([^&]*)/);
|
const qMatch = params.match(/q=([^&]*)/);
|
||||||
if (qMatch) {
|
if (qMatch) {
|
||||||
const q = decodeURIComponent(qMatch[1]);
|
const q = decodeURIComponent(qMatch[1]);
|
||||||
this.searchQuery = q;
|
this.searchQuery = q;
|
||||||
this.search(q);
|
this.search(q, options);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.goArtists();
|
this.goArtists(options);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
goArtists() {
|
_scrollElement() {
|
||||||
|
return document.getElementById('center-scroll');
|
||||||
|
},
|
||||||
|
|
||||||
|
_saveScrollPosition(hash = this._activeHash) {
|
||||||
|
const el = this._scrollElement();
|
||||||
|
if (!el || !hash) return;
|
||||||
|
this._scrollPositions[hash] = el.scrollTop;
|
||||||
|
},
|
||||||
|
|
||||||
|
_scrollToTop() {
|
||||||
|
const el = this._scrollElement();
|
||||||
|
if (el) el.scrollTop = 0;
|
||||||
|
},
|
||||||
|
|
||||||
|
_restoreScrollPosition(hash = this._activeHash) {
|
||||||
|
const top = this._scrollPositions[hash];
|
||||||
|
if (top == null) return;
|
||||||
|
const restore = () => {
|
||||||
|
const el = this._scrollElement();
|
||||||
|
if (el) el.scrollTop = top;
|
||||||
|
};
|
||||||
|
this.$nextTick(() => {
|
||||||
|
restore();
|
||||||
|
requestAnimationFrame(restore);
|
||||||
|
setTimeout(restore, 150);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
_afterNavigation(options = {}) {
|
||||||
|
if (options.restoreScroll) {
|
||||||
|
this._restoreScrollPosition(this._activeHash);
|
||||||
|
} else {
|
||||||
|
this.$nextTick(() => { this._scrollToTop(); });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_beginNavigation(hash, options = {}) {
|
||||||
|
if (!options.fromHash) {
|
||||||
|
this._saveScrollPosition(this._activeHash);
|
||||||
|
this._setHash(hash);
|
||||||
|
} else {
|
||||||
|
this._activeHash = hash;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
goArtists(options = {}) {
|
||||||
|
this._beginNavigation('#artists', options);
|
||||||
this.view = 'artists';
|
this.view = 'artists';
|
||||||
this.currentArtist = null;
|
this.currentArtist = null;
|
||||||
this.currentRelease = null;
|
this.currentRelease = null;
|
||||||
@@ -692,8 +758,8 @@ document.addEventListener('alpine:init', () => {
|
|||||||
this.searchQuery = '';
|
this.searchQuery = '';
|
||||||
this.searchResults = null;
|
this.searchResults = null;
|
||||||
this._previousView = 'artists';
|
this._previousView = 'artists';
|
||||||
this._setHash('#artists');
|
|
||||||
this.$nextTick(() => { this._setupScroll(); });
|
this.$nextTick(() => { this._setupScroll(); });
|
||||||
|
this._afterNavigation(options);
|
||||||
},
|
},
|
||||||
|
|
||||||
async loadArtists(page) {
|
async loadArtists(page) {
|
||||||
@@ -717,17 +783,18 @@ document.addEventListener('alpine:init', () => {
|
|||||||
this.loading = false;
|
this.loading = false;
|
||||||
},
|
},
|
||||||
|
|
||||||
async openArtist(id) {
|
async openArtist(id, options = {}) {
|
||||||
|
this._beginNavigation('#artist/' + id, options);
|
||||||
this.searchQuery = '';
|
this.searchQuery = '';
|
||||||
this.searchResults = null;
|
this.searchResults = null;
|
||||||
this.view = 'artist_detail';
|
this.view = 'artist_detail';
|
||||||
this.currentArtist = null;
|
this.currentArtist = null;
|
||||||
this._setHash('#artist/' + id);
|
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/player/artists/${id}`);
|
const res = await fetch(`/api/player/artists/${id}`);
|
||||||
if (!res.ok) throw new Error('failed');
|
if (!res.ok) throw new Error('failed');
|
||||||
this.currentArtist = await res.json();
|
this.currentArtist = await res.json();
|
||||||
} catch {}
|
} catch {}
|
||||||
|
this._afterNavigation(options);
|
||||||
},
|
},
|
||||||
|
|
||||||
artistReleaseGroups() {
|
artistReleaseGroups() {
|
||||||
@@ -787,6 +854,47 @@ document.addEventListener('alpine:init', () => {
|
|||||||
return (idx === 0 ? size.toFixed(0) : size.toFixed(1)) + ' ' + units[idx];
|
return (idx === 0 ? size.toFixed(0) : size.toFixed(1)) + ' ' + units[idx];
|
||||||
},
|
},
|
||||||
|
|
||||||
|
trackPopularityValue(track) {
|
||||||
|
const value = Number(track?.lastfm_rating);
|
||||||
|
return Number.isFinite(value) && value > 0 ? value : null;
|
||||||
|
},
|
||||||
|
|
||||||
|
hasPopularity(track) {
|
||||||
|
return this.trackPopularityValue(track) != null;
|
||||||
|
},
|
||||||
|
|
||||||
|
popularityLabel(track) {
|
||||||
|
const value = this.trackPopularityValue(track);
|
||||||
|
if (value == null) return 'i';
|
||||||
|
if (value >= 10000) return Math.round(value / 1000) + 'k';
|
||||||
|
if (value >= 1000) return (value / 1000).toFixed(1).replace(/\.0$/, '') + 'k';
|
||||||
|
return Math.round(value).toString();
|
||||||
|
},
|
||||||
|
|
||||||
|
popularityStyle(track) {
|
||||||
|
const value = this.trackPopularityValue(track);
|
||||||
|
if (value == null) return '';
|
||||||
|
const t = Math.max(0, Math.min(1, Math.log1p(value) / Math.log1p(180)));
|
||||||
|
const hue = 210 - (190 * t);
|
||||||
|
const saturation = 42 + (46 * t);
|
||||||
|
const lightness = 30 + (16 * t);
|
||||||
|
const bg = `hsla(${hue.toFixed(0)}, ${saturation.toFixed(0)}%, ${lightness.toFixed(0)}%, 0.28)`;
|
||||||
|
const hoverBg = `hsla(${hue.toFixed(0)}, ${saturation.toFixed(0)}%, ${Math.min(54, lightness + 6).toFixed(0)}%, 0.36)`;
|
||||||
|
const border = `hsla(${hue.toFixed(0)}, ${saturation.toFixed(0)}%, ${Math.min(66, lightness + 16).toFixed(0)}%, 0.52)`;
|
||||||
|
const fg = `hsl(${hue.toFixed(0)}, ${Math.min(96, saturation + 8).toFixed(0)}%, ${Math.min(86, lightness + 34).toFixed(0)}%)`;
|
||||||
|
return `--popularity-bg:${bg};--popularity-hover-bg:${hoverBg};--popularity-border:${border};--popularity-fg:${fg}`;
|
||||||
|
},
|
||||||
|
|
||||||
|
trackInfoTitle(track) {
|
||||||
|
const value = this.trackPopularityValue(track);
|
||||||
|
if (value == null) return this.trackInfo(track);
|
||||||
|
return `${T.lastfmRating}: ${Math.round(value)}\n${this.trackInfo(track)}`;
|
||||||
|
},
|
||||||
|
|
||||||
|
openTrackInfo(track) {
|
||||||
|
Alpine.store('info').open(T.trackInfoTitle, this.trackInfo(track));
|
||||||
|
},
|
||||||
|
|
||||||
uploadersInfo(uploaders) {
|
uploadersInfo(uploaders) {
|
||||||
const rows = uploaders || [];
|
const rows = uploaders || [];
|
||||||
if (!rows.length) return 'UFO';
|
if (!rows.length) return 'UFO';
|
||||||
@@ -825,31 +933,42 @@ document.addEventListener('alpine:init', () => {
|
|||||||
`${T.size}: ${this.bytes(track.file_size_bytes)}`,
|
`${T.size}: ${this.bytes(track.file_size_bytes)}`,
|
||||||
`${T.uploader}: ${track.uploader_name || 'UFO'}`,
|
`${T.uploader}: ${track.uploader_name || 'UFO'}`,
|
||||||
];
|
];
|
||||||
|
if (track.lastfm_rating != null || track.lastfm_listeners != null || track.lastfm_playcount != null) {
|
||||||
|
const rating = Number(track.lastfm_rating || 0);
|
||||||
|
lines.push(`${T.lastfmRating}: ${Number.isFinite(rating) ? Math.round(rating) : T.unknown}`);
|
||||||
|
lines.push(`${T.lastfmListeners}: ${new Intl.NumberFormat().format(track.lastfm_listeners || 0)}`);
|
||||||
|
lines.push(`${T.lastfmPlaycount}: ${new Intl.NumberFormat().format(track.lastfm_playcount || 0)}`);
|
||||||
|
if (track.lastfm_updated_at) lines.push(`${T.lastfmUpdated}: ${track.lastfm_updated_at}`);
|
||||||
|
} else {
|
||||||
|
lines.push(`${T.lastfmRating}: ${T.lastfmNotLoaded}`);
|
||||||
|
}
|
||||||
return lines.join('\n');
|
return lines.join('\n');
|
||||||
},
|
},
|
||||||
|
|
||||||
async openRelease(id) {
|
async openRelease(id, options = {}) {
|
||||||
|
this._beginNavigation('#release/' + id, options);
|
||||||
this.searchQuery = '';
|
this.searchQuery = '';
|
||||||
this.searchResults = null;
|
this.searchResults = null;
|
||||||
this.view = 'release_detail';
|
this.view = 'release_detail';
|
||||||
this.currentRelease = null;
|
this.currentRelease = null;
|
||||||
this._setHash('#release/' + id);
|
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/player/releases/${id}`);
|
const res = await fetch(`/api/player/releases/${id}`);
|
||||||
if (!res.ok) throw new Error('failed');
|
if (!res.ok) throw new Error('failed');
|
||||||
this.currentRelease = await res.json();
|
this.currentRelease = await res.json();
|
||||||
} catch {}
|
} catch {}
|
||||||
|
this._afterNavigation(options);
|
||||||
},
|
},
|
||||||
|
|
||||||
async openPlaylist(id) {
|
async openPlaylist(id, options = {}) {
|
||||||
|
this._beginNavigation('#playlist/' + id, options);
|
||||||
this.view = 'playlist_detail';
|
this.view = 'playlist_detail';
|
||||||
this.currentPlaylist = null;
|
this.currentPlaylist = null;
|
||||||
this._setHash('#playlist/' + id);
|
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/player/playlists/${id}`);
|
const res = await fetch(`/api/player/playlists/${id}`);
|
||||||
if (!res.ok) throw new Error('failed');
|
if (!res.ok) throw new Error('failed');
|
||||||
this.currentPlaylist = await res.json();
|
this.currentPlaylist = await res.json();
|
||||||
} catch {}
|
} catch {}
|
||||||
|
this._afterNavigation(options);
|
||||||
},
|
},
|
||||||
|
|
||||||
async playRelease(releaseId) {
|
async playRelease(releaseId) {
|
||||||
@@ -885,17 +1004,17 @@ document.addEventListener('alpine:init', () => {
|
|||||||
} catch {}
|
} catch {}
|
||||||
},
|
},
|
||||||
|
|
||||||
async search(query) {
|
async search(query, options = {}) {
|
||||||
const q = (query || '').trim();
|
const q = (query || '').trim();
|
||||||
if (!q) {
|
if (!q) {
|
||||||
this.clearSearch();
|
this.clearSearch();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
this._beginNavigation('#search?q=' + encodeURIComponent(q), options);
|
||||||
if (this.view !== 'search') {
|
if (this.view !== 'search') {
|
||||||
this._previousView = this.view;
|
this._previousView = this.view;
|
||||||
}
|
}
|
||||||
this.view = 'search';
|
this.view = 'search';
|
||||||
this._setHash('#search?q=' + encodeURIComponent(q));
|
|
||||||
this.searchLoading = true;
|
this.searchLoading = true;
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/player/search?q=${encodeURIComponent(q)}&limit=10`);
|
const res = await fetch(`/api/player/search?q=${encodeURIComponent(q)}&limit=10`);
|
||||||
@@ -905,6 +1024,7 @@ document.addEventListener('alpine:init', () => {
|
|||||||
this.searchResults = { artists: [], releases: [], tracks: [] };
|
this.searchResults = { artists: [], releases: [], tracks: [] };
|
||||||
}
|
}
|
||||||
this.searchLoading = false;
|
this.searchLoading = false;
|
||||||
|
this._afterNavigation(options);
|
||||||
},
|
},
|
||||||
|
|
||||||
clearSearch() {
|
clearSearch() {
|
||||||
|
|||||||
+40
-10
@@ -434,8 +434,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<span></span>
|
<span></span>
|
||||||
<div class="track-actions">
|
<div class="track-actions">
|
||||||
<button class="track-action-btn info-btn" @click.stop="$store.info.open('{{ t.player_track_info }}', $store.library.trackInfo(track))" :title="$store.library.trackInfo(track)" aria-label="{{ t.player_track_info }}">
|
<button class="track-action-btn info-btn popularity-info-btn"
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>
|
:class="{ 'has-popularity': $store.library.hasPopularity(track), 'no-popularity': !$store.library.hasPopularity(track) }"
|
||||||
|
:style="$store.library.popularityStyle(track)"
|
||||||
|
@click.stop="$store.library.openTrackInfo(track)"
|
||||||
|
:title="$store.library.trackInfoTitle(track)"
|
||||||
|
aria-label="{{ t.player_track_info }}">
|
||||||
|
<span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
|
||||||
|
<span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
|
||||||
</button>
|
</button>
|
||||||
<button class="track-action-btn play-btn" @click.stop="$store.library.playSearchTrack(idx)" title="{{ t.player_play }}">
|
<button class="track-action-btn play-btn" @click.stop="$store.library.playSearchTrack(idx)" title="{{ t.player_play }}">
|
||||||
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
|
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
|
||||||
@@ -608,8 +614,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<span></span>
|
<span></span>
|
||||||
<div class="track-actions">
|
<div class="track-actions">
|
||||||
<button class="track-action-btn info-btn" @click.stop="$store.info.open('{{ t.player_track_info }}', $store.library.trackInfo(track))" :title="$store.library.trackInfo(track)" aria-label="{{ t.player_track_info }}">
|
<button class="track-action-btn info-btn popularity-info-btn"
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>
|
:class="{ 'has-popularity': $store.library.hasPopularity(track), 'no-popularity': !$store.library.hasPopularity(track) }"
|
||||||
|
:style="$store.library.popularityStyle(track)"
|
||||||
|
@click.stop="$store.library.openTrackInfo(track)"
|
||||||
|
:title="$store.library.trackInfoTitle(track)"
|
||||||
|
aria-label="{{ t.player_track_info }}">
|
||||||
|
<span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
|
||||||
|
<span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
|
||||||
</button>
|
</button>
|
||||||
<button class="track-action-btn play-btn" @click.stop="$store.queue.playRelease($store.library.currentArtist.featured_tracks, idx)" title="{{ t.player_play }}">
|
<button class="track-action-btn play-btn" @click.stop="$store.queue.playRelease($store.library.currentArtist.featured_tracks, idx)" title="{{ t.player_play }}">
|
||||||
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
|
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
|
||||||
@@ -725,8 +737,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<span></span>
|
<span></span>
|
||||||
<div class="track-actions">
|
<div class="track-actions">
|
||||||
<button class="track-action-btn info-btn" @click.stop="$store.info.open('{{ t.player_track_info }}', $store.library.trackInfo(track))" :title="$store.library.trackInfo(track)" aria-label="{{ t.player_track_info }}">
|
<button class="track-action-btn info-btn popularity-info-btn"
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>
|
:class="{ 'has-popularity': $store.library.hasPopularity(track), 'no-popularity': !$store.library.hasPopularity(track) }"
|
||||||
|
:style="$store.library.popularityStyle(track)"
|
||||||
|
@click.stop="$store.library.openTrackInfo(track)"
|
||||||
|
:title="$store.library.trackInfoTitle(track)"
|
||||||
|
aria-label="{{ t.player_track_info }}">
|
||||||
|
<span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
|
||||||
|
<span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
|
||||||
</button>
|
</button>
|
||||||
<button class="track-action-btn play-btn" @click.stop="$store.queue.playRelease($store.library.currentRelease.tracks, idx)" title="{{ t.player_play }}">
|
<button class="track-action-btn play-btn" @click.stop="$store.queue.playRelease($store.library.currentRelease.tracks, idx)" title="{{ t.player_play }}">
|
||||||
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
|
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
|
||||||
@@ -795,8 +813,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<span></span>
|
<span></span>
|
||||||
<div class="track-actions">
|
<div class="track-actions">
|
||||||
<button class="track-action-btn info-btn" @click.stop="$store.info.open('{{ t.player_track_info }}', $store.library.trackInfo(track))" :title="$store.library.trackInfo(track)" aria-label="{{ t.player_track_info }}">
|
<button class="track-action-btn info-btn popularity-info-btn"
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>
|
:class="{ 'has-popularity': $store.library.hasPopularity(track), 'no-popularity': !$store.library.hasPopularity(track) }"
|
||||||
|
:style="$store.library.popularityStyle(track)"
|
||||||
|
@click.stop="$store.library.openTrackInfo(track)"
|
||||||
|
:title="$store.library.trackInfoTitle(track)"
|
||||||
|
aria-label="{{ t.player_track_info }}">
|
||||||
|
<span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
|
||||||
|
<span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
|
||||||
</button>
|
</button>
|
||||||
<button class="track-action-btn play-btn" @click.stop="$store.queue.playRelease($store.library.currentPlaylist.tracks, idx)" title="{{ t.player_play }}">
|
<button class="track-action-btn play-btn" @click.stop="$store.queue.playRelease($store.library.currentPlaylist.tracks, idx)" title="{{ t.player_play }}">
|
||||||
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
|
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
|
||||||
@@ -871,8 +895,14 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="queue-track-actions">
|
<div class="queue-track-actions">
|
||||||
<button class="queue-track-remove info-btn" @click.stop="$store.info.open('{{ t.player_track_info }}', $store.library.trackInfo(track))" :title="$store.library.trackInfo(track)" aria-label="{{ t.player_track_info }}">
|
<button class="queue-track-remove info-btn popularity-info-btn"
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="14" height="14"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>
|
:class="{ 'has-popularity': $store.library.hasPopularity(track), 'no-popularity': !$store.library.hasPopularity(track) }"
|
||||||
|
:style="$store.library.popularityStyle(track)"
|
||||||
|
@click.stop="$store.library.openTrackInfo(track)"
|
||||||
|
:title="$store.library.trackInfoTitle(track)"
|
||||||
|
aria-label="{{ t.player_track_info }}">
|
||||||
|
<span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
|
||||||
|
<span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
|
||||||
</button>
|
</button>
|
||||||
<button class="queue-track-remove" @click.stop="$store.queue.remove(idx)" title="{{ t.player_remove }}">
|
<button class="queue-track-remove" @click.stop="$store.queue.remove(idx)" title="{{ t.player_remove }}">
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="14" height="14"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="14" height="14"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||||
|
|||||||
@@ -661,11 +661,20 @@ button.user-stat:hover {
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 2px;
|
gap: 2px;
|
||||||
opacity: 0;
|
opacity: 1;
|
||||||
transition: opacity 0.15s;
|
transition: opacity 0.15s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.track-row:hover .track-actions { opacity: 1; }
|
.track-actions > :not(.popularity-info-btn) {
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
transition: opacity 0.15s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.track-row:hover .track-actions > * {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.track-action-btn {
|
.track-action-btn {
|
||||||
background: none;
|
background: none;
|
||||||
@@ -692,6 +701,43 @@ button.user-stat:hover {
|
|||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.popularity-info-btn {
|
||||||
|
min-width: 26px;
|
||||||
|
height: 20px;
|
||||||
|
padding: 0 3px;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 0;
|
||||||
|
background: transparent;
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 800;
|
||||||
|
line-height: 1;
|
||||||
|
letter-spacing: 0;
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popularity-info-btn.has-popularity {
|
||||||
|
color: var(--popularity-fg, var(--text-primary));
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popularity-info-btn.has-popularity:hover {
|
||||||
|
color: var(--popularity-fg, var(--text-primary));
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popularity-info-btn.no-popularity {
|
||||||
|
min-width: 18px;
|
||||||
|
width: 18px;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popularity-info-btn .info-letter {
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 800;
|
||||||
|
font-style: normal;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
.card-info-btn {
|
.card-info-btn {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 8px;
|
top: 8px;
|
||||||
@@ -926,12 +972,21 @@ button.user-stat:hover {
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 2px;
|
gap: 2px;
|
||||||
opacity: 0;
|
opacity: 1;
|
||||||
transition: opacity 0.15s;
|
transition: opacity 0.15s;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.queue-track:hover .queue-track-actions { opacity: 1; }
|
.queue-track-actions > :not(.popularity-info-btn) {
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
transition: opacity 0.15s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.queue-track:hover .queue-track-actions > * {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.queue-track-remove {
|
.queue-track-remove {
|
||||||
background: none;
|
background: none;
|
||||||
@@ -948,6 +1003,20 @@ button.user-stat:hover {
|
|||||||
|
|
||||||
.queue-track-remove:hover { color: var(--text-primary); background: var(--bg-hover); }
|
.queue-track-remove:hover { color: var(--text-primary); background: var(--bg-hover); }
|
||||||
|
|
||||||
|
.queue-track-remove.popularity-info-btn {
|
||||||
|
min-width: 26px;
|
||||||
|
width: auto;
|
||||||
|
height: 20px;
|
||||||
|
padding: 0 3px;
|
||||||
|
border-radius: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.queue-track-remove.popularity-info-btn.no-popularity {
|
||||||
|
min-width: 18px;
|
||||||
|
width: 18px;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* Drag handle */
|
/* Drag handle */
|
||||||
.queue-drag-handle {
|
.queue-drag-handle {
|
||||||
cursor: grab;
|
cursor: grab;
|
||||||
@@ -2807,6 +2876,24 @@ button.user-stat:hover {
|
|||||||
padding: 6px;
|
padding: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.popularity-info-btn {
|
||||||
|
min-width: 28px;
|
||||||
|
height: 22px;
|
||||||
|
padding: 0 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popularity-info-btn.no-popularity {
|
||||||
|
min-width: 20px;
|
||||||
|
width: 20px;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.track-actions > *,
|
||||||
|
.queue-track-actions > * {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.track-action-btn svg,
|
.track-action-btn svg,
|
||||||
.like-btn svg {
|
.like-btn svg {
|
||||||
width: 17px;
|
width: 17px;
|
||||||
|
|||||||
Reference in New Issue
Block a user