Compare commits

...

13 Commits

Author SHA1 Message Date
Ultradesu 59910bc34e CORE: Added Last.FM scrobbling
Build and Publish / Build and Publish Docker Image (push) Successful in 2m50s
2026-05-27 16:52:36 +03:00
Ultradesu 5600a8065d CORE: Added Last.FM scrobbling
Build and Publish / Build and Publish Docker Image (push) Successful in 2m46s
2026-05-27 16:42:20 +03:00
Ultradesu 015d75c701 CORE: Added Last.FM scrobbling
Build and Publish / Build and Publish Docker Image (push) Failing after 1m42s
2026-05-27 16:40:06 +03:00
Ultradesu 1c70349df8 ADMIN: added releases and artists management form
Build and Publish / Build and Publish Docker Image (push) Successful in 2m50s
2026-05-27 15:56:57 +03:00
Ultradesu 65da460c0c ADMIN: added pending review
Build and Publish / Build and Publish Docker Image (push) Successful in 5m5s
2026-05-27 15:03:06 +03:00
Ultradesu 538a6f6abf PLAYER: added simple rating
Build and Publish / Build and Publish Docker Image (push) Successful in 2m55s
2026-05-27 12:55:31 +03:00
ab 04c30bc4b8 added image resizer
Build and Publish / Build and Publish Docker Image (push) Successful in 3m19s
2026-05-27 00:28:39 +03:00
Ultradesu c0342ed987 ADMIN: Revorked settings page
Build and Publish / Build and Publish Docker Image (push) Successful in 3m4s
2026-05-26 18:40:05 +03:00
Ultradesu 4b8797bb2e Added lastfm statistics
Build and Publish / Build and Publish Docker Image (push) Successful in 2m58s
2026-05-26 18:16:34 +03:00
Ultradesu d425bf3087 Improved upload UI
Build and Publish / Build and Publish Docker Image (push) Successful in 3m2s
2026-05-26 16:59:36 +03:00
Ultradesu 82923c871e Improved torrent UI
Build and Publish / Build and Publish Docker Image (push) Successful in 2m45s
2026-05-26 16:21:21 +03:00
Ultradesu 3878d746d2 Improved torrent UI
Build and Publish / Build and Publish Docker Image (push) Successful in 3m2s
2026-05-26 14:49:56 +03:00
Ultradesu 31ae57a5a3 Improved torrent UI
Build and Publish / Build and Publish Docker Image (push) Successful in 2m50s
2026-05-26 14:47:10 +03:00
32 changed files with 7311 additions and 524 deletions
Generated
+118 -1
View File
@@ -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.10" version = "0.1.21"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -1407,7 +1428,9 @@ dependencies = [
"croner", "croner",
"encoding_rs", "encoding_rs",
"id3", "id3",
"image",
"librqbit", "librqbit",
"md-5",
"openidconnect", "openidconnect",
"reqwest", "reqwest",
"schemars 0.9.0", "schemars 0.9.0",
@@ -1588,6 +1611,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 +2059,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 +2583,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 +3071,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 +3151,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 +3172,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 +5238,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 +5792,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",
]
+3 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "furumusic" name = "furumusic"
version = "0.1.11" version = "0.1.21"
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,8 @@ 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"
md-5 = "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"
+137 -4
View File
@@ -20,8 +20,8 @@ use crate::i18n::I18n;
use crate::scheduler::{JobRegistry, SchedulerHandle}; use crate::scheduler::{JobRegistry, SchedulerHandle};
use crate::user::User; use crate::user::User;
use views::{ use views::{
ArtistForm, CronForm, MetadataBackfillForm, OidcSettingsForm, ReleaseForm, ReviewsBulkForm, ArtistForm, CronForm, MetadataBackfillForm, OidcSettingsForm, ReleaseForm, ReviewApproveForm,
SetImageBody, SetupForm, UploadImageBody, UserForm, ReviewsBulkForm, SetImageBody, SetupForm, UploadImageBody, UserForm,
}; };
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
@@ -227,6 +227,35 @@ impl App for AdminApp {
}, },
"admin_v2_reviews_bulk", "admin_v2_reviews_bulk",
), ),
Route::with_handler_and_name(
"/v2/api/reviews/{id}/approve",
{
let pool = Arc::clone(&pool);
let pool_config = Arc::clone(&pool_config);
cot::router::method::post(
move |session: Session,
db: Database,
path: Path<PathId>,
json: Json<v2::ReviewEditDto>| {
let pool = Arc::clone(&pool);
let pool_config = Arc::clone(&pool_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("admin pool")
})
.await;
v2::approve_review(session, db, pg_pool, path.0.id, json).await
}
},
)
},
"admin_v2_review_approve",
),
Route::with_handler_and_name( Route::with_handler_and_name(
"/v2/api/jobs", "/v2/api/jobs",
{ {
@@ -264,6 +293,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({
@@ -378,6 +428,88 @@ impl App for AdminApp {
}, },
"admin_v2_library_item", "admin_v2_library_item",
), ),
Route::with_handler_and_name(
"/v2/api/library/item/detail",
{
let pool = Arc::clone(&pool);
let pool_config = Arc::clone(&pool_config);
get(move |session: Session,
db: Database,
query: UrlQuery<v2::LibraryItemDetailQuery>| {
let pool = Arc::clone(&pool);
let pool_config = Arc::clone(&pool_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("admin pool")
})
.await;
v2::library_item_detail(session, db, pg_pool, query.0).await
}
})
},
"admin_v2_library_item_detail",
),
Route::with_handler_and_name(
"/v2/api/library/item/image",
{
let pool = Arc::clone(&pool);
let pool_config = Arc::clone(&pool_config);
cot::router::method::post(
move |session: Session,
db: Database,
json: Json<v2::SetLibraryImageRequest>| {
let pool = Arc::clone(&pool);
let pool_config = Arc::clone(&pool_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("admin pool")
})
.await;
v2::set_library_item_image(session, db, pg_pool, json).await
}
},
)
},
"admin_v2_library_item_image",
),
Route::with_handler_and_name(
"/v2/api/library/item/upload-image",
{
let pool = Arc::clone(&pool);
let pool_config = Arc::clone(&pool_config);
cot::router::method::post(
move |session: Session,
db: Database,
json: Json<v2::UploadLibraryImageRequest>| {
let pool = Arc::clone(&pool);
let pool_config = Arc::clone(&pool_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("admin pool")
})
.await;
v2::upload_library_item_image(session, db, pg_pool, json).await
}
},
)
},
"admin_v2_library_item_upload_image",
),
Route::with_handler_and_name( Route::with_handler_and_name(
"/v2/api/library/bulk", "/v2/api/library/bulk",
{ {
@@ -1027,7 +1159,8 @@ impl App for AdminApp {
let config = Arc::clone(&self.config); let config = Arc::clone(&self.config);
let pool = Arc::clone(&pool); let pool = Arc::clone(&pool);
let pool_config = Arc::clone(&pool_config); let pool_config = Arc::clone(&pool_config);
move |session: Session, db: Database, path: Path<PathId>| { move |session: Session, db: Database, path: Path<PathId>,
form: RequestForm<ReviewApproveForm>| {
let config = Arc::clone(&config); let config = Arc::clone(&config);
let pool = Arc::clone(&pool); let pool = Arc::clone(&pool);
let pool_config = Arc::clone(&pool_config); let pool_config = Arc::clone(&pool_config);
@@ -1043,7 +1176,7 @@ impl App for AdminApp {
.await .await
.expect("admin pool") .expect("admin pool")
}).await; }).await;
views::review_approve(admin, &config, &db, pg_pool, path.0.id).await views::review_approve(admin, &config, &db, pg_pool, path.0.id, form).await
} }
} }
}), }),
+733 -4
View File
@@ -1,6 +1,6 @@
use std::collections::HashMap; use std::collections::{HashMap, HashSet};
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};
@@ -65,6 +67,31 @@ pub(super) struct UpdateLibraryItemRequest {
id: i64, id: i64,
title: String, title: String,
hidden: bool, hidden: bool,
release_type: Option<String>,
year: Option<String>,
artist_ids: Option<Vec<i64>>,
}
#[derive(Debug, Deserialize)]
pub(super) struct LibraryItemDetailQuery {
kind: String,
id: i64,
}
#[derive(Debug, Deserialize)]
pub(super) struct SetLibraryImageRequest {
kind: String,
id: i64,
media_file_id: Option<i64>,
}
#[derive(Debug, Deserialize)]
pub(super) struct UploadLibraryImageRequest {
kind: String,
id: i64,
data: String,
filename: String,
mime_type: String,
} }
#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)]
@@ -154,10 +181,24 @@ struct ReviewDto {
token_count: Option<i64>, token_count: Option<i64>,
tags: Vec<TagDto>, tags: Vec<TagDto>,
error_message: Option<String>, error_message: Option<String>,
normalized: ReviewEditDto,
created_at: String, created_at: String,
updated_at: String, updated_at: String,
} }
#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema)]
pub(super) struct ReviewEditDto {
title: String,
artist: String,
album: String,
year: String,
track_number: String,
genre: String,
featured_artists: String,
release_type: String,
notes: String,
}
#[derive(Debug, Serialize, JsonSchema)] #[derive(Debug, Serialize, JsonSchema)]
struct JobDto { struct JobDto {
name: String, name: String,
@@ -214,6 +255,100 @@ struct MutationResponse {
affected: u64, affected: u64,
} }
#[derive(Debug, Serialize, JsonSchema)]
struct AdminSettingsDto {
values: AdminSettingsValues,
sources: AdminSettingsSources,
lastfm_api_key_configured: bool,
lastfm_shared_secret_configured: bool,
lastfm_scrobbling_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,
lastfm_shared_secret: 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,
lastfm_shared_secret: &'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,
lastfm_shared_secret: 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,
@@ -243,6 +378,32 @@ struct LibraryItemDto {
updated_at: Option<String>, updated_at: Option<String>,
} }
#[derive(Debug, Serialize, JsonSchema)]
struct LibraryItemDetailDto {
item: LibraryItemDto,
title: String,
hidden: bool,
release_type: Option<String>,
year: Option<i32>,
current_image_url: Option<String>,
selected_artist_ids: Vec<i64>,
artists: Vec<ArtistOptionDto>,
available_covers: Vec<AvailableCoverDto>,
}
#[derive(Debug, Serialize, JsonSchema)]
struct ArtistOptionDto {
id: i64,
name: String,
}
#[derive(Debug, Serialize, JsonSchema)]
struct AvailableCoverDto {
media_file_id: i64,
release_title: String,
cover_url: String,
}
#[derive(Debug, sqlx::FromRow)] #[derive(Debug, sqlx::FromRow)]
struct IdRow { struct IdRow {
id: i64, id: i64,
@@ -442,6 +603,65 @@ pub async fn bulk_reviews(
Json(BulkReviewsResponse { ok: true, affected }).into_response() Json(BulkReviewsResponse { ok: true, affected }).into_response()
} }
pub async fn approve_review(
session: Session,
db: Database,
pool: &PgPool,
review_id: i64,
Json(body): Json<ReviewEditDto>,
) -> cot::Result<cot::response::Response> {
if let Err(response) = require_admin_json(&session, &db).await {
return Ok(response);
}
let mut review = crate::scheduler::PendingReview::get_by_id(&db, review_id)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?
.ok_or_else(|| cot::Error::internal("review not found"))?;
let normalized = normalized_from_review_edit(&body);
let result_json = serde_json::to_string(&normalized)
.map_err(|e| cot::Error::internal(format!("failed to serialize review fields: {e}")))?;
review
.set_result_json(&db, result_json)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
let context: serde_json::Value =
serde_json::from_str(review.context_json_str()).unwrap_or_default();
let input_path = review.input_path_str().to_owned();
let (live_config, _) = AppConfig::load_with_db(&db).await;
let stats = crate::scheduler::ProcessingStats::get_by_review_id(&db, review_id)
.await
.unwrap_or(None);
let model_name = stats.as_ref().map(|s| s.model_name.to_string());
match crate::jobs::inbox_process::finalize_approved(
&db,
pool,
&live_config,
&input_path,
&normalized,
&context,
&live_config.agent_storage_dir,
model_name.as_deref(),
)
.await
{
Ok(()) => {
let _ = review.set_approved(&db).await;
Json(serde_json::json!({ "ok": true })).into_response()
}
Err(error) => {
tracing::error!(?error, "review approval failed");
let _ = review.set_rejected(&db).await;
Ok(json_error(
StatusCode::INTERNAL_SERVER_ERROR,
"review approval failed",
))
}
}
}
pub async fn jobs( pub async fn jobs(
session: Session, session: Session,
db: Database, db: Database,
@@ -458,6 +678,172 @@ 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()),
(
"lastfm_shared_secret",
body.lastfm_shared_secret.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(),
lastfm_shared_secret_configured: !config.lastfm_shared_secret.trim().is_empty(),
lastfm_scrobbling_configured: !config.lastfm_api_key.trim().is_empty()
&& !config.lastfm_shared_secret.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,
lastfm_shared_secret: config.lastfm_shared_secret,
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(),
lastfm_shared_secret: sources.lastfm_shared_secret.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,
@@ -582,6 +968,28 @@ pub async fn library(
Json(page).into_response() Json(page).into_response()
} }
pub async fn library_item_detail(
session: Session,
db: Database,
pool: &PgPool,
query: LibraryItemDetailQuery,
) -> cot::Result<cot::response::Response> {
if let Err(response) = require_admin_json(&session, &db).await {
return Ok(response);
}
let kind = normalize_library_kind(Some(query.kind.as_str()));
let Some(item) = fetch_library_item(pool, &kind, query.id)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?
else {
return Ok(json_error(StatusCode::NOT_FOUND, "library item not found"));
};
let detail = load_library_item_detail(pool, &kind, item)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
Json(detail).into_response()
}
pub async fn update_library_item( pub async fn update_library_item(
session: Session, session: Session,
db: Database, db: Database,
@@ -615,13 +1023,27 @@ pub async fn update_library_item(
.await .await
} }
"releases" => { "releases" => {
let release_type = body
.release_type
.as_deref()
.map(str::trim)
.filter(|value| !value.is_empty())
.unwrap_or("album");
let year = body
.year
.as_deref()
.map(str::trim)
.filter(|value| !value.is_empty())
.and_then(|value| value.parse::<i32>().ok());
sqlx::query( sqlx::query(
"UPDATE furumusic__release \ "UPDATE furumusic__release \
SET title = $1, title_sort = $2, is_hidden = $3, updated_at = $4 \ SET title = $1, title_sort = $2, release_type = $3, year = $4, is_hidden = $5, updated_at = $6 \
WHERE id = $5", WHERE id = $7",
) )
.bind(title) .bind(title)
.bind(normalize_name(title)) .bind(normalize_name(title))
.bind(release_type)
.bind(year)
.bind(body.hidden) .bind(body.hidden)
.bind(&now) .bind(&now)
.bind(body.id) .bind(body.id)
@@ -649,6 +1071,28 @@ pub async fn update_library_item(
if affected == 0 { if affected == 0 {
return Ok(json_error(StatusCode::NOT_FOUND, "library item not found")); return Ok(json_error(StatusCode::NOT_FOUND, "library item not found"));
} }
if kind == "releases" {
if let Some(mut artist_ids) = body.artist_ids {
let mut seen_artist_ids = HashSet::new();
artist_ids.retain(|id| *id > 0 && seen_artist_ids.insert(*id));
sqlx::query("DELETE FROM furumusic__release_artist WHERE release_id = $1")
.bind(body.id)
.execute(pool)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
for (position, artist_id) in artist_ids.iter().enumerate() {
sqlx::query(
"INSERT INTO furumusic__release_artist (release_id, artist_id, position) VALUES ($1, $2, $3)",
)
.bind(body.id)
.bind(*artist_id)
.bind(position as i32)
.execute(pool)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
}
}
}
let Some(item) = fetch_library_item(pool, &kind, body.id) let Some(item) = fetch_library_item(pool, &kind, body.id)
.await .await
@@ -660,6 +1104,128 @@ pub async fn update_library_item(
Json(item).into_response() Json(item).into_response()
} }
pub async fn set_library_item_image(
session: Session,
db: Database,
pool: &PgPool,
Json(body): Json<SetLibraryImageRequest>,
) -> cot::Result<cot::response::Response> {
if let Err(response) = require_admin_json(&session, &db).await {
return Ok(response);
}
let kind = normalize_library_kind(Some(body.kind.as_str()));
if kind != "artists" && kind != "releases" {
return Ok(json_error(StatusCode::BAD_REQUEST, "unsupported kind"));
}
if let Some(fid) = body.media_file_id {
let exists: Option<i64> = sqlx::query_scalar(
"SELECT id FROM furumusic__media_file WHERE id = $1 AND file_type = 'cover_art'",
)
.bind(fid)
.fetch_optional(pool)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
if exists.is_none() {
return Ok(json_error(StatusCode::NOT_FOUND, "image not found"));
}
}
let now = now_string();
let result = if kind == "releases" {
sqlx::query(
"UPDATE furumusic__release SET cover_file_id = $1, updated_at = $2 WHERE id = $3",
)
.bind(body.media_file_id)
.bind(&now)
.bind(body.id)
.execute(pool)
.await
} else {
sqlx::query(
"UPDATE furumusic__artist SET image_file_id = $1, updated_at = $2 WHERE id = $3",
)
.bind(body.media_file_id)
.bind(&now)
.bind(body.id)
.execute(pool)
.await
}
.map_err(|e| cot::Error::internal(e.to_string()))?;
if result.rows_affected() == 0 {
return Ok(json_error(StatusCode::NOT_FOUND, "library item not found"));
}
Json(serde_json::json!({ "ok": true })).into_response()
}
pub async fn upload_library_item_image(
session: Session,
db: Database,
pool: &PgPool,
Json(body): Json<UploadLibraryImageRequest>,
) -> cot::Result<cot::response::Response> {
if let Err(response) = require_admin_json(&session, &db).await {
return Ok(response);
}
let kind = normalize_library_kind(Some(body.kind.as_str()));
if kind != "artists" && kind != "releases" {
return Ok(json_error(StatusCode::BAD_REQUEST, "unsupported kind"));
}
let storage_dir = AppConfig::load_with_db(&db).await.0.agent_storage_dir;
if storage_dir.trim().is_empty() {
return Err(cot::Error::internal("agent_storage_dir is not configured"));
}
use base64::Engine;
let image_data = base64::engine::general_purpose::STANDARD
.decode(body.data.trim())
.map_err(|e| cot::Error::internal(format!("invalid base64: {e}")))?;
if image_data.is_empty() {
return Ok(json_error(StatusCode::BAD_REQUEST, "image is empty"));
}
let title: Option<String> = if kind == "releases" {
sqlx::query_scalar("SELECT title::text FROM furumusic__release WHERE id = $1")
} else {
sqlx::query_scalar("SELECT name::text FROM furumusic__artist WHERE id = $1")
}
.bind(body.id)
.fetch_optional(pool)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
let Some(title) = title else {
return Ok(json_error(StatusCode::NOT_FOUND, "library item not found"));
};
let cover = crate::agent::cover_art::CoverImage {
data: image_data,
mime_type: body.mime_type,
source: crate::agent::cover_art::CoverSource::FolderFile(std::path::PathBuf::from(
body.filename,
)),
};
let media_file_id = crate::agent::cover_art::save_cover_to_storage(
&db,
pool,
&storage_dir,
&title,
if kind == "artists" {
"__artist_image__"
} else {
"__release_cover__"
},
&cover,
)
.await
.map_err(|e| cot::Error::internal(format!("failed to save image: {e}")))?;
set_library_item_image(
session,
db,
pool,
Json(SetLibraryImageRequest {
kind,
id: body.id,
media_file_id: Some(media_file_id),
}),
)
.await
}
pub async fn bulk_library( pub async fn bulk_library(
session: Session, session: Session,
db: Database, db: Database,
@@ -961,6 +1527,11 @@ fn review_dto(
.as_deref() .as_deref()
.and_then(|json| serde_json::from_str::<serde_json::Value>(json).ok()) .and_then(|json| serde_json::from_str::<serde_json::Value>(json).ok())
.and_then(|value| value.get("confidence").and_then(|v| v.as_f64())); .and_then(|value| value.get("confidence").and_then(|v| v.as_f64()));
let normalized = row
.result_json
.as_deref()
.map(review_edit_dto_from_json)
.unwrap_or_default();
ReviewDto { ReviewDto {
id: row.id, id: row.id,
@@ -976,11 +1547,72 @@ fn review_dto(
token_count: stat.map(|s| s.prompt_tokens + s.completion_tokens), token_count: stat.map(|s| s.prompt_tokens + s.completion_tokens),
tags, tags,
error_message: row.error_message, error_message: row.error_message,
normalized,
created_at: row.created_at, created_at: row.created_at,
updated_at: row.updated_at, updated_at: row.updated_at,
} }
} }
fn review_edit_dto_from_json(result_json: &str) -> ReviewEditDto {
let Ok(normalized) = serde_json::from_str::<crate::agent::dto::NormalizedFields>(result_json)
else {
return ReviewEditDto::default();
};
ReviewEditDto {
title: normalized.title.unwrap_or_default(),
artist: normalized.artist.unwrap_or_default(),
album: normalized.album.unwrap_or_default(),
year: normalized.year.map(|v| v.to_string()).unwrap_or_default(),
track_number: normalized
.track_number
.map(|v| v.to_string())
.unwrap_or_default(),
genre: normalized.genre.unwrap_or_default(),
featured_artists: normalized.featured_artists.join(", "),
release_type: normalized
.release_type
.unwrap_or_else(|| "album".to_owned()),
notes: normalized.notes.unwrap_or_default(),
}
}
fn optional_trimmed(value: &str) -> Option<String> {
let trimmed = value.trim();
if trimmed.is_empty() {
None
} else {
Some(trimmed.to_owned())
}
}
fn parse_optional_i32(value: &str) -> Option<i32> {
value.trim().parse::<i32>().ok()
}
fn parse_featured_artists(value: &str) -> Vec<String> {
value
.split(',')
.map(str::trim)
.filter(|part| !part.is_empty())
.map(str::to_owned)
.collect()
}
fn normalized_from_review_edit(edit: &ReviewEditDto) -> crate::agent::dto::NormalizedFields {
crate::agent::dto::NormalizedFields {
title: optional_trimmed(&edit.title),
artist: optional_trimmed(&edit.artist),
album: optional_trimmed(&edit.album),
year: parse_optional_i32(&edit.year),
track_number: parse_optional_i32(&edit.track_number),
genre: optional_trimmed(&edit.genre),
featured_artists: parse_featured_artists(&edit.featured_artists),
release_type: optional_trimmed(&edit.release_type).or_else(|| Some("album".to_owned())),
confidence: Some(1.0),
notes: optional_trimmed(&edit.notes),
}
}
fn media_tags(row: &ReviewMediaRow) -> Vec<TagDto> { fn media_tags(row: &ReviewMediaRow) -> Vec<TagDto> {
let mut tags = Vec::new(); let mut tags = Vec::new();
if let Some(format) = row.audio_format.as_deref().filter(|s| !s.trim().is_empty()) { if let Some(format) = row.audio_format.as_deref().filter(|s| !s.trim().is_empty()) {
@@ -1232,6 +1864,103 @@ async fn fetch_library_item(
Ok(row.map(|row| library_item_dto(kind, row))) Ok(row.map(|row| library_item_dto(kind, row)))
} }
async fn load_library_item_detail(
pool: &PgPool,
kind: &str,
item: LibraryItemDto,
) -> anyhow::Result<LibraryItemDetailDto> {
let mut detail = LibraryItemDetailDto {
title: item.title.clone(),
hidden: item.is_hidden.unwrap_or(false),
release_type: None,
year: None,
current_image_url: None,
selected_artist_ids: Vec::new(),
artists: Vec::new(),
available_covers: Vec::new(),
item,
};
match kind {
"artists" => {
let image_file_id: Option<i64> =
sqlx::query_scalar("SELECT image_file_id FROM furumusic__artist WHERE id = $1")
.bind(detail.item.id)
.fetch_optional(pool)
.await?
.flatten();
detail.current_image_url =
image_file_id.map(|id| format!("/api/player/cover/{id}/large"));
detail.available_covers = artist_available_covers(pool, detail.item.id).await?;
}
"releases" => {
let row: Option<(Option<String>, Option<i32>, Option<i64>)> = sqlx::query_as(
"SELECT release_type::text, year, cover_file_id FROM furumusic__release WHERE id = $1",
)
.bind(detail.item.id)
.fetch_optional(pool)
.await?;
if let Some((release_type, year, cover_file_id)) = row {
detail.release_type = release_type;
detail.year = year;
detail.current_image_url =
cover_file_id.map(|id| format!("/api/player/cover/{id}/large"));
}
detail.selected_artist_ids = sqlx::query_as::<_, IdRow>(
"SELECT artist_id AS id FROM furumusic__release_artist WHERE release_id = $1 ORDER BY position, artist_id",
)
.bind(detail.item.id)
.fetch_all(pool)
.await?
.into_iter()
.map(|row| row.id)
.collect();
detail.artists = load_artist_options(pool).await?;
}
_ => {}
}
Ok(detail)
}
async fn load_artist_options(pool: &PgPool) -> anyhow::Result<Vec<ArtistOptionDto>> {
let rows = sqlx::query_as::<_, (i64, String)>(
"SELECT id, name::text FROM furumusic__artist ORDER BY name ASC",
)
.fetch_all(pool)
.await?;
Ok(rows
.into_iter()
.map(|(id, name)| ArtistOptionDto { id, name })
.collect())
}
async fn artist_available_covers(
pool: &PgPool,
artist_id: i64,
) -> anyhow::Result<Vec<AvailableCoverDto>> {
let rows = sqlx::query_as::<_, (i64, String)>(
"SELECT DISTINCT r.cover_file_id AS media_file_id, r.title::text AS release_title \
FROM furumusic__release r \
LEFT JOIN furumusic__release_artist ra ON ra.release_id = r.id \
LEFT JOIN furumusic__track t ON t.release_id = r.id \
LEFT JOIN furumusic__track_artist ta ON ta.track_id = t.id \
WHERE r.cover_file_id IS NOT NULL AND (ra.artist_id = $1 OR ta.artist_id = $1) \
ORDER BY r.title::text ASC",
)
.bind(artist_id)
.fetch_all(pool)
.await?;
Ok(rows
.into_iter()
.map(|(media_file_id, release_title)| AvailableCoverDto {
media_file_id,
release_title,
cover_url: format!("/api/player/cover/{media_file_id}/medium"),
})
.collect())
}
async fn library_ids_by_filter( async fn library_ids_by_filter(
pool: &PgPool, pool: &PgPool,
kind: &str, kind: &str,
+138 -12
View File
@@ -184,6 +184,16 @@ fn config_display_entries(config: &AppConfig, sources: &ConfigSources) -> Vec<Co
config.agent_concurrency.to_string(), config.agent_concurrency.to_string(),
defaults.agent_concurrency.to_string() defaults.agent_concurrency.to_string()
), ),
entry!(
lastfm_api_key,
config.lastfm_api_key.clone(),
defaults.lastfm_api_key.clone()
),
entry!(
lastfm_shared_secret,
config.lastfm_shared_secret.clone(),
defaults.lastfm_shared_secret.clone()
),
] ]
} }
@@ -258,6 +268,10 @@ struct SettingsTemplate {
agent_context_limit_source: &'static str, agent_context_limit_source: &'static str,
agent_concurrency: String, agent_concurrency: String,
agent_concurrency_source: &'static str, agent_concurrency_source: &'static str,
lastfm_api_key: String,
lastfm_api_key_source: &'static str,
lastfm_shared_secret: String,
lastfm_shared_secret_source: &'static str,
} }
pub async fn settings_handler( pub async fn settings_handler(
@@ -310,6 +324,10 @@ pub async fn settings_handler(
agent_context_limit_source: sources.agent_context_limit.code(), agent_context_limit_source: sources.agent_context_limit.code(),
agent_concurrency: config.agent_concurrency.to_string(), agent_concurrency: config.agent_concurrency.to_string(),
agent_concurrency_source: sources.agent_concurrency.code(), agent_concurrency_source: sources.agent_concurrency.code(),
lastfm_api_key: config.lastfm_api_key.clone(),
lastfm_api_key_source: sources.lastfm_api_key.code(),
lastfm_shared_secret: config.lastfm_shared_secret.clone(),
lastfm_shared_secret_source: sources.lastfm_shared_secret.code(),
}; };
Ok(Html::new(template.render()?)) Ok(Html::new(template.render()?))
} }
@@ -334,6 +352,8 @@ pub struct OidcSettingsForm {
agent_confidence_threshold: Option<String>, agent_confidence_threshold: Option<String>,
agent_context_limit: Option<String>, agent_context_limit: Option<String>,
agent_concurrency: Option<String>, agent_concurrency: Option<String>,
lastfm_api_key: Option<String>,
lastfm_shared_secret: Option<String>,
} }
pub async fn settings_submit( pub async fn settings_submit(
@@ -380,7 +400,9 @@ pub async fn settings_submit(
let agent_confidence_threshold = data.agent_confidence_threshold.unwrap_or_default(); let agent_confidence_threshold = data.agent_confidence_threshold.unwrap_or_default();
let agent_context_limit = data.agent_context_limit.unwrap_or_default(); let agent_context_limit = data.agent_context_limit.unwrap_or_default();
let agent_concurrency = data.agent_concurrency.unwrap_or_default(); let agent_concurrency = data.agent_concurrency.unwrap_or_default();
let fields: [(&str, &str); 18] = [ let lastfm_api_key = data.lastfm_api_key.unwrap_or_default();
let lastfm_shared_secret = data.lastfm_shared_secret.unwrap_or_default();
let fields: [(&str, &str); 20] = [
("auth_password_enabled", pw_enabled), ("auth_password_enabled", pw_enabled),
("auth_sso_enabled", sso_enabled), ("auth_sso_enabled", sso_enabled),
("oidc_button_text", &oidc_button_text), ("oidc_button_text", &oidc_button_text),
@@ -399,6 +421,8 @@ pub async fn settings_submit(
("agent_confidence_threshold", &agent_confidence_threshold), ("agent_confidence_threshold", &agent_confidence_threshold),
("agent_context_limit", &agent_context_limit), ("agent_context_limit", &agent_context_limit),
("agent_concurrency", &agent_concurrency), ("agent_concurrency", &agent_concurrency),
("lastfm_api_key", &lastfm_api_key),
("lastfm_shared_secret", &lastfm_shared_secret),
]; ];
for (key, value) in fields { for (key, value) in fields {
let mut entry = ConfigEntry::new(key.to_owned(), value.to_owned()); let mut entry = ConfigEntry::new(key.to_owned(), value.to_owned());
@@ -799,7 +823,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 +903,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"),
}); });
} }
} }
@@ -1794,12 +1818,104 @@ struct ReviewDetailTemplate {
user_name: String, user_name: String,
user_role: String, user_role: String,
review: PendingReview, review: PendingReview,
edit: ReviewEditFields,
release_types: &'static [(&'static str, &'static str, &'static str)],
lang_code: &'static str,
context_pretty: String, context_pretty: String,
result_pretty: String, result_pretty: String,
error_message: String, error_message: String,
stats: Option<scheduler::ProcessingStats>, stats: Option<scheduler::ProcessingStats>,
} }
#[derive(Debug, Default)]
struct ReviewEditFields {
title: String,
artist: String,
album: String,
year: String,
track_number: String,
genre: String,
featured_artists: String,
release_type: String,
notes: String,
}
#[derive(Debug, Form)]
pub struct ReviewApproveForm {
title: String,
artist: String,
album: String,
year: String,
track_number: String,
genre: String,
featured_artists: String,
release_type: String,
notes: String,
}
fn optional_trimmed(value: &str) -> Option<String> {
let trimmed = value.trim();
if trimmed.is_empty() {
None
} else {
Some(trimmed.to_owned())
}
}
fn parse_optional_i32(value: &str) -> Option<i32> {
value.trim().parse::<i32>().ok()
}
fn parse_featured_artists(value: &str) -> Vec<String> {
value
.split(',')
.map(str::trim)
.filter(|part| !part.is_empty())
.map(str::to_owned)
.collect()
}
fn edit_fields_from_normalized(
normalized: &crate::agent::dto::NormalizedFields,
) -> ReviewEditFields {
ReviewEditFields {
title: normalized.title.clone().unwrap_or_default(),
artist: normalized.artist.clone().unwrap_or_default(),
album: normalized.album.clone().unwrap_or_default(),
year: normalized.year.map(|v| v.to_string()).unwrap_or_default(),
track_number: normalized
.track_number
.map(|v| v.to_string())
.unwrap_or_default(),
genre: normalized.genre.clone().unwrap_or_default(),
featured_artists: normalized.featured_artists.join(", "),
release_type: normalized
.release_type
.clone()
.unwrap_or_else(|| "album".to_owned()),
notes: normalized.notes.clone().unwrap_or_default(),
}
}
fn normalized_from_result_json(result_json: &str) -> crate::agent::dto::NormalizedFields {
serde_json::from_str(result_json).unwrap_or_default()
}
fn normalized_from_review_form(form: &ReviewApproveForm) -> crate::agent::dto::NormalizedFields {
crate::agent::dto::NormalizedFields {
title: optional_trimmed(&form.title),
artist: optional_trimmed(&form.artist),
album: optional_trimmed(&form.album),
year: parse_optional_i32(&form.year),
track_number: parse_optional_i32(&form.track_number),
genre: optional_trimmed(&form.genre),
featured_artists: parse_featured_artists(&form.featured_artists),
release_type: optional_trimmed(&form.release_type).or_else(|| Some("album".to_owned())),
confidence: Some(1.0),
notes: optional_trimmed(&form.notes),
}
}
pub async fn review_detail( pub async fn review_detail(
admin: AuthenticatedUser, admin: AuthenticatedUser,
i18n: I18n, i18n: I18n,
@@ -1830,12 +1946,17 @@ pub async fn review_detail(
let stats = scheduler::ProcessingStats::get_by_review_id(db, review_id) let stats = scheduler::ProcessingStats::get_by_review_id(db, review_id)
.await .await
.unwrap_or(None); .unwrap_or(None);
let normalized = normalized_from_result_json(review.result_json_str());
let edit = edit_fields_from_normalized(&normalized);
let template = ReviewDetailTemplate { let template = ReviewDetailTemplate {
t: i18n.t, t: i18n.t,
user_name: admin.name, user_name: admin.name,
user_role: admin.role.code().to_owned(), user_role: admin.role.code().to_owned(),
review, review,
edit,
release_types: RELEASE_TYPES,
lang_code: i18n.t.lang.code(),
context_pretty, context_pretty,
result_pretty, result_pretty,
error_message, error_message,
@@ -1850,24 +1971,29 @@ pub async fn review_approve(
db: &Database, db: &Database,
pool: &sqlx::PgPool, pool: &sqlx::PgPool,
review_id: i64, review_id: i64,
form: RequestForm<ReviewApproveForm>,
) -> cot::Result<cot::http::Response<Body>> { ) -> cot::Result<cot::http::Response<Body>> {
let mut review = PendingReview::get_by_id(db, review_id) let mut review = PendingReview::get_by_id(db, review_id)
.await .await
.map_err(|e| cot::Error::internal(format!("db error: {e}")))? .map_err(|e| cot::Error::internal(format!("db error: {e}")))?
.ok_or_else(|| cot::Error::internal("review not found"))?; .ok_or_else(|| cot::Error::internal("review not found"))?;
let result_str = review.result_json_str().to_owned(); let RequestForm(form_result) = form;
let normalized = match form_result {
FormResult::Ok(data) => normalized_from_review_form(&data),
FormResult::ValidationError(_) => {
return Ok(auth::redirect(&format!("/admin/reviews/{review_id}")));
}
};
let result_str = serde_json::to_string(&normalized)
.map_err(|e| cot::Error::internal(format!("failed to serialize review fields: {e}")))?;
review
.set_result_json(db, result_str)
.await
.map_err(|e| cot::Error::internal(format!("db error: {e}")))?;
let context_str = review.context_json_str().to_owned(); let context_str = review.context_json_str().to_owned();
let input_path = review.input_path_str().to_owned(); let input_path = review.input_path_str().to_owned();
if result_str.is_empty() {
let _ = review.set_rejected(db).await;
return Ok(auth::redirect(&format!("/admin/reviews/{review_id}")));
}
let normalized: crate::agent::dto::NormalizedFields = serde_json::from_str(&result_str)
.map_err(|e| cot::Error::internal(format!("invalid result_json: {e}")))?;
let context: serde_json::Value = serde_json::from_str(&context_str).unwrap_or_default(); let context: serde_json::Value = serde_json::from_str(&context_str).unwrap_or_default();
// Load live config from DB so admin-set values are used // Load live config from DB so admin-set values are used
+25
View File
@@ -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())
} }
+102
View File
@@ -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
View File
@@ -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;
+77
View File
@@ -133,6 +133,8 @@ 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,
pub lastfm_shared_secret: ConfigSource,
} }
impl Default for ConfigSources { impl Default for ConfigSources {
@@ -158,6 +160,8 @@ 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,
lastfm_shared_secret: ConfigSource::Default,
} }
} }
} }
@@ -262,6 +266,10 @@ 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,
/// Last.fm shared secret for authenticated scrobbling calls.
pub lastfm_shared_secret: String,
} }
impl Default for AppConfig { impl Default for AppConfig {
@@ -287,6 +295,8 @@ 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(),
lastfm_shared_secret: String::new(),
} }
} }
} }
@@ -313,14 +323,22 @@ impl_env_overrides!(
agent_confidence_threshold, agent_confidence_threshold,
agent_context_limit, agent_context_limit,
agent_concurrency, agent_concurrency,
lastfm_api_key,
lastfm_shared_secret,
); );
impl AppConfig { impl AppConfig {
fn normalize_host_paths(&mut self) {
self.agent_inbox_dir = normalize_host_path(&self.agent_inbox_dir);
self.agent_storage_dir = normalize_host_path(&self.agent_storage_dir);
}
/// Build config: start from defaults, then overlay env vars. /// Build config: start from defaults, then overlay env vars.
/// Used at startup before the DB is available (to get `database_url`). /// Used at startup before the DB is available (to get `database_url`).
pub fn load() -> Self { pub fn load() -> Self {
let mut cfg = Self::default(); let mut cfg = Self::default();
cfg.apply_env_overrides(); cfg.apply_env_overrides();
cfg.normalize_host_paths();
cfg cfg
} }
@@ -331,6 +349,7 @@ impl AppConfig {
let mut sources = ConfigSources::default(); let mut sources = ConfigSources::default();
cfg.apply_db_overrides(db, &mut sources).await; cfg.apply_db_overrides(db, &mut sources).await;
cfg.apply_env_overrides_tracked(&mut sources); cfg.apply_env_overrides_tracked(&mut sources);
cfg.normalize_host_paths();
(cfg, sources) (cfg, sources)
} }
@@ -389,9 +408,49 @@ 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);
apply_db_field!(lastfm_shared_secret);
} }
} }
fn normalize_host_path(value: &str) -> String {
let trimmed = value.trim();
if trimmed.is_empty() {
return String::new();
}
normalize_windows_user_path(trimmed).unwrap_or_else(|| trimmed.to_owned())
}
#[cfg(not(windows))]
fn normalize_windows_user_path(value: &str) -> Option<String> {
let normalized = value.replace('\\', "/");
let mut parts = normalized.split('/').filter(|part| !part.is_empty());
let drive = parts.next()?;
if drive.len() != 2 || !drive.ends_with(':') {
return None;
}
if !parts.next()?.eq_ignore_ascii_case("Users") {
return None;
}
let user = parts.next()?;
if user.is_empty() {
return None;
}
let mut out = format!("/Users/{user}");
for part in parts {
out.push('/');
out.push_str(part);
}
Some(out)
}
#[cfg(windows)]
fn normalize_windows_user_path(_value: &str) -> Option<String> {
None
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
@@ -403,6 +462,24 @@ mod tests {
assert_eq!(cfg.log_level, "info"); assert_eq!(cfg.log_level, "info");
} }
#[cfg(not(windows))]
#[test]
fn normalizes_windows_user_path_on_unix() {
assert_eq!(
normalize_host_path(r"C:\Users\ab\repos\furumusic\media\uploads"),
"/Users/ab/repos/furumusic/media/uploads"
);
}
#[cfg(not(windows))]
#[test]
fn leaves_unix_path_unchanged() {
assert_eq!(
normalize_host_path("/Users/ab/repos/furumusic/media/uploads"),
"/Users/ab/repos/furumusic/media/uploads"
);
}
// SAFETY: tests run with --test-threads=1 so no concurrent env access. // SAFETY: tests run with --test-threads=1 so no concurrent env access.
unsafe fn set(k: &str, v: &str) { unsafe fn set(k: &str, v: &str) {
unsafe { std::env::set_var(k, v) }; unsafe { std::env::set_var(k, v) };
+169
View File
@@ -95,6 +95,10 @@ translations! {
settings_api: "API" , "API"; settings_api: "API" , "API";
settings_swagger: "Swagger UI" , "Swagger UI"; settings_swagger: "Swagger UI" , "Swagger UI";
settings_swagger_help: "Serves interactive API docs at /swagger/ (requires restart)" , "Интерактивная документация API на /swagger/ (требуется перезапуск)"; settings_swagger_help: "Serves interactive API docs at /swagger/ (requires restart)" , "Интерактивная документация API на /swagger/ (требуется перезапуск)";
settings_lastfm_api_key: "Last.fm API key" , "API ключ Last.fm";
settings_lastfm_api_key_help: "Used for Last.fm popularity and account connection" , "Используется для популярности Last.fm и подключения аккаунта";
settings_lastfm_shared_secret: "Last.fm shared secret" , "Shared secret Last.fm";
settings_lastfm_shared_secret_help: "Required for signed Last.fm scrobbling requests" , "Нужен для подписанных запросов скробблинга Last.fm";
// OIDC login errors // OIDC login errors
login_oidc_error: "SSO login failed. Please try again." , "Ошибка входа через SSO. Попробуйте ещё раз."; login_oidc_error: "SSO login failed. Please try again." , "Ошибка входа через SSO. Попробуйте ещё раз.";
@@ -264,4 +268,169 @@ translations! {
settings_agent_completion_tokens: "Completion tokens" , "Токенов на ответ"; settings_agent_completion_tokens: "Completion tokens" , "Токенов на ответ";
settings_agent_tokens_per_sec: "Tokens/sec" , "Токенов/сек"; settings_agent_tokens_per_sec: "Tokens/sec" , "Токенов/сек";
settings_agent_status_loading: "Checking connection" , "Проверка подключения"; settings_agent_status_loading: "Checking connection" , "Проверка подключения";
// Player UI
player_library: "Library" , "Библиотека";
player_artists: "Artists" , "Артисты";
player_release: "Release" , "Релиз";
player_releases: "Releases" , "Релизы";
player_tracks: "Tracks" , "Треки";
player_title: "Title" , "Название";
player_duration: "Duration" , "Длительность";
player_following: "Following" , "Подписки";
player_follow: "Follow" , "Подписаться";
player_followed: "Following" , "Вы подписаны";
player_unfollow_artist: "Unfollow artist" , "Отписаться от артиста";
player_follow_artist: "Follow artist" , "Подписаться на артиста";
player_no_followed_artists: "No followed artists" , "Нет подписок на артистов";
player_playlists: "Playlists" , "Плейлисты";
player_published_playlists: "Published Playlists" , "Опубликованные плейлисты";
player_public: "Public" , "Публичный";
player_published: "Published" , "Опубликован";
player_by: "by" , "от";
player_tracks_count: "tracks" , "треков";
player_files_count: "files" , "файлов";
player_releases_count: "releases" , "релизов";
player_plays_count: "plays" , "прослушиваний";
player_likes_count: "likes" , "лайков";
player_likes_playlist: "Likes" , "Лайки";
player_listened: "listened" , "прослушано";
player_search_placeholder: "Search artists, releases, tracks..." , "Поиск артистов, релизов, треков...";
player_no_results: "No results found" , "Ничего не найдено";
player_new_playlist: "New Playlist" , "Новый плейлист";
player_rename_playlist: "Rename Playlist" , "Переименовать плейлист";
player_playlist_name: "Playlist name" , "Название плейлиста";
player_add_to_playlist: "Add to Playlist" , "Добавить в плейлист";
player_cancel: "Cancel" , "Отмена";
player_create: "Create" , "Создать";
player_save: "Save" , "Сохранить";
player_delete: "Delete" , "Удалить";
player_delete_playlist_confirm: "Delete this playlist?" , "Удалить этот плейлист?";
player_rename: "Rename" , "Переименовать";
player_close: "Close" , "Закрыть";
player_log_out: "Log out" , "Выйти";
player_admin_panel: "Admin Panel" , "Админка";
player_info: "Info" , "Информация";
player_no_details: "No details available." , "Нет подробностей.";
player_release_info: "Release info" , "Информация о релизе";
player_track_info: "Track info" , "Информация о треке";
player_type: "Type" , "Тип";
player_year: "Year" , "Год";
player_uploaders: "Uploaders" , "Загрузили";
player_unknown: "unknown" , "неизвестно";
player_unknown_size: "unknown size" , "размер неизвестен";
player_unknown_release: "Unknown release" , "Неизвестный релиз";
player_unknown_track: "Unknown track" , "Неизвестный трек";
player_unknown_audio: "unknown audio details" , "детали аудио неизвестны";
player_release_year: "Release year" , "Год релиза";
player_audio: "Audio" , "Аудио";
player_size: "Size" , "Размер";
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_lastfm_profile: "Last.fm" , "Last.fm";
player_lastfm_connect: "Connect Last.fm" , "Подключить Last.fm";
player_lastfm_connected: "Connected as {user}" , "Подключён: {user}";
player_lastfm_reconnect: "Reconnect Last.fm" , "Переподключить Last.fm";
player_lastfm_not_configured: "Last.fm is not configured" , "Last.fm не настроен";
player_lastfm_disconnect_confirm: "Disconnect Last.fm account {user}?" , "Отвязать аккаунт Last.fm {user}?";
player_lastfm_connect_failed: "Could not open Last.fm connection" , "Не удалось открыть подключение Last.fm";
player_lastfm_disconnect_failed: "Could not disconnect Last.fm" , "Не удалось отвязать Last.fm";
player_play: "Play" , "Играть";
player_like: "Like" , "Лайк";
player_add_to_queue: "Add to queue" , "Добавить в очередь";
player_add_to_end_queue: "Add to end of queue" , "Добавить в конец очереди";
player_play_next: "Play next" , "Играть следующим";
player_queue: "Queue" , "Очередь";
player_next: "Next" , "Далее";
player_previous: "Previous" , "Назад";
player_clear: "Clear" , "Очистить";
player_remove: "Remove" , "Удалить";
player_queue_empty: "Queue is empty" , "Очередь пуста";
player_shuffle: "Shuffle" , "Перемешать";
player_repeat: "Repeat" , "Повтор";
player_volume: "Volume" , "Громкость";
player_appears_on: "Appears on" , "Участвует в";
player_albums: "Albums" , "Альбомы";
player_eps: "EPs" , "EP";
player_singles: "Singles" , "Синглы";
player_compilations: "Compilations" , "Сборники";
player_mixtapes: "Mixtapes" , "Микстейпы";
player_live_releases: "Live releases" , "Концертные релизы";
player_soundtracks: "Soundtracks" , "Саундтреки";
// Player torrent/history UI
player_torrent_manager: "Torrent manager" , "Торрент-менеджер";
player_import_torrent: "Import torrent" , "Импортировать торрент";
player_client_idle: "Client idle" , "Клиент простаивает";
player_active: "active" , "активно";
player_ai_idle: "AI idle" , "ИИ простаивает";
player_ai_prefix: "AI" , "ИИ";
player_processing: "processing" , "обрабатывается";
player_queued: "queued" , "в очереди";
player_saved: "saved" , "сохранено";
player_saved_torrents: "Saved torrents" , "Сохранённые торренты";
player_refresh: "Refresh" , "Обновить";
player_no_saved_torrents: "No saved torrents" , "Сохранённых торрентов нет";
player_upload: "Upload" , "Загрузить";
player_choose_saved_or_add_torrent: "Choose a saved item or upload new files." , "Выберите сохранённый элемент или загрузите новые файлы.";
player_local_files: "Local audio files" , "Локальные аудиофайлы";
player_torrent_file: "Torrent file" , "Torrent-файл";
player_magnet_link: "Magnet link" , "Magnet-ссылка";
player_upload_content: "Upload" , "Загрузить";
player_download_selected: "Download selected" , "Скачать выбранное";
player_pause_download: "Pause download" , "Поставить на паузу";
player_expand_all: "Expand all" , "Развернуть всё";
player_collapse: "Collapse" , "Свернуть";
player_selected: "selected" , "выбрано";
player_preview: "Preview" , "Предпросмотр";
player_resolving: "Resolving metadata" , "Получаю метаданные";
player_downloading: "Downloading" , "Скачивается";
player_moving: "Moving" , "Перемещается";
player_completed: "Completed" , "Готово";
player_failed: "Failed" , "Ошибка";
player_paused: "Paused" , "Пауза";
player_no_torrent_selected: "No torrent selected" , "Торрент не выбран";
player_downloaded: "Downloaded" , "Загружено";
player_speed: "Speed" , "Скорость";
player_down: "down" , "вниз";
player_up: "up" , "вверх";
player_peers: "peers" , "пиры";
player_live: "live" , "активных";
player_seen: "seen" , "видели";
player_eta: "eta" , "осталось";
player_loading_history: "Loading history..." , "Загрузка истории...";
player_failed_load_history: "Failed to load history" , "Не удалось загрузить историю";
player_total_plays: "total plays" , "прослушиваний всего";
player_play_history: "Play history" , "История прослушиваний";
player_no_plays_yet: "No plays yet" , "Прослушиваний пока нет";
player_page: "Page" , "Страница";
player_of: "of" , "из";
player_choose_torrent: "Choose local files, paste a magnet link, or choose a .torrent file." , "Выберите локальные файлы, вставьте magnet-ссылку или выберите .torrent файл.";
player_uploading_files: "Uploading files..." , "Загружаю файлы...";
player_upload_complete: "Upload complete. Files are queued for processing." , "Загрузка завершена. Файлы поставлены в обработку.";
player_upload_failed: "Upload failed" , "Загрузка не удалась";
player_reading_torrent: "Reading torrent file..." , "Читаю torrent-файл...";
player_resolving_magnet: "Resolving magnet metadata. This can take a while..." , "Получаю метаданные magnet-ссылки. Это может занять время...";
player_preview_failed: "Preview failed" , "Предпросмотр не удался";
player_all_files_selected: "All files are selected by default. Clear or adjust the tree before download." , "Все файлы выбраны по умолчанию. Перед скачиванием можно очистить или изменить выбор.";
player_opening_saved_torrent: "Opening saved torrent..." , "Открываю сохранённый торрент...";
player_saved_torrent_opened: "Saved torrent opened. Adjust files or resume download." , "Сохранённый торрент открыт. Можно изменить файлы или продолжить скачивание.";
player_remove_torrent_confirm: "Remove this torrent from the client list? Downloaded files will stay on disk." , "Удалить этот торрент из списка клиента? Скачанные файлы останутся на диске.";
player_torrent_removed: "Torrent removed from the client list." , "Торрент удалён из списка клиента.";
player_select_one_file: "Select at least one file." , "Выберите хотя бы один файл.";
player_starting_download: "Starting download..." , "Запускаю скачивание...";
player_download_started: "Download started. Files will move to inbox when complete." , "Скачивание началось. После завершения файлы будут перенесены во входящие.";
player_pausing_download: "Pausing download..." , "Ставлю скачивание на паузу...";
player_download_paused: "Download paused. Start again when you are ready." , "Скачивание на паузе. Можно продолжить позже.";
player_status_failed: "Status failed" , "Не удалось получить статус";
player_start_failed: "Start failed" , "Не удалось запустить";
player_pause_failed: "Pause failed" , "Не удалось поставить на паузу";
player_load_torrents_failed: "Could not load torrents" , "Не удалось загрузить торренты";
player_open_torrent_failed: "Could not open torrent" , "Не удалось открыть торрент";
player_delete_torrent_failed: "Could not delete torrent" , "Не удалось удалить торрент";
player_load_ai_queue_failed: "Could not load AI queue" , "Не удалось загрузить очередь ИИ";
} }
+96
View File
@@ -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)
}
}
+249
View File
@@ -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()
}
+34
View File
@@ -0,0 +1,34 @@
use crate::lastfm;
use crate::scheduler::{Job, JobContext, JobLog};
pub struct LastfmScrobbleJob;
#[async_trait::async_trait]
impl Job for LastfmScrobbleJob {
fn name(&self) -> &'static str {
"lastfm_scrobble"
}
fn description(&self) -> &'static str {
"Send queued Last.fm scrobbles for connected users"
}
fn default_cron(&self) -> &'static str {
// Every minute.
"0 * * * * *"
}
async fn run(&self, ctx: &JobContext, log: &mut JobLog) -> anyhow::Result<()> {
if !lastfm::is_configured(&ctx.config) {
log.warn("Last.fm API key/shared secret are not configured; skipping scrobble outbox");
return Ok(());
}
let summary = lastfm::process_pending_scrobbles(&ctx.pool, &ctx.config, None, 50).await?;
log.info(&format!(
"Last.fm scrobble outbox processed: considered={}, sent={}, failed={}, blocked={}, skipped={}",
summary.considered, summary.sent, summary.failed, summary.blocked, summary.skipped
));
Ok(())
}
}
+3
View File
@@ -1,8 +1,11 @@
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 lastfm_scrobble;
pub mod metadata_backfill; pub mod metadata_backfill;
use std::path::{Component, Path, PathBuf}; use std::path::{Component, Path, PathBuf};
+619
View File
@@ -0,0 +1,619 @@
use std::collections::BTreeMap;
use std::time::Duration;
use anyhow::Context;
use md5::{Digest, Md5};
use reqwest::Client;
use serde::Deserialize;
use sqlx::PgPool;
use crate::config::AppConfig;
const LASTFM_API_URL: &str = "https://ws.audioscrobbler.com/2.0/";
const MAX_BATCH_SIZE: i64 = 50;
const MAX_ATTEMPTS: i32 = 8;
#[derive(Debug, Clone)]
pub struct LastfmCredentials {
api_key: String,
shared_secret: String,
}
#[derive(Debug, Clone)]
pub struct LastfmSession {
pub username: String,
pub session_key: String,
}
#[derive(Debug, Clone)]
pub struct LastfmTrackPayload {
pub artist: String,
pub track: String,
pub album: Option<String>,
pub album_artist: Option<String>,
pub track_number: Option<i32>,
pub duration_seconds: Option<i32>,
}
#[derive(Debug, Clone)]
pub struct LastfmScrobblePayload {
pub track: LastfmTrackPayload,
pub timestamp: i64,
}
#[derive(Debug)]
pub struct LastfmApiError {
pub code: Option<i32>,
pub message: String,
}
impl std::fmt::Display for LastfmApiError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self.code {
Some(code) => write!(f, "Last.fm API error {code}: {}", self.message),
None => write!(f, "Last.fm API error: {}", self.message),
}
}
}
impl std::error::Error for LastfmApiError {}
impl LastfmApiError {
fn new(code: Option<i32>, message: impl Into<String>) -> Self {
Self {
code,
message: message.into(),
}
}
pub fn is_invalid_session(&self) -> bool {
self.code == Some(9)
}
pub fn is_retryable(&self) -> bool {
matches!(self.code, Some(11 | 16 | 29) | None)
}
}
#[derive(Debug, Default)]
pub struct ScrobbleProcessSummary {
pub considered: u64,
pub sent: u64,
pub failed: u64,
pub blocked: u64,
pub skipped: u64,
}
pub fn is_configured(config: &AppConfig) -> bool {
!config.lastfm_api_key.trim().is_empty() && !config.lastfm_shared_secret.trim().is_empty()
}
impl LastfmCredentials {
pub fn from_config(config: &AppConfig) -> Option<Self> {
let api_key = config.lastfm_api_key.trim();
let shared_secret = config.lastfm_shared_secret.trim();
if api_key.is_empty() || shared_secret.is_empty() {
return None;
}
Some(Self {
api_key: api_key.to_owned(),
shared_secret: shared_secret.to_owned(),
})
}
pub fn api_key(&self) -> &str {
&self.api_key
}
}
pub struct LastfmClient {
client: Client,
credentials: LastfmCredentials,
}
impl LastfmClient {
pub fn new(credentials: LastfmCredentials) -> anyhow::Result<Self> {
let client = Client::builder()
.user_agent(format!(
"furumusic-lastfm-scrobbler/{}",
env!("CARGO_PKG_VERSION")
))
.timeout(Duration::from_secs(15))
.build()
.context("failed to build Last.fm HTTP client")?;
Ok(Self {
client,
credentials,
})
}
pub async fn get_session(&self, token: &str) -> Result<LastfmSession, LastfmApiError> {
let params = self.signed_params(
"auth.getSession",
None,
vec![("token".to_string(), token.to_string())],
);
let body = self.post(params).await?;
let response: AuthSessionResponse = serde_json::from_str(&body)
.map_err(|err| LastfmApiError::new(None, err.to_string()))?;
if let Some(code) = response.error {
return Err(LastfmApiError::new(
Some(code),
response
.message
.unwrap_or_else(|| "authentication failed".to_string()),
));
}
let Some(session) = response.session else {
return Err(LastfmApiError::new(
None,
"Last.fm auth response did not include a session",
));
};
Ok(LastfmSession {
username: session.name,
session_key: session.key,
})
}
pub async fn update_now_playing(
&self,
session_key: &str,
track: &LastfmTrackPayload,
) -> Result<(), LastfmApiError> {
let mut extra = vec![
("artist".to_string(), track.artist.clone()),
("track".to_string(), track.track.clone()),
];
push_optional(&mut extra, "album", track.album.as_deref());
push_optional(&mut extra, "albumArtist", track.album_artist.as_deref());
push_optional_i32(&mut extra, "trackNumber", track.track_number);
push_optional_i32(&mut extra, "duration", track.duration_seconds);
let params = self.signed_params("track.updateNowPlaying", Some(session_key), extra);
let body = self.post(params).await?;
check_lastfm_error(&body)
}
pub async fn scrobble_batch(
&self,
session_key: &str,
scrobbles: &[LastfmScrobblePayload],
) -> Result<(), LastfmApiError> {
let mut extra = Vec::new();
for (index, scrobble) in scrobbles.iter().take(MAX_BATCH_SIZE as usize).enumerate() {
let suffix = format!("[{index}]");
extra.push((format!("artist{suffix}"), scrobble.track.artist.clone()));
extra.push((format!("track{suffix}"), scrobble.track.track.clone()));
extra.push((format!("timestamp{suffix}"), scrobble.timestamp.to_string()));
push_optional(
&mut extra,
&format!("album{suffix}"),
scrobble.track.album.as_deref(),
);
push_optional(
&mut extra,
&format!("albumArtist{suffix}"),
scrobble.track.album_artist.as_deref(),
);
push_optional_i32(
&mut extra,
&format!("trackNumber{suffix}"),
scrobble.track.track_number,
);
push_optional_i32(
&mut extra,
&format!("duration{suffix}"),
scrobble.track.duration_seconds,
);
}
let params = self.signed_params("track.scrobble", Some(session_key), extra);
let body = self.post(params).await?;
check_lastfm_error(&body)
}
fn signed_params(
&self,
method: &str,
session_key: Option<&str>,
extra: Vec<(String, String)>,
) -> Vec<(String, String)> {
let mut params = BTreeMap::new();
params.insert("api_key".to_string(), self.credentials.api_key.clone());
params.insert("method".to_string(), method.to_string());
if let Some(session_key) = session_key {
params.insert("sk".to_string(), session_key.to_string());
}
for (key, value) in extra {
params.insert(key, value);
}
let mut signature_input = String::new();
for (key, value) in &params {
signature_input.push_str(key);
signature_input.push_str(value);
}
signature_input.push_str(&self.credentials.shared_secret);
let digest = Md5::digest(signature_input.as_bytes());
let api_sig = format!("{digest:x}");
let mut out = params.into_iter().collect::<Vec<_>>();
out.push(("api_sig".to_string(), api_sig));
out.push(("format".to_string(), "json".to_string()));
out
}
async fn post(&self, params: Vec<(String, String)>) -> Result<String, LastfmApiError> {
let response = self
.client
.post(LASTFM_API_URL)
.form(&params)
.send()
.await
.map_err(|err| LastfmApiError::new(None, err.to_string()))?;
let status = response.status();
let body = response
.text()
.await
.map_err(|err| LastfmApiError::new(None, err.to_string()))?;
if !status.is_success() {
if let Some(err) = parse_error(&body) {
return Err(err);
}
return Err(LastfmApiError::new(None, format!("HTTP {status}: {body}")));
}
Ok(body)
}
}
pub async fn process_pending_scrobbles(
pool: &PgPool,
config: &AppConfig,
user_id: Option<i64>,
limit_per_user: i64,
) -> anyhow::Result<ScrobbleProcessSummary> {
let Some(credentials) = LastfmCredentials::from_config(config) else {
return Ok(ScrobbleProcessSummary::default());
};
let client = LastfmClient::new(credentials)?;
let user_ids = pending_user_ids(pool, user_id).await?;
let mut summary = ScrobbleProcessSummary::default();
for uid in user_ids {
let rows = fetch_pending_scrobbles(pool, uid, limit_per_user.min(MAX_BATCH_SIZE)).await?;
if rows.is_empty() {
continue;
}
summary.considered += rows.len() as u64;
let mut ids = Vec::new();
let mut attempt_rows = Vec::new();
let mut payloads = Vec::new();
for row in &rows {
match row.payload() {
Some(payload) => {
ids.push(row.id);
attempt_rows.push((row.id, row.attempt_count));
payloads.push(payload);
}
None => {
mark_row_failed(pool, row.id, "track has no primary Last.fm artist").await?;
summary.skipped += 1;
}
}
}
if ids.is_empty() {
continue;
}
match client.scrobble_batch(&rows[0].session_key, &payloads).await {
Ok(()) => {
mark_rows_sent(pool, &ids).await?;
clear_account_error(pool, uid).await?;
summary.sent += ids.len() as u64;
}
Err(err) if err.is_invalid_session() => {
mark_account_reauth_required(pool, uid, &err.to_string()).await?;
mark_rows_blocked(pool, &ids, &err.to_string()).await?;
summary.blocked += ids.len() as u64;
}
Err(err) => {
mark_rows_retry_or_failed(pool, &attempt_rows, &err).await?;
summary.failed += ids.len() as u64;
if err.code == Some(29) {
break;
}
}
}
}
Ok(summary)
}
#[derive(Debug, Deserialize)]
struct AuthSessionResponse {
session: Option<AuthSession>,
error: Option<i32>,
message: Option<String>,
}
#[derive(Debug, Deserialize)]
struct AuthSession {
name: String,
key: String,
}
#[derive(Debug, Deserialize)]
struct ErrorEnvelope {
error: Option<i32>,
message: Option<String>,
}
#[derive(Debug, sqlx::FromRow)]
struct PendingScrobbleRow {
id: i64,
started_at: i64,
duration_seconds: i32,
attempt_count: i32,
session_key: String,
title: String,
artist_name: Option<String>,
album_title: Option<String>,
album_artist_name: Option<String>,
track_number: Option<i32>,
}
impl PendingScrobbleRow {
fn payload(&self) -> Option<LastfmScrobblePayload> {
let artist = self
.artist_name
.as_deref()
.map(str::trim)
.filter(|value| !value.is_empty())?
.to_string();
Some(LastfmScrobblePayload {
track: LastfmTrackPayload {
artist,
track: self.title.clone(),
album: non_empty(self.album_title.as_deref()),
album_artist: non_empty(self.album_artist_name.as_deref()),
track_number: self.track_number,
duration_seconds: Some(self.duration_seconds),
},
timestamp: self.started_at,
})
}
}
fn non_empty(value: Option<&str>) -> Option<String> {
value
.map(str::trim)
.filter(|value| !value.is_empty())
.map(ToOwned::to_owned)
}
fn push_optional(params: &mut Vec<(String, String)>, key: &str, value: Option<&str>) {
if let Some(value) = value.map(str::trim).filter(|value| !value.is_empty()) {
params.push((key.to_string(), value.to_string()));
}
}
fn push_optional_i32(params: &mut Vec<(String, String)>, key: &str, value: Option<i32>) {
if let Some(value) = value {
params.push((key.to_string(), value.to_string()));
}
}
fn check_lastfm_error(body: &str) -> Result<(), LastfmApiError> {
if let Some(err) = parse_error(body) {
return Err(err);
}
Ok(())
}
fn parse_error(body: &str) -> Option<LastfmApiError> {
let envelope: ErrorEnvelope = serde_json::from_str(body).ok()?;
envelope
.error
.map(|code| LastfmApiError::new(Some(code), envelope.message.unwrap_or_default()))
}
async fn pending_user_ids(pool: &PgPool, user_id: Option<i64>) -> anyhow::Result<Vec<i64>> {
if let Some(user_id) = user_id {
return Ok(vec![user_id]);
}
let rows = sqlx::query_scalar::<_, i64>(
r#"SELECT DISTINCT o.user_id
FROM furumusic__lastfm_scrobble_outbox o
JOIN furumusic__lastfm_account a ON a.user_id = o.user_id
WHERE o.status IN ('pending', 'retry')
AND a.reauth_required = false
ORDER BY o.user_id"#,
)
.fetch_all(pool)
.await?;
Ok(rows)
}
async fn fetch_pending_scrobbles(
pool: &PgPool,
user_id: i64,
limit: i64,
) -> anyhow::Result<Vec<PendingScrobbleRow>> {
let rows = sqlx::query_as::<_, PendingScrobbleRow>(
r#"SELECT o.id,
o.started_at,
o.duration_seconds,
o.attempt_count,
a.session_key::text AS session_key,
t.title::text AS title,
r.title::text AS album_title,
t.track_number,
(
SELECT ar.name::text
FROM furumusic__track_artist ta
JOIN furumusic__artist ar ON ar.id = ta.artist_id
WHERE ta.track_id = t.id AND ta.role <> 'featuring'
ORDER BY ta.position
LIMIT 1
) AS artist_name,
(
SELECT ar.name::text
FROM furumusic__release_artist ra
JOIN furumusic__artist ar ON ar.id = ra.artist_id
WHERE ra.release_id = r.id
ORDER BY ra.position
LIMIT 1
) AS album_artist_name
FROM furumusic__lastfm_scrobble_outbox o
JOIN furumusic__lastfm_account a ON a.user_id = o.user_id
JOIN furumusic__track t ON t.id = o.track_id
LEFT JOIN furumusic__release r ON r.id = t.release_id
WHERE o.user_id = $1
AND o.status IN ('pending', 'retry')
AND a.reauth_required = false
ORDER BY o.created_at, o.id
LIMIT $2"#,
)
.bind(user_id)
.bind(limit)
.fetch_all(pool)
.await?;
Ok(rows)
}
async fn clear_account_error(pool: &PgPool, user_id: i64) -> anyhow::Result<()> {
sqlx::query(
r#"UPDATE furumusic__lastfm_account
SET last_error = NULL,
reauth_required = false,
updated_at = $2
WHERE user_id = $1"#,
)
.bind(user_id)
.bind(now_iso())
.execute(pool)
.await?;
Ok(())
}
async fn mark_account_reauth_required(
pool: &PgPool,
user_id: i64,
error: &str,
) -> anyhow::Result<()> {
sqlx::query(
r#"UPDATE furumusic__lastfm_account
SET reauth_required = true,
last_error = $2,
updated_at = $3
WHERE user_id = $1"#,
)
.bind(user_id)
.bind(error)
.bind(now_iso())
.execute(pool)
.await?;
Ok(())
}
async fn mark_rows_sent(pool: &PgPool, ids: &[i64]) -> anyhow::Result<()> {
if ids.is_empty() {
return Ok(());
}
let now = now_iso();
sqlx::query(
r#"UPDATE furumusic__lastfm_scrobble_outbox
SET status = 'sent',
updated_at = $2,
scrobbled_at = $2,
last_error = NULL
WHERE id = ANY($1)"#,
)
.bind(ids)
.bind(now)
.execute(pool)
.await?;
Ok(())
}
async fn mark_row_failed(pool: &PgPool, id: i64, error: &str) -> anyhow::Result<()> {
sqlx::query(
r#"UPDATE furumusic__lastfm_scrobble_outbox
SET status = 'failed',
attempt_count = attempt_count + 1,
last_error = $2,
updated_at = $3
WHERE id = $1"#,
)
.bind(id)
.bind(error)
.bind(now_iso())
.execute(pool)
.await?;
Ok(())
}
async fn mark_rows_blocked(pool: &PgPool, ids: &[i64], error: &str) -> anyhow::Result<()> {
if ids.is_empty() {
return Ok(());
}
sqlx::query(
r#"UPDATE furumusic__lastfm_scrobble_outbox
SET status = 'blocked',
attempt_count = attempt_count + 1,
last_error = $2,
updated_at = $3
WHERE id = ANY($1)"#,
)
.bind(ids)
.bind(error)
.bind(now_iso())
.execute(pool)
.await?;
Ok(())
}
async fn mark_rows_retry_or_failed(
pool: &PgPool,
rows: &[(i64, i32)],
error: &LastfmApiError,
) -> anyhow::Result<()> {
if rows.is_empty() {
return Ok(());
}
let ids: Vec<i64> = rows.iter().map(|(id, _)| *id).collect();
let next_status = if error.is_retryable()
&& rows
.iter()
.any(|(_, attempt_count)| attempt_count + 1 < MAX_ATTEMPTS)
{
"retry"
} else {
"failed"
};
sqlx::query(
r#"UPDATE furumusic__lastfm_scrobble_outbox
SET status = CASE
WHEN attempt_count + 1 >= $2 THEN 'failed'
ELSE $3
END,
attempt_count = attempt_count + 1,
last_error = $4,
updated_at = $5
WHERE id = ANY($1)"#,
)
.bind(&ids)
.bind(MAX_ATTEMPTS)
.bind(next_status)
.bind(error.to_string())
.bind(now_iso())
.execute(pool)
.await?;
Ok(())
}
fn now_iso() -> String {
chrono::Utc::now().format("%Y-%m-%dT%H:%M:%SZ").to_string()
}
+4
View File
@@ -5,6 +5,7 @@ mod auth;
mod config; mod config;
mod i18n; mod i18n;
mod jobs; mod jobs;
mod lastfm;
mod music; mod music;
mod oidc; mod oidc;
mod player; mod player;
@@ -52,7 +53,10 @@ 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);
registry.register(jobs::lastfm_scrobble::LastfmScrobbleJob);
Arc::new(registry) Arc::new(registry)
} }
+134
View File
@@ -1637,6 +1637,138 @@ 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()];
}
// -- M0033: Last.fm scrobbling -----------------------------------------
#[cot::db::migrations::migration_op]
async fn create_lastfm_scrobbling(
ctx: migrations::MigrationContext<'_>,
) -> cot::db::Result<()> {
ctx.db
.raw(
"CREATE TABLE IF NOT EXISTS furumusic__lastfm_account (
user_id BIGINT PRIMARY KEY,
lastfm_username VARCHAR(255) NOT NULL,
session_key TEXT NOT NULL,
connected_at VARCHAR(32) NOT NULL,
updated_at VARCHAR(32) NOT NULL,
last_error TEXT,
reauth_required BOOLEAN NOT NULL DEFAULT FALSE
)",
)
.await?;
ctx.db
.raw(
"CREATE TABLE IF NOT EXISTS furumusic__lastfm_auth_state (
state VARCHAR(64) PRIMARY KEY,
user_id BIGINT NOT NULL,
created_at VARCHAR(32) NOT NULL
)",
)
.await?;
ctx.db
.raw(
"CREATE TABLE IF NOT EXISTS furumusic__lastfm_scrobble_outbox (
id BIGSERIAL PRIMARY KEY,
user_id BIGINT NOT NULL,
track_id BIGINT NOT NULL,
started_at BIGINT NOT NULL,
listened_seconds INTEGER NOT NULL,
duration_seconds INTEGER NOT NULL,
status VARCHAR(32) NOT NULL,
attempt_count INTEGER NOT NULL DEFAULT 0,
last_error TEXT,
created_at VARCHAR(32) NOT NULL,
updated_at VARCHAR(32) NOT NULL,
scrobbled_at VARCHAR(32),
dedupe_key VARCHAR(128) NOT NULL UNIQUE
)",
)
.await?;
ctx.db
.raw(
"CREATE INDEX IF NOT EXISTS idx_lastfm_scrobble_outbox_status
ON furumusic__lastfm_scrobble_outbox (status, created_at, id)",
)
.await?;
ctx.db
.raw(
"CREATE INDEX IF NOT EXISTS idx_lastfm_scrobble_outbox_user
ON furumusic__lastfm_scrobble_outbox (user_id, status, created_at)",
)
.await?;
Ok(())
}
#[derive(Debug, Copy, Clone)]
pub struct M0033CreateLastfmScrobbling;
impl migrations::Migration for M0033CreateLastfmScrobbling {
const APP_NAME: &'static str = "furumusic";
const MIGRATION_NAME: &'static str = "m_0033_create_lastfm_scrobbling";
const DEPENDENCIES: &'static [migrations::MigrationDependency] =
&[migrations::MigrationDependency::migration(
"furumusic",
"m_0032_create_lastfm_track_popularity",
)];
const OPERATIONS: &'static [Operation] =
&[Operation::custom(create_lastfm_scrobbling).build()];
}
pub const MIGRATIONS: &[&SyncDynMigration] = &[ pub const MIGRATIONS: &[&SyncDynMigration] = &[
&M0006CreateMediaFile, &M0006CreateMediaFile,
&M0007CreateArtist, &M0007CreateArtist,
@@ -1659,5 +1791,7 @@ pub mod db_migrations {
&M0029AddPlaybackVolume, &M0029AddPlaybackVolume,
&M0030AddMediaFileUploader, &M0030AddMediaFileUploader,
&M0031CreateTorrentSession, &M0031CreateTorrentSession,
&M0032CreateLastfmTrackPopularity,
&M0033CreateLastfmScrobbling,
]; ];
} }
+1 -5
View File
@@ -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,
+45
View File
@@ -55,6 +55,8 @@ pub(super) struct TrackItem {
pub(super) duration_seconds: f64, pub(super) duration_seconds: f64,
pub(super) artists: Vec<ArtistRef>, pub(super) artists: Vec<ArtistRef>,
pub(super) featured_artists: Vec<ArtistRef>, pub(super) featured_artists: Vec<ArtistRef>,
pub(super) release_id: i64,
pub(super) release_title: String,
pub(super) release_year: Option<i32>, pub(super) release_year: Option<i32>,
pub(super) cover_url: Option<String>, pub(super) cover_url: Option<String>,
pub(super) stream_url: String, pub(super) stream_url: String,
@@ -64,6 +66,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 +90,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)]
@@ -162,6 +172,41 @@ pub(super) struct UserProfile {
pub(super) stats: UserStats, pub(super) stats: UserStats,
} }
#[derive(Debug, Serialize, JsonSchema)]
pub(super) struct LastfmStatus {
pub(super) configured: bool,
pub(super) connected: bool,
pub(super) username: Option<String>,
pub(super) reauth_required: bool,
pub(super) last_error: Option<String>,
}
#[derive(Debug, Serialize, JsonSchema)]
pub(super) struct LastfmActionResponse {
pub(super) ok: bool,
pub(super) queued: bool,
pub(super) sent: bool,
pub(super) message: Option<String>,
}
#[derive(Debug, Deserialize, JsonSchema)]
pub(super) struct LastfmNowPlayingRequest {
pub(super) track_id: i64,
}
#[derive(Debug, Deserialize, JsonSchema)]
pub(super) struct LastfmScrobbleRequest {
pub(super) track_id: i64,
pub(super) started_at: Option<i64>,
pub(super) listened_seconds: i32,
}
#[derive(Debug, Serialize, JsonSchema)]
pub(super) struct AgentQueueStatus {
pub(super) queued_count: i64,
pub(super) processing_count: i64,
}
#[derive(Debug, Serialize, JsonSchema)] #[derive(Debug, Serialize, JsonSchema)]
pub(super) struct PlayHistoryItem { pub(super) struct PlayHistoryItem {
pub(super) id: i64, pub(super) id: i64,
+5 -4
View File
@@ -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(
+1153 -63
View File
File diff suppressed because it is too large Load Diff
+6
View File
@@ -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,
}
+22
View File
@@ -37,6 +37,8 @@ pub(super) struct TrackRow {
pub(super) duration_seconds: f64, pub(super) duration_seconds: f64,
pub(super) cover_file_id: Option<i64>, pub(super) cover_file_id: Option<i64>,
pub(super) release_cover_file_id: Option<i64>, pub(super) release_cover_file_id: Option<i64>,
pub(super) release_id: i64,
pub(super) release_title: String,
pub(super) release_year: Option<i32>, pub(super) release_year: Option<i32>,
pub(super) uploader_name: String, pub(super) uploader_name: String,
pub(super) audio_format: Option<String>, pub(super) audio_format: Option<String>,
@@ -44,6 +46,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)]
@@ -103,6 +109,8 @@ pub(super) struct PlaylistTrackRow {
pub(super) duration_seconds: f64, pub(super) duration_seconds: f64,
pub(super) cover_file_id: Option<i64>, pub(super) cover_file_id: Option<i64>,
pub(super) release_cover_file_id: Option<i64>, pub(super) release_cover_file_id: Option<i64>,
pub(super) release_id: i64,
pub(super) release_title: String,
pub(super) release_year: Option<i32>, pub(super) release_year: Option<i32>,
pub(super) uploader_name: String, pub(super) uploader_name: String,
pub(super) audio_format: Option<String>, pub(super) audio_format: Option<String>,
@@ -110,6 +118,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 +140,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)]
@@ -158,6 +174,8 @@ pub(super) struct SearchTrackRow {
pub(super) duration_seconds: f64, pub(super) duration_seconds: f64,
pub(super) cover_file_id: Option<i64>, pub(super) cover_file_id: Option<i64>,
pub(super) release_cover_file_id: Option<i64>, pub(super) release_cover_file_id: Option<i64>,
pub(super) release_id: i64,
pub(super) release_title: String,
pub(super) release_year: Option<i32>, pub(super) release_year: Option<i32>,
pub(super) uploader_name: String, pub(super) uploader_name: String,
pub(super) audio_format: Option<String>, pub(super) audio_format: Option<String>,
@@ -165,6 +183,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)]
+14 -1
View File
@@ -460,6 +460,16 @@ impl PendingReview {
self.save(db).await self.save(db).await
} }
pub async fn set_result_json(
&mut self,
db: &Database,
result_json: String,
) -> cot::db::Result<()> {
self.result_json = Some(result_json);
self.updated_at = now_iso();
self.save(db).await
}
pub async fn set_failed(&mut self, db: &Database, error: &str) -> cot::db::Result<()> { pub async fn set_failed(&mut self, db: &Database, error: &str) -> cot::db::Result<()> {
self.status = LimitedString::new("failed").unwrap(); self.status = LimitedString::new("failed").unwrap();
self.error_message = Some(error.to_owned()); self.error_message = Some(error.to_owned());
@@ -1347,7 +1357,10 @@ 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"
&& job_name != "lastfm_scrobble"
{
tracing::warn!(job = job_name, "Skipping: agent_enabled=false"); tracing::warn!(job = job_name, "Skipping: agent_enabled=false");
return; return;
} }
+392 -49
View File
@@ -1,4 +1,4 @@
use std::collections::HashMap; use std::collections::{HashMap, HashSet};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
@@ -98,6 +98,7 @@ pub struct TorrentStartRequest {
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum TorrentJobStatus { enum TorrentJobStatus {
Resolving,
Preview, Preview,
Downloading, Downloading,
Moving, Moving,
@@ -110,6 +111,7 @@ impl TorrentJobStatus {
fn as_str(self) -> &'static str { fn as_str(self) -> &'static str {
match self { match self {
Self::Preview => "preview", Self::Preview => "preview",
Self::Resolving => "resolving",
Self::Downloading => "downloading", Self::Downloading => "downloading",
Self::Moving => "moving", Self::Moving => "moving",
Self::Complete => "complete", Self::Complete => "complete",
@@ -121,6 +123,7 @@ impl TorrentJobStatus {
fn from_str(value: &str) -> Self { fn from_str(value: &str) -> Self {
match value { match value {
"downloading" => Self::Downloading, "downloading" => Self::Downloading,
"resolving" => Self::Resolving,
"moving" => Self::Moving, "moving" => Self::Moving,
"complete" => Self::Complete, "complete" => Self::Complete,
"failed" => Self::Failed, "failed" => Self::Failed,
@@ -194,10 +197,14 @@ impl TorrentSessionRow {
self.status.as_str() self.status.as_str()
}; };
let stats = handle.map(|h| h.stats()); let stats = handle.map(|h| h.stats());
let downloaded_bytes = stats let mut downloaded_bytes = stats
.as_ref() .as_ref()
.map(|s| s.progress_bytes) .map(|s| s.progress_bytes)
.unwrap_or_else(|| i64_to_u64(self.downloaded_bytes)); .unwrap_or_else(|| i64_to_u64(self.downloaded_bytes));
let selected_size = i64_to_u64(self.selected_size);
if status == "complete" {
downloaded_bytes = selected_size;
}
let uploaded_bytes = stats let uploaded_bytes = stats
.as_ref() .as_ref()
.map(|s| s.uploaded_bytes) .map(|s| s.uploaded_bytes)
@@ -210,6 +217,11 @@ impl TorrentSessionRow {
let progress_percent = progress_percent(downloaded_bytes, total_bytes) let progress_percent = progress_percent(downloaded_bytes, total_bytes)
.unwrap_or(self.progress_percent) .unwrap_or(self.progress_percent)
.clamp(0.0, 100.0); .clamp(0.0, 100.0);
let progress_percent = if status == "complete" {
100.0
} else {
progress_percent
};
let live = stats.as_ref().and_then(|s| s.live.as_ref()); let live = stats.as_ref().and_then(|s| s.live.as_ref());
let peer_stats = live.map(|l| &l.snapshot.peer_stats); let peer_stats = live.map(|l| &l.snapshot.peer_stats);
@@ -220,7 +232,7 @@ impl TorrentSessionRow {
status: status.to_string(), status: status.to_string(),
client_state: stats.as_ref().map(|s| s.state.to_string()), client_state: stats.as_ref().map(|s| s.state.to_string()),
total_size: i64_to_u64(self.total_size), total_size: i64_to_u64(self.total_size),
selected_size: i64_to_u64(self.selected_size), selected_size,
downloaded_bytes, downloaded_bytes,
uploaded_bytes, uploaded_bytes,
progress_percent, progress_percent,
@@ -308,10 +320,14 @@ impl TorrentJob {
fn dto(&self) -> TorrentJobDto { fn dto(&self) -> TorrentJobDto {
let stats = self.handle.as_ref().map(|h| h.stats()); let stats = self.handle.as_ref().map(|h| h.stats());
let downloaded_bytes = stats let mut downloaded_bytes = stats
.as_ref() .as_ref()
.map(|s| s.progress_bytes) .map(|s| s.progress_bytes)
.unwrap_or(self.downloaded_bytes); .unwrap_or(self.downloaded_bytes);
let selected_size = self.selected_size();
if self.status == TorrentJobStatus::Complete {
downloaded_bytes = selected_size;
}
let uploaded_bytes = stats let uploaded_bytes = stats
.as_ref() .as_ref()
.map(|s| s.uploaded_bytes) .map(|s| s.uploaded_bytes)
@@ -331,12 +347,16 @@ impl TorrentJob {
status: self.status.as_str().to_string(), status: self.status.as_str().to_string(),
client_state: stats.as_ref().map(|s| s.state.to_string()), client_state: stats.as_ref().map(|s| s.state.to_string()),
total_size: self.total_size(), total_size: self.total_size(),
selected_size: self.selected_size(), selected_size,
downloaded_bytes, downloaded_bytes,
uploaded_bytes, uploaded_bytes,
progress_percent: progress_percent(downloaded_bytes, total_bytes) progress_percent: if self.status == TorrentJobStatus::Complete {
.unwrap_or(self.progress_percent) 100.0
.clamp(0.0, 100.0), } else {
progress_percent(downloaded_bytes, total_bytes)
.unwrap_or(self.progress_percent)
.clamp(0.0, 100.0)
},
download_speed_mbps: live.map(|l| l.download_speed.mbps), download_speed_mbps: live.map(|l| l.download_speed.mbps),
upload_speed_mbps: live.map(|l| l.upload_speed.mbps), upload_speed_mbps: live.map(|l| l.upload_speed.mbps),
peers_live: peer_stats.map(|p| p.live), peers_live: peer_stats.map(|p| p.live),
@@ -355,6 +375,7 @@ pub struct TorrentService {
temp_root: PathBuf, temp_root: PathBuf,
session: OnceCell<Arc<Session>>, session: OnceCell<Arc<Session>>,
jobs: Mutex<HashMap<String, TorrentJob>>, jobs: Mutex<HashMap<String, TorrentJob>>,
resolving_jobs: Mutex<HashSet<String>>,
scheduler_handle: Arc<OnceCell<Arc<SchedulerHandle>>>, scheduler_handle: Arc<OnceCell<Arc<SchedulerHandle>>>,
} }
@@ -364,6 +385,7 @@ impl TorrentService {
temp_root: std::env::temp_dir().join("furumusic").join("torrents"), temp_root: std::env::temp_dir().join("furumusic").join("torrents"),
session: OnceCell::new(), session: OnceCell::new(),
jobs: Mutex::new(HashMap::new()), jobs: Mutex::new(HashMap::new()),
resolving_jobs: Mutex::new(HashSet::new()),
scheduler_handle, scheduler_handle,
} }
} }
@@ -387,7 +409,11 @@ impl TorrentService {
.cloned() .cloned()
} }
pub async fn list(&self, pool: &PgPool, user_id: i64) -> anyhow::Result<Vec<TorrentJobDto>> { pub async fn list(
self: &Arc<Self>,
pool: &PgPool,
user_id: i64,
) -> anyhow::Result<Vec<TorrentJobDto>> {
let rows = sqlx::query_as::<_, TorrentSessionRow>( let rows = sqlx::query_as::<_, TorrentSessionRow>(
r#"SELECT id, user_id, name, info_hash, source_kind, source_label, torrent_bytes, r#"SELECT id, user_id, name, info_hash, source_kind, source_label, torrent_bytes,
files_json, selected_files_json, status, total_size, selected_size, files_json, selected_files_json, status, total_size, selected_size,
@@ -395,7 +421,7 @@ impl TorrentService {
created_at, updated_at, completed_at created_at, updated_at, completed_at
FROM furumusic__torrent_session FROM furumusic__torrent_session
WHERE user_id = $1 WHERE user_id = $1
ORDER BY updated_at DESC, created_at DESC ORDER BY created_at DESC, id DESC
LIMIT $2"#, LIMIT $2"#,
) )
.bind(user_id) .bind(user_id)
@@ -410,6 +436,21 @@ impl TorrentService {
.collect::<HashMap<_, _>>() .collect::<HashMap<_, _>>()
}; };
for row in rows.iter().filter(|row| row.status == "resolving") {
if row.source_kind == "magnet" {
if let Some(magnet) = row.source_label.clone() {
self.spawn_resolve_pending_magnet(
pool.clone(),
user_id,
row.id.clone(),
magnet,
row.created_at.clone(),
)
.await;
}
}
}
Ok(rows Ok(rows
.iter() .iter()
.map(|row| row.dto(handles.get(&row.id))) .map(|row| row.dto(handles.get(&row.id)))
@@ -438,7 +479,7 @@ impl TorrentService {
} }
pub async fn preview( pub async fn preview(
&self, self: &Arc<Self>,
pool: &PgPool, pool: &PgPool,
user_id: i64, user_id: i64,
request: TorrentPreviewRequest, request: TorrentPreviewRequest,
@@ -456,42 +497,50 @@ impl TorrentService {
.filter(|s| !s.is_empty()) .filter(|s| !s.is_empty())
.map(str::to_owned); .map(str::to_owned);
let add = match request.kind { if matches!(request.kind, TorrentPreviewKind::Magnet) {
TorrentPreviewKind::Magnet => { let magnet = request
let magnet = request .magnet
.magnet .as_deref()
.as_deref() .map(str::trim)
.map(str::trim) .filter(|s| !s.is_empty())
.filter(|s| !s.is_empty()) .context("magnet link is empty")?
.context("magnet link is empty")?; .to_string();
AddTorrent::from_url(magnet.to_string()) let info_hash = extract_magnet_info_hash(&magnet).context("invalid magnet link")?;
} let name = magnet_display_name(&magnet)
TorrentPreviewKind::TorrentFile => { .or(source_label)
let encoded = request .unwrap_or_else(|| info_hash.clone());
.torrent_base64 let now = now_string();
.as_deref() insert_pending_magnet(pool, &id, user_id, &name, &info_hash, &magnet, &now).await?;
.filter(|s| !s.is_empty()) self.spawn_resolve_pending_magnet(pool.clone(), user_id, id.clone(), magnet, now)
.context("torrent file is empty")?; .await;
let bytes = base64::engine::general_purpose::STANDARD
.decode(encoded)
.context("invalid torrent file encoding")?;
AddTorrent::from_bytes(bytes)
}
};
let response = tokio::time::timeout( let row = load_row(pool, user_id, &id).await?;
METADATA_TIMEOUT, return Ok(TorrentSessionDto {
session.add_torrent( job: row.dto(None),
add, preview: row.preview()?,
selected_files: row.selected_files(),
});
}
let encoded = request
.torrent_base64
.as_deref()
.filter(|s| !s.is_empty())
.context("torrent file is empty")?;
let bytes = base64::engine::general_purpose::STANDARD
.decode(encoded)
.context("invalid torrent file encoding")?;
let response = session
.add_torrent(
AddTorrent::from_bytes(bytes),
Some(AddTorrentOptions { Some(AddTorrentOptions {
list_only: true, list_only: true,
output_folder: Some(output_dir.to_string_lossy().to_string()), output_folder: Some(output_dir.to_string_lossy().to_string()),
..Default::default() ..Default::default()
}), }),
), )
) .await?;
.await
.context("timed out while resolving torrent metadata")??;
let AddTorrentResponse::ListOnly(list) = response else { let AddTorrentResponse::ListOnly(list) = response else {
bail!("torrent was unexpectedly added instead of previewed"); bail!("torrent was unexpectedly added instead of previewed");
@@ -555,6 +604,114 @@ impl TorrentService {
Ok(dto) Ok(dto)
} }
async fn spawn_resolve_pending_magnet(
self: &Arc<Self>,
pool: PgPool,
user_id: i64,
id: String,
magnet: String,
created_at: String,
) {
{
let mut resolving = self.resolving_jobs.lock().await;
if !resolving.insert(id.clone()) {
return;
}
}
let service = Arc::clone(self);
tokio::spawn(async move {
let result = service
.resolve_pending_magnet(&pool, user_id, &id, &magnet, &created_at)
.await;
if let Err(err) = result {
update_resolving_error(&pool, &id, &err.to_string()).await;
}
service.resolving_jobs.lock().await.remove(&id);
});
}
async fn resolve_pending_magnet(
&self,
pool: &PgPool,
user_id: i64,
id: &str,
magnet: &str,
created_at: &str,
) -> anyhow::Result<()> {
let session = self.session().await?;
let output_dir = self.temp_root.join(id).join("download");
tokio::fs::create_dir_all(&output_dir).await?;
let response = tokio::time::timeout(
METADATA_TIMEOUT,
session.add_torrent(
AddTorrent::from_url(magnet.to_string()),
Some(AddTorrentOptions {
list_only: true,
output_folder: Some(output_dir.to_string_lossy().to_string()),
..Default::default()
}),
),
)
.await
.context("timed out while resolving torrent metadata")??;
let AddTorrentResponse::ListOnly(list) = response else {
bail!("torrent was unexpectedly added instead of previewed");
};
let name = list
.info
.name
.as_ref()
.map(|b| String::from_utf8_lossy(b.as_ref()).to_string())
.filter(|s| !s.is_empty())
.or_else(|| magnet_display_name(magnet))
.unwrap_or_else(|| list.info_hash.as_string());
let mut files = Vec::new();
for (index, details) in list.info.iter_file_details()?.enumerate() {
let name = details
.filename
.to_string()
.unwrap_or_else(|_| "<invalid filename>".to_string());
files.push(TorrentFileDto {
index,
name,
components: details.filename.to_vec().unwrap_or_default(),
length: details.len,
selected: true,
});
}
let selected_files = files.iter().map(|f| f.index).collect::<Vec<_>>();
let job = TorrentJob {
id: id.to_string(),
user_id,
name,
info_hash: list.info_hash.as_string(),
source_kind: "magnet".to_string(),
source_label: Some(magnet.to_string()),
torrent_bytes: list.torrent_bytes.to_vec(),
files,
status: TorrentJobStatus::Preview,
output_dir,
selected_files,
handle: None,
downloaded_bytes: 0,
uploaded_bytes: 0,
progress_percent: 0.0,
error: None,
created_at: created_at.to_string(),
updated_at: now_string(),
completed_at: None,
};
update_resolved_job(pool, &job).await?;
self.jobs.lock().await.insert(id.to_string(), job);
Ok(())
}
pub async fn status( pub async fn status(
&self, &self,
pool: &PgPool, pool: &PgPool,
@@ -589,13 +746,12 @@ 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) .await?;
.await?;
if result.rows_affected() == 0 { if result.rows_affected() == 0 {
bail!("torrent session not found"); bail!("torrent session not found");
@@ -627,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)?;
@@ -687,6 +848,9 @@ impl TorrentService {
let id = id.to_string(); let id = id.to_string();
tokio::spawn(async move { tokio::spawn(async move {
if let Err(err) = handle.wait_until_completed().await { if let Err(err) = handle.wait_until_completed().await {
if service.is_paused(&id).await {
return;
}
service.stop_torrent(&handle).await; service.stop_torrent(&handle).await;
service.fail_job(&pool, &id, err.to_string()).await; service.fail_job(&pool, &id, err.to_string()).await;
return; return;
@@ -703,6 +867,34 @@ impl TorrentService {
Ok(dto) Ok(dto)
} }
pub async fn pause(
&self,
pool: &PgPool,
user_id: i64,
id: &str,
) -> anyhow::Result<TorrentJobDto> {
self.ensure_memory_job(pool, user_id, id).await?;
let (dto, handle) = {
let mut jobs = self.jobs.lock().await;
let job = jobs.get_mut(id).context("torrent job not found")?;
if job.user_id != user_id {
bail!("torrent job not found");
}
job.refresh_progress();
job.status = TorrentJobStatus::Paused;
job.updated_at = now_string();
let handle = job.handle.take();
(job.dto(), handle)
};
persist_progress(pool, &dto).await?;
if let Some(handle) = handle {
self.stop_torrent(&handle).await;
}
Ok(dto)
}
async fn memory_details(&self, user_id: i64, id: &str) -> Option<TorrentSessionDto> { async fn memory_details(&self, user_id: i64, id: &str) -> Option<TorrentSessionDto> {
let jobs = self.jobs.lock().await; let jobs = self.jobs.lock().await;
let job = jobs.get(id)?; let job = jobs.get(id)?;
@@ -733,6 +925,13 @@ impl TorrentService {
Ok(job.dto()) Ok(job.dto())
} }
async fn is_paused(&self, id: &str) -> bool {
let jobs = self.jobs.lock().await;
jobs.get(id)
.map(|job| job.status == TorrentJobStatus::Paused)
.unwrap_or(false)
}
async fn fail_job(&self, pool: &PgPool, id: &str, error: String) { async fn fail_job(&self, pool: &PgPool, id: &str, error: String) {
let dto = { let dto = {
let mut jobs = self.jobs.lock().await; let mut jobs = self.jobs.lock().await;
@@ -824,6 +1023,8 @@ impl TorrentService {
let job = jobs.get_mut(id).context("torrent job not found")?; let job = jobs.get_mut(id).context("torrent job not found")?;
job.refresh_progress(); job.refresh_progress();
job.status = TorrentJobStatus::Complete; job.status = TorrentJobStatus::Complete;
job.downloaded_bytes = job.selected_size();
job.progress_percent = 100.0;
job.completed_at = Some(now_string()); job.completed_at = Some(now_string());
job.updated_at = now_string(); job.updated_at = now_string();
let dto = job.dto(); let dto = job.dto();
@@ -892,6 +1093,89 @@ async fn insert_job(pool: &PgPool, job: &TorrentJob) -> anyhow::Result<()> {
Ok(()) Ok(())
} }
async fn insert_pending_magnet(
pool: &PgPool,
id: &str,
user_id: i64,
name: &str,
info_hash: &str,
magnet: &str,
now: &str,
) -> anyhow::Result<()> {
sqlx::query(
r#"INSERT INTO furumusic__torrent_session
(id, user_id, name, info_hash, source_kind, source_label, torrent_bytes,
files_json, selected_files_json, status, total_size, selected_size,
downloaded_bytes, uploaded_bytes, progress_percent, error,
created_at, updated_at, completed_at)
VALUES ($1, $2, $3, $4, 'magnet', $5, $6,
'[]', '[]', 'resolving', 0, 0,
0, 0, 0, NULL,
$7, $8, NULL)"#,
)
.bind(id)
.bind(user_id)
.bind(name)
.bind(info_hash)
.bind(magnet)
.bind(Vec::<u8>::new())
.bind(now)
.bind(now)
.execute(pool)
.await?;
Ok(())
}
async fn update_resolved_job(pool: &PgPool, job: &TorrentJob) -> anyhow::Result<()> {
sqlx::query(
r#"UPDATE furumusic__torrent_session
SET name = $2,
info_hash = $3,
torrent_bytes = $4,
files_json = $5,
selected_files_json = $6,
status = 'preview',
total_size = $7,
selected_size = $8,
downloaded_bytes = 0,
uploaded_bytes = 0,
progress_percent = 0,
error = NULL,
updated_at = $9,
completed_at = NULL
WHERE id = $1"#,
)
.bind(&job.id)
.bind(&job.name)
.bind(&job.info_hash)
.bind(&job.torrent_bytes)
.bind(serde_json::to_string(&job.files)?)
.bind(serde_json::to_string(&job.selected_files)?)
.bind(u64_to_i64(job.total_size()))
.bind(u64_to_i64(job.selected_size()))
.bind(&job.updated_at)
.execute(pool)
.await?;
Ok(())
}
async fn update_resolving_error(pool: &PgPool, id: &str, error: &str) {
if let Err(err) = sqlx::query(
r#"UPDATE furumusic__torrent_session
SET error = $2,
updated_at = $3
WHERE id = $1 AND status = 'resolving'"#,
)
.bind(id)
.bind(error)
.bind(now_string())
.execute(pool)
.await
{
tracing::warn!("failed to persist torrent metadata resolving error: {err}");
}
}
async fn mark_job_started( async fn mark_job_started(
pool: &PgPool, pool: &PgPool,
id: &str, id: &str,
@@ -999,6 +1283,65 @@ fn i64_to_u64(value: i64) -> u64 {
value.max(0) as u64 value.max(0) as u64
} }
fn extract_magnet_info_hash(magnet: &str) -> Option<String> {
if !magnet.starts_with("magnet:?") {
return None;
}
magnet
.split(['?', '&'])
.find_map(|part| part.strip_prefix("xt=urn:btih:"))
.map(|hash| percent_decode(hash).to_ascii_lowercase())
.filter(|hash| !hash.is_empty())
}
fn magnet_display_name(magnet: &str) -> Option<String> {
magnet
.split(['?', '&'])
.find_map(|part| part.strip_prefix("dn="))
.map(percent_decode)
.map(|value| value.trim().to_string())
.filter(|value| !value.is_empty())
}
fn percent_decode(value: &str) -> String {
let bytes = value.as_bytes();
let mut out = Vec::with_capacity(bytes.len());
let mut index = 0;
while index < bytes.len() {
match bytes[index] {
b'+' => {
out.push(b' ');
index += 1;
}
b'%' if index + 2 < bytes.len() => {
let hi = hex_value(bytes[index + 1]);
let lo = hex_value(bytes[index + 2]);
if let (Some(hi), Some(lo)) = (hi, lo) {
out.push((hi << 4) | lo);
index += 3;
} else {
out.push(bytes[index]);
index += 1;
}
}
byte => {
out.push(byte);
index += 1;
}
}
}
String::from_utf8_lossy(&out).to_string()
}
fn hex_value(byte: u8) -> Option<u8> {
match byte {
b'0'..=b'9' => Some(byte - b'0'),
b'a'..=b'f' => Some(byte - b'a' + 10),
b'A'..=b'F' => Some(byte - b'A' + 10),
_ => None,
}
}
fn sanitize_path_component(value: &str) -> String { fn sanitize_path_component(value: &str) -> String {
let sanitized: String = value let sanitized: String = value
.chars() .chars()
+54 -6
View File
@@ -25,28 +25,76 @@
</div> </div>
{% endif %} {% endif %}
{% if review.status_str() == "pending" %}
<h2>{{ t.reviews_result }}</h2>
<form method="post" action="/admin/reviews/{{ review.id_val() }}/approve" style="margin: 1rem 0;">
<table>
<tr>
<td><label for="artist">Artist</label></td>
<td><input name="artist" id="artist" value="{{ edit.artist }}" style="width:100%"></td>
</tr>
<tr>
<td><label for="album">Album</label></td>
<td><input name="album" id="album" value="{{ edit.album }}" style="width:100%"></td>
</tr>
<tr>
<td><label for="title">Title</label></td>
<td><input name="title" id="title" value="{{ edit.title }}" style="width:100%"></td>
</tr>
<tr>
<td><label for="year">Year</label></td>
<td><input name="year" id="year" type="number" min="0" max="3000" value="{{ edit.year }}" style="width:100%"></td>
</tr>
<tr>
<td><label for="track_number">Track</label></td>
<td><input name="track_number" id="track_number" type="number" min="0" value="{{ edit.track_number }}" style="width:100%"></td>
</tr>
<tr>
<td><label for="genre">Genre</label></td>
<td><input name="genre" id="genre" value="{{ edit.genre }}" style="width:100%"></td>
</tr>
<tr>
<td><label for="featured_artists">Featured artists</label></td>
<td><input name="featured_artists" id="featured_artists" value="{{ edit.featured_artists }}" style="width:100%"></td>
</tr>
<tr>
<td><label for="release_type">{{ t.releases_type }}</label></td>
<td>
<select name="release_type" id="release_type" style="width:100%; padding:.4rem;">
{% for rt in release_types %}
<option value="{{ rt.0 }}"{% if edit.release_type == rt.0 %} selected{% endif %}>{% if lang_code == "ru" %}{{ rt.2 }}{% else %}{{ rt.1 }}{% endif %} ({{ rt.0 }})</option>
{% endfor %}
</select>
</td>
</tr>
<tr>
<td><label for="notes">Notes</label></td>
<td><textarea name="notes" id="notes" style="width:100%; min-height:4rem;">{{ edit.notes }}</textarea></td>
</tr>
</table>
<button type="submit" style="margin-top:1rem; padding:.4rem 1rem; background:#28a745; color:#fff; border:none; border-radius:4px; cursor:pointer;">{{ t.reviews_approve }}</button>
</form>
<div style="margin: 1rem 0; display: flex; gap: .5rem;"> <div style="margin: 1rem 0; display: flex; gap: .5rem;">
{% if review.status_str() == "pending" %}
<form method="post" action="/admin/reviews/{{ review.id_val() }}/approve" style="display:inline;">
<button type="submit" style="padding:.4rem 1rem; background:#28a745; color:#fff; border:none; border-radius:4px; cursor:pointer;">{{ t.reviews_approve }}</button>
</form>
<form method="post" action="/admin/reviews/{{ review.id_val() }}/reject" style="display:inline;"> <form method="post" action="/admin/reviews/{{ review.id_val() }}/reject" style="display:inline;">
<button type="submit" style="padding:.4rem 1rem; background:#dc3545; color:#fff; border:none; border-radius:4px; cursor:pointer;">{{ t.reviews_reject }}</button> <button type="submit" style="padding:.4rem 1rem; background:#dc3545; color:#fff; border:none; border-radius:4px; cursor:pointer;">{{ t.reviews_reject }}</button>
</form> </form>
{% endif %} </div>
{% else %}
<div style="margin: 1rem 0; display: flex; gap: .5rem;">
{% if review.status_str() == "failed" || review.status_str() == "processing" %} {% if review.status_str() == "failed" || review.status_str() == "processing" %}
<form method="post" action="/admin/reviews/{{ review.id_val() }}/requeue" style="display:inline;" onsubmit="return confirm('{{ t.reviews_requeue_confirm }}');"> <form method="post" action="/admin/reviews/{{ review.id_val() }}/requeue" style="display:inline;" onsubmit="return confirm('{{ t.reviews_requeue_confirm }}');">
<button type="submit" style="padding:.4rem 1rem; background:#17a2b8; color:#fff; border:none; border-radius:4px; cursor:pointer;">{{ t.reviews_requeue }}</button> <button type="submit" style="padding:.4rem 1rem; background:#17a2b8; color:#fff; border:none; border-radius:4px; cursor:pointer;">{{ t.reviews_requeue }}</button>
</form> </form>
{% endif %} {% endif %}
</div> </div>
{% endif %}
{% if !context_pretty.is_empty() %} {% if !context_pretty.is_empty() %}
<h2>{{ t.reviews_context }}</h2> <h2>{{ t.reviews_context }}</h2>
<pre style="background:#f4f4f4; padding:1rem; border-radius:6px; overflow-x:auto; font-size:.85rem;">{{ context_pretty }}</pre> <pre style="background:#f4f4f4; padding:1rem; border-radius:6px; overflow-x:auto; font-size:.85rem;">{{ context_pretty }}</pre>
{% endif %} {% endif %}
{% if !result_pretty.is_empty() %} {% if !result_pretty.is_empty() && review.status_str() != "pending" %}
<h2>{{ t.reviews_result }}</h2> <h2>{{ t.reviews_result }}</h2>
<pre style="background:#f4f4f4; padding:1rem; border-radius:6px; overflow-x:auto; font-size:.85rem;">{{ result_pretty }}</pre> <pre style="background:#f4f4f4; padding:1rem; border-radius:6px; overflow-x:auto; font-size:.85rem;">{{ result_pretty }}</pre>
{% endif %} {% endif %}
+10
View File
@@ -85,6 +85,16 @@
<td><input type="checkbox" name="swagger_enabled" id="swagger_enabled" value="on"{% if swagger_enabled %} checked{% endif %}></td> <td><input type="checkbox" name="swagger_enabled" id="swagger_enabled" value="on"{% if swagger_enabled %} checked{% endif %}></td>
<td><span class="badge badge-{{ swagger_enabled_source }}">{{ swagger_enabled_source }}</span></td> <td><span class="badge badge-{{ swagger_enabled_source }}">{{ swagger_enabled_source }}</span></td>
</tr> </tr>
<tr>
<td><label for="lastfm_api_key">{{ t.settings_lastfm_api_key }}</label><br><span style="font-size:.75rem;color:#999;">{{ t.settings_lastfm_api_key_help }}</span></td>
<td><input type="password" name="lastfm_api_key" id="lastfm_api_key" value="{{ lastfm_api_key }}"></td>
<td><span class="badge badge-{{ lastfm_api_key_source }}">{{ lastfm_api_key_source }}</span></td>
</tr>
<tr>
<td><label for="lastfm_shared_secret">{{ t.settings_lastfm_shared_secret }}</label><br><span style="font-size:.75rem;color:#999;">{{ t.settings_lastfm_shared_secret_help }}</span></td>
<td><input type="password" name="lastfm_shared_secret" id="lastfm_shared_secret" value="{{ lastfm_shared_secret }}"></td>
<td><span class="badge badge-{{ lastfm_shared_secret_source }}">{{ lastfm_shared_secret_source }}</span></td>
</tr>
</table> </table>
<h2>{{ t.settings_agent }}</h2> <h2>{{ t.settings_agent }}</h2>
+1204 -46
View File
File diff suppressed because it is too large Load Diff
+167 -56
View File
@@ -4,14 +4,39 @@
<div class="modal-box info-modal"> <div class="modal-box info-modal">
<div class="info-modal-head"> <div class="info-modal-head">
<h3 x-text="$store.info.modal.title"></h3> <h3 x-text="$store.info.modal.title"></h3>
<button class="mobile-list-action" @click="$store.info.close()" title="Close"> <button class="mobile-list-action" @click="$store.info.close()" title="{{ t.player_close }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<line x1="18" y1="6" x2="6" y2="18"/> <line x1="18" y1="6" x2="6" y2="18"/>
<line x1="6" y1="6" x2="18" y2="18"/> <line x1="6" y1="6" x2="18" y2="18"/>
</svg> </svg>
</button> </button>
</div> </div>
<pre class="info-modal-body" x-text="$store.info.modal.body"></pre> <div class="info-modal-body">
<template x-if="$store.info.modal.rows && $store.info.modal.rows.length">
<table class="info-table">
<tbody>
<template x-for="(row, idx) in $store.info.modal.rows" :key="row.label + '-' + idx">
<tr>
<th x-text="row.label"></th>
<td>
<template x-if="row.links && row.links.length">
<div class="info-link-list">
<template x-for="link in row.links" :key="link.type + '-' + link.id + '-' + link.label">
<button class="info-link" type="button" @click="$store.info.navigate(link)" x-text="link.label"></button>
</template>
</div>
</template>
<template x-if="!row.links || !row.links.length">
<span x-text="row.value"></span>
</template>
</td>
</tr>
</template>
</tbody>
</table>
</template>
<pre class="info-modal-plain" x-show="!$store.info.modal.rows || !$store.info.modal.rows.length" x-text="$store.info.modal.body"></pre>
</div>
</div> </div>
</div> </div>
</template> </template>
@@ -20,13 +45,13 @@
<template x-if="$store.playlists.modal"> <template x-if="$store.playlists.modal">
<div class="modal-overlay" @click.self="$store.playlists.modal = null"> <div class="modal-overlay" @click.self="$store.playlists.modal = null">
<div class="modal-box"> <div class="modal-box">
<h3 x-text="$store.playlists.modal.mode === 'create' ? 'New Playlist' : 'Rename Playlist'"></h3> <h3 x-text="$store.playlists.modal.mode === 'create' ? '{{ t.player_new_playlist }}' : '{{ t.player_rename_playlist }}'"></h3>
<input type="text" x-model="$store.playlists.modal.title" placeholder="Playlist name" <input type="text" x-model="$store.playlists.modal.title" placeholder="{{ t.player_playlist_name }}"
@keydown.enter="$store.playlists.submitModal()" x-init="$nextTick(() => $el.focus())"> @keydown.enter="$store.playlists.submitModal()" x-init="$nextTick(() => $el.focus())">
<div class="modal-footer"> <div class="modal-footer">
<button class="modal-btn modal-btn-ghost" @click="$store.playlists.modal = null">Cancel</button> <button class="modal-btn modal-btn-ghost" @click="$store.playlists.modal = null">{{ t.player_cancel }}</button>
<button class="modal-btn modal-btn-primary" @click="$store.playlists.submitModal()" <button class="modal-btn modal-btn-primary" @click="$store.playlists.submitModal()"
x-text="$store.playlists.modal.mode === 'create' ? 'Create' : 'Save'"></button> x-text="$store.playlists.modal.mode === 'create' ? '{{ t.player_create }}' : '{{ t.player_save }}'"></button>
</div> </div>
</div> </div>
</div> </div>
@@ -36,7 +61,7 @@
<template x-if="$store.playlists.picker"> <template x-if="$store.playlists.picker">
<div class="modal-overlay" @click.self="$store.playlists.picker = null"> <div class="modal-overlay" @click.self="$store.playlists.picker = null">
<div class="modal-box"> <div class="modal-box">
<h3>Add to Playlist</h3> <h3>{{ t.player_add_to_playlist }}</h3>
<div class="modal-playlist-list"> <div class="modal-playlist-list">
<template x-for="pl in $store.playlists.list.filter(p => p.kind === 'user' && p.is_own)" :key="pl.id"> <template x-for="pl in $store.playlists.list.filter(p => p.kind === 'user' && p.is_own)" :key="pl.id">
<div class="modal-playlist-item" @click="$store.playlists.addToPicked(pl.id)"> <div class="modal-playlist-item" @click="$store.playlists.addToPicked(pl.id)">
@@ -46,8 +71,8 @@
</template> </template>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="modal-btn modal-btn-ghost" @click="$store.playlists.picker = null">Cancel</button> <button class="modal-btn modal-btn-ghost" @click="$store.playlists.picker = null">{{ t.player_cancel }}</button>
<button class="modal-btn modal-btn-primary" @click="$store.playlists.picker = null; $store.playlists.showCreate()">New Playlist</button> <button class="modal-btn modal-btn-primary" @click="$store.playlists.picker = null; $store.playlists.showCreate()">{{ t.player_new_playlist }}</button>
</div> </div>
</div> </div>
</div> </div>
@@ -59,84 +84,161 @@
<div class="modal-box torrent-modal"> <div class="modal-box torrent-modal">
<div class="torrent-modal-head"> <div class="torrent-modal-head">
<div> <div>
<h3>Torrent manager</h3> <h3>{{ t.player_torrent_manager }}</h3>
<p class="torrent-message" style="margin:4px 0 0" <p class="torrent-message" style="margin:4px 0 0"
:class="{ error: $store.torrents.error }" :class="{ error: $store.torrents.error }"
x-text="$store.torrents.message"></p> x-text="$store.torrents.message"></p>
</div> </div>
<button class="torrent-modal-close"
@click="$store.torrents.close()"
title="{{ t.player_close }}"
aria-label="{{ t.player_close }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2">
<line x1="18" y1="6" x2="6" y2="18"/>
<line x1="6" y1="6" x2="18" y2="18"/>
</svg>
</button>
<div class="torrent-client-status"> <div class="torrent-client-status">
<span class="torrent-status-pill" <span class="torrent-status-pill"
:class="{ active: $store.torrents.activeCount() > 0 }" :class="{ active: $store.torrents.activeCount() > 0 }"
x-text="$store.torrents.clientSummary()"></span> x-text="$store.torrents.clientSummary()"></span>
<span class="torrent-status-pill torrent-agent-pill"
:class="{ active: $store.torrents.agentBusy() }">
<span class="torrent-agent-dot"></span>
<span x-text="$store.torrents.agentSummary()"></span>
</span>
<span class="torrent-status-pill" <span class="torrent-status-pill"
x-text="$store.torrents.sessions.length + ' saved'"></span> x-text="$store.torrents.sessions.length + ' ' + T.saved"></span>
</div> </div>
</div> </div>
<div class="torrent-manager-layout"> <div class="torrent-manager-layout">
<aside class="torrent-manager-sidebar"> <aside class="torrent-manager-sidebar">
<div class="torrent-manager-title"> <div class="torrent-manager-title">
<span>Saved torrents</span> <span>{{ t.player_saved_torrents }}</span>
<button class="modal-btn modal-btn-ghost" style="padding:4px 8px" <button class="modal-btn modal-btn-ghost" style="padding:4px 8px"
@click="$store.torrents.loadSessions()" @click="$store.torrents.loadSessions()"
:disabled="$store.torrents.loading">Refresh</button> :disabled="$store.torrents.loading">{{ t.player_refresh }}</button>
</div> </div>
<div class="torrent-session-list"> <div class="torrent-session-list">
<template x-if="!$store.torrents.loadingSessions && $store.torrents.sessions.length === 0"> <template x-if="!$store.torrents.loadingSessions && $store.torrents.sessions.length === 0">
<div class="empty-state" style="padding:28px 12px"> <div class="empty-state" style="padding:28px 12px">
<p>No saved torrents</p> <p>{{ t.player_no_saved_torrents }}</p>
</div> </div>
</template> </template>
<template x-for="job in $store.torrents.sessions" :key="job.id"> <template x-for="job in $store.torrents.sessions" :key="job.id">
<div class="torrent-session-row" <div class="torrent-session-row"
:class="{ active: $store.torrents.previewData && $store.torrents.previewData.id === job.id }" :class="{ active: $store.torrents.workspaceMode === 'session' && $store.torrents.previewData && $store.torrents.previewData.id === job.id }"
@click="$store.torrents.openSession(job.id)"> @click="$store.torrents.openSession(job.id)">
<div style="min-width:0"> <div class="torrent-session-main">
<div class="torrent-session-name" x-text="job.name"></div> <div class="torrent-session-topline">
<div class="torrent-session-name" x-text="job.name"></div>
<span class="torrent-status-badge"
:class="$store.torrents.statusBadgeClass(job)"
x-text="$store.torrents.statusLabel(job)"></span>
</div>
<div class="torrent-session-meta" x-text="$store.torrents.sessionMeta(job)"></div> <div class="torrent-session-meta" x-text="$store.torrents.sessionMeta(job)"></div>
<div class="torrent-session-progress">
<div class="torrent-session-progress-bar"
:style="'width:' + $store.torrents.progressValue(job) + '%'"></div>
</div>
</div> </div>
<button class="torrent-session-remove"
@click.stop="$store.torrents.removeSession(job.id)">Delete</button>
</div> </div>
</template> </template>
<button type="button"
class="torrent-session-row torrent-session-add"
:class="{ active: $store.torrents.isImporting() }"
@click="$store.torrents.addNew()"
:disabled="$store.torrents.loading">
<span class="torrent-session-add-icon">+</span>
<span>{{ t.player_upload }}</span>
</button>
</div> </div>
</aside> </aside>
<section class="torrent-workspace"> <section class="torrent-workspace">
<div class="torrent-modal-grid"> <template x-if="$store.torrents.workspaceMode === 'empty'">
<div> <div class="empty-state torrent-workspace-empty">
<label for="torrent-file-input">Torrent file</label> <p x-text="T.chooseSavedOrAddTorrent"></p>
<input id="torrent-file-input" type="file" accept=".torrent,application/x-bittorrent"
@change="$store.torrents.file = $event.target.files[0] || null">
</div> </div>
<div> </template>
<label for="torrent-magnet-input">Magnet link</label>
<input id="torrent-magnet-input" type="text" <template x-if="$store.torrents.isImporting()">
x-model="$store.torrents.magnet" <div class="torrent-import-panel">
placeholder="magnet:?xt=urn:btih:..."> <div class="torrent-modal-grid">
<div>
<label for="local-file-input">{{ t.player_local_files }}</label>
<input id="local-file-input" type="file" multiple accept="audio/*,.mp3,.flac,.wav,.m4a,.ogg,.opus,.aac"
@change="$store.torrents.setLocalFiles($event.target.files)">
<div class="torrent-upload-summary" x-text="$store.torrents.localUploadSummary()"></div>
</div>
<div>
<label for="torrent-magnet-input">{{ t.player_magnet_link }}</label>
<input id="torrent-magnet-input" type="text"
x-model="$store.torrents.magnet"
placeholder="magnet:?xt=urn:btih:...">
</div>
<div>
<label for="torrent-file-input">{{ t.player_torrent_file }}</label>
<input id="torrent-file-input" type="file" accept=".torrent,application/x-bittorrent"
@change="$store.torrents.file = $event.target.files[0] || null">
</div>
</div>
<div class="torrent-upload-progress"
x-show="$store.torrents.uploadProgress > 0 || ($store.torrents.localFiles.length > 0 && $store.torrents.loading)">
<div class="torrent-progress-head">
<span x-text="$store.torrents.uploadProgress >= 100 ? T.uploadComplete : T.uploadingFiles"></span>
<span x-text="$store.torrents.uploadProgressText"></span>
</div>
<div class="torrent-progress-track">
<div class="torrent-progress-bar"
:style="'width:' + $store.torrents.uploadProgress + '%'"></div>
</div>
</div>
<div class="torrent-actions">
<button class="modal-btn modal-btn-primary" @click="$store.torrents.preview()" :disabled="$store.torrents.loading">
{{ t.player_upload_content }}
</button>
</div>
</div> </div>
</div> </template>
<div class="torrent-actions">
<button class="modal-btn modal-btn-primary" @click="$store.torrents.preview()" :disabled="$store.torrents.loading">
Preview content
</button>
<button class="modal-btn modal-btn-ghost" @click="$store.torrents.clearSelection()" :disabled="!$store.torrents.previewData">Clear</button>
</div>
<template x-if="$store.torrents.currentJob"> <template x-if="$store.torrents.currentJob">
<div class="torrent-progress-card"> <div class="torrent-progress-card">
<div class="torrent-progress-head"> <div class="torrent-progress-head">
<span x-text="$store.torrents.statusText($store.torrents.currentJob)"></span> <span x-text="$store.torrents.statusText($store.torrents.currentJob)"></span>
<span x-text="$store.torrents.currentJob.progress_percent.toFixed(1) + '%'"></span> <span x-text="$store.torrents.progressValue($store.torrents.currentJob).toFixed(1) + '%'"></span>
</div> </div>
<div class="torrent-progress-track"> <div class="torrent-progress-track">
<div class="torrent-progress-bar" <div class="torrent-progress-bar"
:style="'width:' + Math.max(0, Math.min(100, $store.torrents.currentJob.progress_percent || 0)) + '%'"></div> :style="'width:' + $store.torrents.progressValue($store.torrents.currentJob) + '%'"></div>
</div> </div>
<div class="torrent-progress-details"> <div class="torrent-progress-details"
<span x-text="$store.torrents.bytes($store.torrents.currentJob.downloaded_bytes) + ' / ' + $store.torrents.bytes($store.torrents.currentJob.selected_size || $store.torrents.currentJob.total_size)"></span> :class="{ completed: $store.torrents.isCompleted($store.torrents.currentJob) }">
<span x-text="$store.torrents.speedText($store.torrents.currentJob)"></span> <span class="torrent-progress-metric">
<span x-text="$store.torrents.peerText($store.torrents.currentJob)"></span> <span class="torrent-progress-label"
x-text="$store.torrents.isCompleted($store.torrents.currentJob) ? T.size : T.downloaded"></span>
<span class="torrent-progress-value"
x-text="$store.torrents.progressDetailText($store.torrents.currentJob)"></span>
</span>
<span class="torrent-progress-metric"
x-show="!$store.torrents.isCompleted($store.torrents.currentJob)">
<span class="torrent-progress-label" x-text="T.speed"></span>
<span class="torrent-progress-value"
x-text="$store.torrents.speedText($store.torrents.currentJob)"></span>
</span>
<span class="torrent-progress-metric"
x-show="!$store.torrents.isCompleted($store.torrents.currentJob)">
<span class="torrent-progress-label" x-text="T.peers"></span>
<span class="torrent-progress-value"
x-text="$store.torrents.peerText($store.torrents.currentJob)"></span>
</span>
<span class="torrent-progress-metric"
x-show="!$store.torrents.isCompleted($store.torrents.currentJob) && $store.torrents.etaText($store.torrents.currentJob)">
<span class="torrent-progress-label" x-text="T.eta"></span>
<span class="torrent-progress-value"
x-text="$store.torrents.etaText($store.torrents.currentJob)"></span>
</span>
</div> </div>
</div> </div>
</template> </template>
@@ -146,18 +248,28 @@
<div style="min-width:0"> <div style="min-width:0">
<div class="torrent-preview-title" x-text="$store.torrents.previewData.name"></div> <div class="torrent-preview-title" x-text="$store.torrents.previewData.name"></div>
<div class="torrent-preview-meta" <div class="torrent-preview-meta"
x-text="$store.torrents.previewData.files.length + ' files - ' + $store.torrents.bytes($store.torrents.previewData.total_size)"></div> x-text="$store.torrents.previewData.files.length + ' {{ t.player_files_count }} - ' + $store.torrents.bytes($store.torrents.previewData.total_size)"></div>
</div>
<div class="torrent-preview-actions">
<button class="modal-btn"
:class="$store.torrents.actionButtonClass()"
@click="$store.torrents.toggleDownloadAction()"
:disabled="$store.torrents.actionButtonDisabled()">
<span x-text="$store.torrents.actionButtonText()"></span>
</button>
<button class="modal-btn modal-btn-danger"
@click="$store.torrents.removeSession($store.torrents.previewData.id)"
:disabled="$store.torrents.loading">
{{ t.player_delete }}
</button>
</div> </div>
<button class="modal-btn modal-btn-primary" @click="$store.torrents.start()" :disabled="$store.torrents.loading">
Download selected
</button>
</div> </div>
<div class="torrent-tree-toolbar"> <div class="torrent-tree-toolbar">
<div class="torrent-selected-summary" <div class="torrent-selected-summary"
x-text="$store.torrents.selected.size + ' selected - ' + $store.torrents.bytes($store.torrents.selectedBytes())"></div> x-text="$store.torrents.selected.size + ' {{ t.player_selected }} - ' + $store.torrents.bytes($store.torrents.selectedBytes())"></div>
<div class="torrent-actions" style="margin-top:0"> <div class="torrent-actions" style="margin-top:0">
<button class="modal-btn modal-btn-ghost" @click="$store.torrents.expandAll(true)">Expand all</button> <button class="modal-btn modal-btn-ghost" @click="$store.torrents.expandAll(true)">{{ t.player_expand_all }}</button>
<button class="modal-btn modal-btn-ghost" @click="$store.torrents.expandAll(false)">Collapse</button> <button class="modal-btn modal-btn-ghost" @click="$store.torrents.expandAll(false)">{{ t.player_collapse }}</button>
</div> </div>
</div> </div>
<div class="torrent-file-tree"> <div class="torrent-file-tree">
@@ -215,20 +327,20 @@
<template x-if="$store.history.modal"> <template x-if="$store.history.modal">
<div class="modal-overlay" @click.self="$store.history.close()"> <div class="modal-overlay" @click.self="$store.history.close()">
<div class="modal-box history-modal"> <div class="modal-box history-modal">
<h3>Play history</h3> <h3>{{ t.player_play_history }}</h3>
<p class="torrent-message" :class="{ error: $store.history.error }" <p class="torrent-message" :class="{ error: $store.history.error }"
x-text="$store.history.message"></p> x-text="$store.history.message"></p>
<div class="history-list"> <div class="history-list">
<template x-if="!$store.history.loading && $store.history.items.length === 0"> <template x-if="!$store.history.loading && $store.history.items.length === 0">
<div class="empty-state" style="padding:32px 16px"> <div class="empty-state" style="padding:32px 16px">
<p>No plays yet</p> <p>{{ t.player_no_plays_yet }}</p>
</div> </div>
</template> </template>
<template x-for="item in $store.history.items" :key="item.id"> <template x-for="item in $store.history.items" :key="item.id">
<div class="history-row"> <div class="history-row">
<div style="min-width:0"> <div style="min-width:0">
<div class="history-title" x-text="item.track_title"></div> <div class="history-title" x-text="item.track_title"></div>
<div class="history-release" x-text="item.release_title || 'Unknown release'"></div> <div class="history-release" x-text="item.release_title || '{{ t.player_unknown_release }}'"></div>
</div> </div>
<div> <div>
<div class="history-date" x-text="$store.history.date(item.played_at)"></div> <div class="history-date" x-text="$store.history.date(item.played_at)"></div>
@@ -241,18 +353,17 @@
<button class="modal-btn modal-btn-ghost" <button class="modal-btn modal-btn-ghost"
@click="$store.history.load($store.history.page - 1)" @click="$store.history.load($store.history.page - 1)"
:disabled="$store.history.loading || $store.history.page <= 1"> :disabled="$store.history.loading || $store.history.page <= 1">
Previous {{ t.player_previous }}
</button> </button>
<span class="history-release" <span class="history-release"
x-text="'Page ' + $store.history.page + ' of ' + $store.history.totalPages()"></span> x-text="'{{ t.player_page }} ' + $store.history.page + ' {{ t.player_of }} ' + $store.history.totalPages()"></span>
<button class="modal-btn modal-btn-primary" <button class="modal-btn modal-btn-primary"
@click="$store.history.load($store.history.page + 1)" @click="$store.history.load($store.history.page + 1)"
:disabled="$store.history.loading || $store.history.page >= $store.history.totalPages()"> :disabled="$store.history.loading || $store.history.page >= $store.history.totalPages()">
Next {{ t.player_next }}
</button> </button>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
</div> </div>
File diff suppressed because it is too large Load Diff
+194 -139
View File
@@ -16,7 +16,7 @@
<div class="user-name" x-text="$store.user.profile?.name || ''"></div> <div class="user-name" x-text="$store.user.profile?.name || ''"></div>
<div class="user-role" x-text="$store.user.profile?.role || ''"></div> <div class="user-role" x-text="$store.user.profile?.role || ''"></div>
</div> </div>
<button class="user-logout-btn" @click="$store.user.logout()" title="Log out"> <button class="user-logout-btn" @click="$store.user.logout()" title="{{ t.player_log_out }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<path d="M9 21H5a2 2 0 01-2-2V5a2 2 0 012-2h4"/> <path d="M9 21H5a2 2 0 01-2-2V5a2 2 0 012-2h4"/>
<polyline points="16 17 21 12 16 7"/> <polyline points="16 17 21 12 16 7"/>
@@ -27,37 +27,44 @@
<div class="user-stats"> <div class="user-stats">
<button class="user-stat" @click="$store.history.open()"> <button class="user-stat" @click="$store.history.open()">
<span class="user-stat-value" x-text="$store.user.format($store.user.profile?.stats?.plays)"></span> <span class="user-stat-value" x-text="$store.user.format($store.user.profile?.stats?.plays)"></span>
<span class="user-stat-label">plays</span> <span class="user-stat-label">{{ t.player_plays_count }}</span>
</button> </button>
<div class="user-stat"> <div class="user-stat">
<span class="user-stat-value" x-text="$store.user.format($store.user.profile?.stats?.liked_tracks)"></span> <span class="user-stat-value" x-text="$store.user.format($store.user.profile?.stats?.liked_tracks)"></span>
<span class="user-stat-label">likes</span> <span class="user-stat-label">{{ t.player_likes_count }}</span>
</div> </div>
<div class="user-stat"> <div class="user-stat">
<span class="user-stat-value" x-text="$store.user.duration($store.user.profile?.stats?.listened_minutes)"></span> <span class="user-stat-value" x-text="$store.user.duration($store.user.profile?.stats?.listened_minutes)"></span>
<span class="user-stat-label">listened</span> <span class="user-stat-label">{{ t.player_listened }}</span>
</div> </div>
</div> </div>
<button class="lastfm-profile-action"
:class="$store.user.lastfmClass()"
:disabled="$store.user.lastfmBusy || !$store.user.lastfm?.configured"
@click="$store.user.handleLastfm()">
<span class="lastfm-dot"></span>
<span class="lastfm-profile-text" x-text="$store.user.lastfmLabel()"></span>
</button>
</div> </div>
<div class="sidebar-header"> <div class="sidebar-header">
<h2>Library</h2> <h2>{{ t.player_library }}</h2>
</div> </div>
<div class="sidebar-nav"> <div class="sidebar-nav">
<div class="sidebar-nav-item" <div class="sidebar-nav-item"
:class="{ active: $store.library.view === 'artists' }" :class="{ active: $store.library.view === 'artists' }"
@click="$store.library.goArtists()"> @click="$store.library.goArtists()">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="8" r="4"/><path d="M20 21a8 8 0 10-16 0"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="8" r="4"/><path d="M20 21a8 8 0 10-16 0"/></svg>
Artists {{ t.player_artists }}
</div> </div>
</div> </div>
<div class="sidebar-section"> <div class="sidebar-section">
<div class="sidebar-section-title"> <div class="sidebar-section-title">
Following {{ t.player_following }}
<span x-show="$store.follows.artists.length > 0" <span x-show="$store.follows.artists.length > 0"
x-text="'(' + $store.follows.artists.length + ')'"></span> x-text="'(' + $store.follows.artists.length + ')'"></span>
</div> </div>
<template x-if="$store.follows.artists.length === 0"> <template x-if="$store.follows.artists.length === 0">
<div class="following-empty">No followed artists</div> <div class="following-empty">{{ t.player_no_followed_artists }}</div>
</template> </template>
<div class="following-list" x-show="$store.follows.artists.length > 0" x-cloak> <div class="following-list" x-show="$store.follows.artists.length > 0" x-cloak>
<template x-for="artist in $store.follows.artists" :key="artist.id"> <template x-for="artist in $store.follows.artists" :key="artist.id">
@@ -84,20 +91,20 @@
<template x-if="pl.kind === 'likes'"> <template x-if="pl.kind === 'likes'">
<span style="display:flex;align-items:center;gap:6px"> <span style="display:flex;align-items:center;gap:6px">
<svg viewBox="0 0 24 24" fill="var(--accent)" stroke="none" width="14" height="14"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg> <svg viewBox="0 0 24 24" fill="var(--accent)" stroke="none" width="14" height="14"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
<span x-text="pl.title"></span> <span x-text="$store.playlists.displayTitle(pl)"></span>
</span> </span>
</template> </template>
<template x-if="pl.kind !== 'likes'"> <template x-if="pl.kind !== 'likes'">
<span x-text="pl.title"></span> <span x-text="$store.playlists.displayTitle(pl)"></span>
</template> </template>
<span class="playlist-count" x-text="pl.track_count + ' tracks'"></span> <span class="playlist-count" x-text="pl.track_count + ' {{ t.player_tracks_count }}'"></span>
</div> </div>
<template x-if="pl.is_own && pl.kind === 'user'"> <template x-if="pl.is_own && pl.kind === 'user'">
<div class="playlist-item-actions"> <div class="playlist-item-actions">
<button class="playlist-action-btn" @click.stop="$store.playlists.startRename(pl)" title="Rename"> <button class="playlist-action-btn" @click.stop="$store.playlists.startRename(pl)" title="{{ t.player_rename }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.12 2.12 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.12 2.12 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg>
</button> </button>
<button class="playlist-action-btn" @click.stop="$store.playlists.deletePlaylist(pl.id)" title="Delete"> <button class="playlist-action-btn" @click.stop="$store.playlists.deletePlaylist(pl.id)" title="{{ t.player_delete }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg>
</button> </button>
</div> </div>
@@ -106,22 +113,22 @@
</template> </template>
<button class="sidebar-create-btn" @click="$store.playlists.showCreate()"> <button class="sidebar-create-btn" @click="$store.playlists.showCreate()">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
New Playlist {{ t.player_new_playlist }}
</button> </button>
<template x-if="$store.playlists.publishedList().length > 0"> <template x-if="$store.playlists.publishedList().length > 0">
<div class="playlist-public-section"> <div class="playlist-public-section">
<div class="sidebar-section-title playlist-subtitle">Published Playlists</div> <div class="sidebar-section-title playlist-subtitle">{{ t.player_published_playlists }}</div>
<template x-for="pl in $store.playlists.publishedList()" :key="'published-' + pl.id"> <template x-for="pl in $store.playlists.publishedList()" :key="'published-' + pl.id">
<div class="playlist-item-row"> <div class="playlist-item-row">
<div class="playlist-item playlist-item-public" @click="$store.library.openPlaylist(pl.id)"> <div class="playlist-item playlist-item-public" @click="$store.library.openPlaylist(pl.id)">
<div class="playlist-title-line"> <div class="playlist-title-line">
<span class="playlist-title-text" x-text="pl.title"></span> <span class="playlist-title-text" x-text="$store.playlists.displayTitle(pl)"></span>
<span class="playlist-public-badge">Public</span> <span class="playlist-public-badge">{{ t.player_public }}</span>
</div> </div>
<div class="playlist-meta-line"> <div class="playlist-meta-line">
<span class="playlist-owner" x-show="pl.owner_name" x-text="'by ' + pl.owner_name"></span> <span class="playlist-owner" x-show="pl.owner_name" x-text="'{{ t.player_by }} ' + pl.owner_name"></span>
<span x-show="pl.owner_name">&middot;</span> <span x-show="pl.owner_name">&middot;</span>
<span x-text="pl.track_count + ' tracks'"></span> <span x-text="pl.track_count + ' {{ t.player_tracks_count }}'"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -130,7 +137,7 @@
</template> </template>
</div> </div>
<div class="sidebar-bottom"> <div class="sidebar-bottom">
<a href="/admin/">Admin Panel</a> <a href="/admin/">{{ t.player_admin_panel }}</a>
</div> </div>
</div> </div>
@@ -139,10 +146,10 @@
<aside class="mobile-library-drawer"> <aside class="mobile-library-drawer">
<div class="mobile-drawer-head"> <div class="mobile-drawer-head">
<div> <div>
<div class="mobile-drawer-title">Library</div> <div class="mobile-drawer-title">{{ t.player_library }}</div>
<div class="playlist-count">Playlists and followed artists</div> <div class="playlist-count">{{ t.player_playlists }} / {{ t.player_following }}</div>
</div> </div>
<button class="mobile-list-action" @click="$store.mobile.closeLibrary()" title="Close"> <button class="mobile-list-action" @click="$store.mobile.closeLibrary()" title="{{ t.player_close }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<line x1="18" y1="6" x2="6" y2="18"/> <line x1="18" y1="6" x2="6" y2="18"/>
<line x1="6" y1="6" x2="18" y2="18"/> <line x1="6" y1="6" x2="18" y2="18"/>
@@ -155,18 +162,18 @@
:class="{ active: $store.library.view === 'artists' }" :class="{ active: $store.library.view === 'artists' }"
@click="$store.library.goArtists(); $store.mobile.closeLibrary()"> @click="$store.library.goArtists(); $store.mobile.closeLibrary()">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="8" r="4"/><path d="M20 21a8 8 0 10-16 0"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="8" r="4"/><path d="M20 21a8 8 0 10-16 0"/></svg>
Artists {{ t.player_artists }}
</div> </div>
</div> </div>
<div class="mobile-drawer-section"> <div class="mobile-drawer-section">
<div class="sidebar-section-title"> <div class="sidebar-section-title">
Following {{ t.player_following }}
<span x-show="$store.follows.artists.length > 0" <span x-show="$store.follows.artists.length > 0"
x-text="'(' + $store.follows.artists.length + ')'"></span> x-text="'(' + $store.follows.artists.length + ')'"></span>
</div> </div>
<template x-if="$store.follows.artists.length === 0"> <template x-if="$store.follows.artists.length === 0">
<div class="following-empty">No followed artists</div> <div class="following-empty">{{ t.player_no_followed_artists }}</div>
</template> </template>
<div class="following-list" x-show="$store.follows.artists.length > 0" x-cloak> <div class="following-list" x-show="$store.follows.artists.length > 0" x-cloak>
<template x-for="artist in $store.follows.artists" :key="'mobile-follow-' + artist.id"> <template x-for="artist in $store.follows.artists" :key="'mobile-follow-' + artist.id">
@@ -186,7 +193,7 @@
</div> </div>
<button class="mobile-list-action" <button class="mobile-list-action"
@click.stop="$store.follows.toggle(artist.id)" @click.stop="$store.follows.toggle(artist.id)"
title="Unfollow artist"> title="{{ t.player_unfollow_artist }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<path d="M16 21v-2a4 4 0 00-4-4H6a4 4 0 00-4 4v2"/> <path d="M16 21v-2a4 4 0 00-4-4H6a4 4 0 00-4 4v2"/>
<circle cx="9" cy="7" r="4"/> <circle cx="9" cy="7" r="4"/>
@@ -199,27 +206,27 @@
</div> </div>
<div class="mobile-drawer-section"> <div class="mobile-drawer-section">
<div class="sidebar-section-title">Playlists</div> <div class="sidebar-section-title">{{ t.player_playlists }}</div>
<template x-for="pl in $store.playlists.regularList()" :key="'mobile-playlist-' + pl.id"> <template x-for="pl in $store.playlists.regularList()" :key="'mobile-playlist-' + pl.id">
<div class="playlist-item-row"> <div class="playlist-item-row">
<div class="playlist-item" @click="$store.library.openPlaylist(pl.id); $store.mobile.closeLibrary()"> <div class="playlist-item" @click="$store.library.openPlaylist(pl.id); $store.mobile.closeLibrary()">
<template x-if="pl.kind === 'likes'"> <template x-if="pl.kind === 'likes'">
<span style="display:flex;align-items:center;gap:6px"> <span style="display:flex;align-items:center;gap:6px">
<svg viewBox="0 0 24 24" fill="var(--accent)" stroke="none" width="14" height="14"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg> <svg viewBox="0 0 24 24" fill="var(--accent)" stroke="none" width="14" height="14"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
<span x-text="pl.title"></span> <span x-text="$store.playlists.displayTitle(pl)"></span>
</span> </span>
</template> </template>
<template x-if="pl.kind !== 'likes'"> <template x-if="pl.kind !== 'likes'">
<span x-text="pl.title"></span> <span x-text="$store.playlists.displayTitle(pl)"></span>
</template> </template>
<span class="playlist-count" x-text="pl.track_count + ' tracks'"></span> <span class="playlist-count" x-text="pl.track_count + ' {{ t.player_tracks_count }}'"></span>
</div> </div>
<template x-if="pl.is_own && pl.kind === 'user'"> <template x-if="pl.is_own && pl.kind === 'user'">
<div class="playlist-item-actions"> <div class="playlist-item-actions">
<button class="playlist-action-btn" @click.stop="$store.mobile.closeLibrary(); $store.playlists.startRename(pl)" title="Rename"> <button class="playlist-action-btn" @click.stop="$store.mobile.closeLibrary(); $store.playlists.startRename(pl)" title="{{ t.player_rename }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.12 2.12 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.12 2.12 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg>
</button> </button>
<button class="playlist-action-btn" @click.stop="$store.playlists.deletePlaylist(pl.id)" title="Delete"> <button class="playlist-action-btn" @click.stop="$store.playlists.deletePlaylist(pl.id)" title="{{ t.player_delete }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg>
</button> </button>
</div> </div>
@@ -228,22 +235,22 @@
</template> </template>
<button class="sidebar-create-btn" @click="$store.mobile.closeLibrary(); $store.playlists.showCreate()"> <button class="sidebar-create-btn" @click="$store.mobile.closeLibrary(); $store.playlists.showCreate()">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
New Playlist {{ t.player_new_playlist }}
</button> </button>
<template x-if="$store.playlists.publishedList().length > 0"> <template x-if="$store.playlists.publishedList().length > 0">
<div class="playlist-public-section"> <div class="playlist-public-section">
<div class="sidebar-section-title playlist-subtitle">Published Playlists</div> <div class="sidebar-section-title playlist-subtitle">{{ t.player_published_playlists }}</div>
<template x-for="pl in $store.playlists.publishedList()" :key="'mobile-published-' + pl.id"> <template x-for="pl in $store.playlists.publishedList()" :key="'mobile-published-' + pl.id">
<div class="playlist-item-row"> <div class="playlist-item-row">
<div class="playlist-item playlist-item-public" @click="$store.library.openPlaylist(pl.id); $store.mobile.closeLibrary()"> <div class="playlist-item playlist-item-public" @click="$store.library.openPlaylist(pl.id); $store.mobile.closeLibrary()">
<div class="playlist-title-line"> <div class="playlist-title-line">
<span class="playlist-title-text" x-text="pl.title"></span> <span class="playlist-title-text" x-text="$store.playlists.displayTitle(pl)"></span>
<span class="playlist-public-badge">Public</span> <span class="playlist-public-badge">{{ t.player_public }}</span>
</div> </div>
<div class="playlist-meta-line"> <div class="playlist-meta-line">
<span class="playlist-owner" x-show="pl.owner_name" x-text="'by ' + pl.owner_name"></span> <span class="playlist-owner" x-show="pl.owner_name" x-text="'{{ t.player_by }} ' + pl.owner_name"></span>
<span x-show="pl.owner_name">&middot;</span> <span x-show="pl.owner_name">&middot;</span>
<span x-text="pl.track_count + ' tracks'"></span> <span x-text="pl.track_count + ' {{ t.player_tracks_count }}'"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -262,7 +269,7 @@
<div class="content-topbar" @click.outside="$store.user.menuOpen = false"> <div class="content-topbar" @click.outside="$store.user.menuOpen = false">
<button class="mobile-library-btn" <button class="mobile-library-btn"
@click="$store.user.menuOpen = false; $store.mobile.toggleLibrary()" @click="$store.user.menuOpen = false; $store.mobile.toggleLibrary()"
title="Library"> title="{{ t.player_library }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<path d="M4 19.5A2.5 2.5 0 016.5 17H20"/> <path d="M4 19.5A2.5 2.5 0 016.5 17H20"/>
<path d="M4 4.5A2.5 2.5 0 016.5 2H20v20H6.5A2.5 2.5 0 014 19.5z"/> <path d="M4 4.5A2.5 2.5 0 016.5 2H20v20H6.5A2.5 2.5 0 014 19.5z"/>
@@ -270,7 +277,7 @@
</button> </button>
<div class="search-bar"> <div class="search-bar">
<span class="search-icon"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg></span> <span class="search-icon"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg></span>
<input id="search-input" type="text" placeholder="Search artists, releases, tracks..." <input id="search-input" type="text" placeholder="{{ t.player_search_placeholder }}"
x-model="$store.library.searchQuery" x-model="$store.library.searchQuery"
@input.debounce.300ms="$store.library.search($store.library.searchQuery)" @input.debounce.300ms="$store.library.search($store.library.searchQuery)"
@keydown.escape="$store.library.clearSearch(); $el.blur()"> @keydown.escape="$store.library.clearSearch(); $el.blur()">
@@ -285,14 +292,13 @@
</div> </div>
<button class="torrent-import-btn" <button class="torrent-import-btn"
@click="$store.torrents.open()" @click="$store.torrents.open()"
title="Import torrent"> title="{{ t.player_import_torrent }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/> <path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/>
<polyline points="7 10 12 15 17 10"/> <polyline points="7 10 12 15 17 10"/>
<line x1="12" y1="15" x2="12" y2="3"/> <line x1="12" y1="15" x2="12" y2="3"/>
</svg> </svg>
</button> </button>
<span class="version-chip">v{{ t.app_version() }}</span>
<button class="mobile-account-chip" <button class="mobile-account-chip"
x-show="$store.user.profile" x-show="$store.user.profile"
x-cloak x-cloak
@@ -314,20 +320,27 @@
<div class="user-stats"> <div class="user-stats">
<button class="user-stat" @click="$store.history.open(); $store.user.menuOpen = false"> <button class="user-stat" @click="$store.history.open(); $store.user.menuOpen = false">
<span class="user-stat-value" x-text="$store.user.format($store.user.profile?.stats?.plays)"></span> <span class="user-stat-value" x-text="$store.user.format($store.user.profile?.stats?.plays)"></span>
<span class="user-stat-label">plays</span> <span class="user-stat-label">{{ t.player_plays_count }}</span>
</button> </button>
<div class="user-stat"> <div class="user-stat">
<span class="user-stat-value" x-text="$store.user.format($store.user.profile?.stats?.liked_tracks)"></span> <span class="user-stat-value" x-text="$store.user.format($store.user.profile?.stats?.liked_tracks)"></span>
<span class="user-stat-label">likes</span> <span class="user-stat-label">{{ t.player_likes_count }}</span>
</div> </div>
<div class="user-stat"> <div class="user-stat">
<span class="user-stat-value" x-text="$store.user.duration($store.user.profile?.stats?.listened_minutes)"></span> <span class="user-stat-value" x-text="$store.user.duration($store.user.profile?.stats?.listened_minutes)"></span>
<span class="user-stat-label">listened</span> <span class="user-stat-label">{{ t.player_listened }}</span>
</div> </div>
</div> </div>
<button class="lastfm-profile-action"
:class="$store.user.lastfmClass()"
:disabled="$store.user.lastfmBusy || !$store.user.lastfm?.configured"
@click="$store.user.handleLastfm()">
<span class="lastfm-dot"></span>
<span class="lastfm-profile-text" x-text="$store.user.lastfmLabel()"></span>
</button>
<button class="modal-btn modal-btn-primary mobile-account-logout" <button class="modal-btn modal-btn-primary mobile-account-logout"
@click="$store.user.logout()"> @click="$store.user.logout()">
Log out {{ t.player_log_out }}
</button> </button>
</div> </div>
</div> </div>
@@ -343,13 +356,13 @@
<template x-if="$store.library.searchResults.artists.length === 0 && $store.library.searchResults.releases.length === 0 && $store.library.searchResults.tracks.length === 0"> <template x-if="$store.library.searchResults.artists.length === 0 && $store.library.searchResults.releases.length === 0 && $store.library.searchResults.tracks.length === 0">
<div class="empty-state"> <div class="empty-state">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>
<p>No results found</p> <p>{{ t.player_no_results }}</p>
</div> </div>
</template> </template>
<!-- Artists section --> <!-- Artists section -->
<template x-if="$store.library.searchResults.artists.length > 0"> <template x-if="$store.library.searchResults.artists.length > 0">
<div class="search-section"> <div class="search-section">
<h2 class="search-section-title">Artists</h2> <h2 class="search-section-title">{{ t.player_artists }}</h2>
<div class="search-artists-row"> <div class="search-artists-row">
<template x-for="artist in $store.library.searchResults.artists" :key="artist.id"> <template x-for="artist in $store.library.searchResults.artists" :key="artist.id">
<div class="search-artist-card" @click="$store.library.openArtist(artist.id)"> <div class="search-artist-card" @click="$store.library.openArtist(artist.id)">
@@ -363,7 +376,7 @@
<button class="artist-follow-card-btn" <button class="artist-follow-card-btn"
:class="{ followed: $store.follows.has(artist.id) }" :class="{ followed: $store.follows.has(artist.id) }"
@click.stop="$store.follows.toggle(artist.id)" @click.stop="$store.follows.toggle(artist.id)"
:title="$store.follows.has(artist.id) ? 'Unfollow artist' : 'Follow artist'"> :title="$store.follows.has(artist.id) ? '{{ t.player_unfollow_artist }}' : '{{ t.player_follow_artist }}'">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<path d="M16 21v-2a4 4 0 00-4-4H6a4 4 0 00-4 4v2"/> <path d="M16 21v-2a4 4 0 00-4-4H6a4 4 0 00-4 4v2"/>
<circle cx="9" cy="7" r="4"/> <circle cx="9" cy="7" r="4"/>
@@ -381,7 +394,7 @@
<!-- Releases section --> <!-- Releases section -->
<template x-if="$store.library.searchResults.releases.length > 0"> <template x-if="$store.library.searchResults.releases.length > 0">
<div class="search-section"> <div class="search-section">
<h2 class="search-section-title">Releases</h2> <h2 class="search-section-title">{{ t.player_releases }}</h2>
<div class="search-releases-row"> <div class="search-releases-row">
<template x-for="release in $store.library.searchResults.releases" :key="release.id"> <template x-for="release in $store.library.searchResults.releases" :key="release.id">
<div class="search-release-card" @click="$store.library.openRelease(release.id)" style="position:relative"> <div class="search-release-card" @click="$store.library.openRelease(release.id)" style="position:relative">
@@ -392,8 +405,8 @@
<template x-if="!release.cover_url"> <template x-if="!release.cover_url">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="4"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="4"/></svg>
</template> </template>
<button class="card-info-btn" @click.stop="$store.info.open('Release info', $store.library.releaseInfo(release))" :title="$store.library.releaseInfo(release)" aria-label="Release info"> <button class="card-info-btn" @click.stop="$store.library.openReleaseInfo(release)" :title="$store.library.releaseInfo(release)" aria-label="{{ t.player_release_info }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> <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>
</button> </button>
</div> </div>
<div class="card-title" x-text="release.title"></div> <div class="card-title" x-text="release.title"></div>
@@ -409,13 +422,13 @@
<!-- Tracks section --> <!-- Tracks section -->
<template x-if="$store.library.searchResults.tracks.length > 0"> <template x-if="$store.library.searchResults.tracks.length > 0">
<div class="search-section"> <div class="search-section">
<h2 class="search-section-title">Tracks</h2> <h2 class="search-section-title">{{ t.player_tracks }}</h2>
<div class="track-list-header"> <div class="track-list-header">
<span>#</span> <span>#</span>
<span>Title</span> <span>{{ t.player_title }}</span>
<span></span> <span></span>
<span></span> <span></span>
<span style="text-align:right">Duration</span> <span style="text-align:right">{{ t.player_duration }}</span>
</div> </div>
<template x-for="(track, idx) in $store.library.searchResults.tracks" :key="track.id"> <template x-for="(track, idx) in $store.library.searchResults.tracks" :key="track.id">
<div class="track-row" <div class="track-row"
@@ -435,22 +448,28 @@
</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('Track info', $store.library.trackInfo(track))" :title="$store.library.trackInfo(track)" aria-label="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"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></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="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>
</button> </button>
<button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="Like"> <button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
<svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg> <svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.queue.addNextInQueue([track])" title="Play next"> <button class="track-action-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.queue.addToEnd([track])" title="Add to queue"> <button class="track-action-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.playlists.showPicker([track.id])" title="Add to playlist"> <button class="track-action-btn" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
</button> </button>
</div> </div>
@@ -467,7 +486,7 @@
<!-- Artists Grid --> <!-- Artists Grid -->
<template x-if="$store.library.view === 'artists'"> <template x-if="$store.library.view === 'artists'">
<div> <div>
<h1 class="section-title">Artists</h1> <h1 class="section-title">{{ t.player_artists }}</h1>
<div class="card-grid"> <div class="card-grid">
<template x-for="artist in $store.library.artists" :key="artist.id"> <template x-for="artist in $store.library.artists" :key="artist.id">
<div class="card" @click="$store.library.openArtist(artist.id)"> <div class="card" @click="$store.library.openArtist(artist.id)">
@@ -481,7 +500,7 @@
<button class="artist-follow-card-btn" <button class="artist-follow-card-btn"
:class="{ followed: $store.follows.has(artist.id) }" :class="{ followed: $store.follows.has(artist.id) }"
@click.stop="$store.follows.toggle(artist.id)" @click.stop="$store.follows.toggle(artist.id)"
:title="$store.follows.has(artist.id) ? 'Unfollow artist' : 'Follow artist'"> :title="$store.follows.has(artist.id) ? '{{ t.player_unfollow_artist }}' : '{{ t.player_follow_artist }}'">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<path d="M16 21v-2a4 4 0 00-4-4H6a4 4 0 00-4 4v2"/> <path d="M16 21v-2a4 4 0 00-4-4H6a4 4 0 00-4 4v2"/>
<circle cx="9" cy="7" r="4"/> <circle cx="9" cy="7" r="4"/>
@@ -491,7 +510,7 @@
</button> </button>
</div> </div>
<div class="card-title" x-text="artist.name"></div> <div class="card-title" x-text="artist.name"></div>
<div class="card-subtitle" x-text="artist.release_count + ' releases · ' + artist.track_count + ' tracks'"></div> <div class="card-subtitle" x-text="artist.release_count + ' {{ t.player_releases_count }} · ' + artist.track_count + ' {{ t.player_tracks_count }}'"></div>
</div> </div>
</template> </template>
</div> </div>
@@ -506,7 +525,7 @@
<template x-if="$store.library.view === 'artist_detail' && $store.library.currentArtist"> <template x-if="$store.library.view === 'artist_detail' && $store.library.currentArtist">
<div> <div>
<div class="breadcrumb"> <div class="breadcrumb">
<a @click="$store.library.goArtists()">Artists</a> <a @click="$store.library.goArtists()">{{ t.player_artists }}</a>
<span>/</span> <span>/</span>
<span x-text="$store.library.currentArtist.name"></span> <span x-text="$store.library.currentArtist.name"></span>
</div> </div>
@@ -522,24 +541,24 @@
<div> <div>
<div class="artist-name" x-text="$store.library.currentArtist.name"></div> <div class="artist-name" x-text="$store.library.currentArtist.name"></div>
<div class="artist-stats"> <div class="artist-stats">
<span x-text="$store.library.currentArtist.releases.length + ' releases'"></span> <span x-text="$store.library.currentArtist.releases.length + ' {{ t.player_releases_count }}'"></span>
<span></span> <span></span>
<span x-text="$store.library.currentArtist.total_track_count + ' tracks'"></span> <span x-text="$store.library.currentArtist.total_track_count + ' {{ t.player_tracks_count }}'"></span>
<span></span> <span></span>
<span x-text="$store.library.currentArtist.total_play_count + ' plays'"></span> <span x-text="$store.library.currentArtist.total_play_count + ' {{ t.player_plays_count }}'"></span>
</div> </div>
<div class="release-actions"> <div class="release-actions">
<button class="release-action-btn secondary" <button class="release-action-btn secondary"
:class="{ followed: $store.follows.has($store.library.currentArtist.id) }" :class="{ followed: $store.follows.has($store.library.currentArtist.id) }"
@click="$store.follows.toggle($store.library.currentArtist.id)" @click="$store.follows.toggle($store.library.currentArtist.id)"
:title="$store.follows.has($store.library.currentArtist.id) ? 'Unfollow artist' : 'Follow artist'"> :title="$store.follows.has($store.library.currentArtist.id) ? '{{ t.player_unfollow_artist }}' : '{{ t.player_follow_artist }}'">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<path d="M16 21v-2a4 4 0 00-4-4H6a4 4 0 00-4 4v2"/> <path d="M16 21v-2a4 4 0 00-4-4H6a4 4 0 00-4 4v2"/>
<circle cx="9" cy="7" r="4"/> <circle cx="9" cy="7" r="4"/>
<path x-show="!$store.follows.has($store.library.currentArtist.id)" d="M19 8v6M16 11h6"/> <path x-show="!$store.follows.has($store.library.currentArtist.id)" d="M19 8v6M16 11h6"/>
<path x-show="$store.follows.has($store.library.currentArtist.id)" d="M16 11l2 2 4-5"/> <path x-show="$store.follows.has($store.library.currentArtist.id)" d="M16 11l2 2 4-5"/>
</svg> </svg>
<span x-text="$store.follows.has($store.library.currentArtist.id) ? 'Following' : 'Follow'"></span> <span x-text="$store.follows.has($store.library.currentArtist.id) ? '{{ t.player_followed }}' : '{{ t.player_follow }}'"></span>
</button> </button>
</div> </div>
</div> </div>
@@ -557,10 +576,10 @@
<template x-if="!release.cover_url"> <template x-if="!release.cover_url">
<span class="placeholder-icon"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="4"/></svg></span> <span class="placeholder-icon"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="4"/></svg></span>
</template> </template>
<button class="card-info-btn" @click.stop="$store.info.open('Release info', $store.library.releaseInfo(release))" :title="$store.library.releaseInfo(release)" aria-label="Release info"> <button class="card-info-btn" @click.stop="$store.library.openReleaseInfo(release)" :title="$store.library.releaseInfo(release)" aria-label="{{ t.player_release_info }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> <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>
</button> </button>
<button class="card-enqueue-btn" @click.stop="$store.library.enqueueRelease(release.id)" title="Add to queue"> <button class="card-enqueue-btn" @click.stop="$store.library.enqueueRelease(release.id)" title="{{ t.player_add_to_queue }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
</button> </button>
<button class="card-play-btn" @click.stop="$store.library.playRelease(release.id)"> <button class="card-play-btn" @click.stop="$store.library.playRelease(release.id)">
@@ -570,7 +589,7 @@
<div class="card-title" x-text="release.title"></div> <div class="card-title" x-text="release.title"></div>
<div class="card-subtitle"> <div class="card-subtitle">
<span x-text="release.year || ''"></span> <span x-text="release.year || ''"></span>
<span x-text="release.track_count + ' tracks'"></span> <span x-text="release.track_count + ' {{ t.player_tracks_count }}'"></span>
</div> </div>
</div> </div>
</template> </template>
@@ -579,13 +598,13 @@
</template> </template>
<template x-if="$store.library.currentArtist.featured_tracks && $store.library.currentArtist.featured_tracks.length > 0"> <template x-if="$store.library.currentArtist.featured_tracks && $store.library.currentArtist.featured_tracks.length > 0">
<section class="artist-release-group"> <section class="artist-release-group">
<h2 class="artist-release-group-title">Appears on</h2> <h2 class="artist-release-group-title">{{ t.player_appears_on }}</h2>
<div class="track-list-header"> <div class="track-list-header">
<span>#</span> <span>#</span>
<span>Title</span> <span>{{ t.player_title }}</span>
<span></span> <span></span>
<span></span> <span></span>
<span style="text-align:right">Duration</span> <span style="text-align:right">{{ t.player_duration }}</span>
</div> </div>
<template x-for="(track, idx) in $store.library.currentArtist.featured_tracks" :key="track.id"> <template x-for="(track, idx) in $store.library.currentArtist.featured_tracks" :key="track.id">
<div class="track-row" <div class="track-row"
@@ -609,22 +628,28 @@
</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('Track info', $store.library.trackInfo(track))" :title="$store.library.trackInfo(track)" aria-label="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"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></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="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>
</button> </button>
<button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="Like"> <button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
<svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg> <svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.queue.addNextInQueue([track])" title="Play next"> <button class="track-action-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.queue.addToEnd([track])" title="Add to queue"> <button class="track-action-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.playlists.showPicker([track.id])" title="Add to playlist"> <button class="track-action-btn" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
</button> </button>
</div> </div>
@@ -640,7 +665,7 @@
<template x-if="$store.library.view === 'release_detail' && $store.library.currentRelease"> <template x-if="$store.library.view === 'release_detail' && $store.library.currentRelease">
<div> <div>
<div class="breadcrumb"> <div class="breadcrumb">
<a @click="$store.library.goArtists()">Artists</a> <a @click="$store.library.goArtists()">{{ t.player_artists }}</a>
<span>/</span> <span>/</span>
<template x-if="$store.library.currentRelease.artists.length > 0"> <template x-if="$store.library.currentRelease.artists.length > 0">
<a @click="$store.library.openArtist($store.library.currentRelease.artists[0].id)" x-text="$store.library.currentRelease.artists[0].name"></a> <a @click="$store.library.openArtist($store.library.currentRelease.artists[0].id)" x-text="$store.library.currentRelease.artists[0].name"></a>
@@ -659,7 +684,15 @@
</div> </div>
<div class="release-meta"> <div class="release-meta">
<div class="release-type" x-text="$store.library.currentRelease.release_type"></div> <div class="release-type" x-text="$store.library.currentRelease.release_type"></div>
<div class="release-title" x-text="$store.library.currentRelease.title"></div> <div class="release-title-row">
<div class="release-title" x-text="$store.library.currentRelease.title"></div>
<button class="like-btn like-btn-lg release-title-like"
:class="{ liked: $store.likes.isReleaseLiked($store.library.currentRelease) }"
@click.stop="$store.likes.toggleRelease($store.library.currentRelease.id)"
title="{{ t.player_like }}">
<svg viewBox="0 0 24 24" :fill="$store.likes.isReleaseLiked($store.library.currentRelease) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
</button>
</div>
<div class="release-artists"> <div class="release-artists">
<template x-for="(artist, artistIdx) in $store.library.currentRelease.artists" :key="artist.id"> <template x-for="(artist, artistIdx) in $store.library.currentRelease.artists" :key="artist.id">
<span> <span>
@@ -671,29 +704,23 @@
<div class="release-year" x-text="$store.library.currentRelease.year || ''"></div> <div class="release-year" x-text="$store.library.currentRelease.year || ''"></div>
<div class="release-actions"> <div class="release-actions">
<button class="release-action-btn secondary" <button class="release-action-btn secondary"
@click.stop="$store.info.open('Release info', $store.library.releaseInfo($store.library.currentRelease))" @click.stop="$store.library.openReleaseInfo($store.library.currentRelease)"
:title="$store.library.releaseInfo($store.library.currentRelease)" :title="$store.library.releaseInfo($store.library.currentRelease)"
aria-label="Release info"> aria-label="{{ t.player_release_info }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> <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>
Info {{ t.player_info }}
</button> </button>
<button class="release-action-btn primary" @click="$store.queue.playRelease($store.library.currentRelease.tracks, 0)"> <button class="release-action-btn primary" @click="$store.queue.playRelease($store.library.currentRelease.tracks, 0)">
<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>
Play {{ t.player_play }}
</button> </button>
<button class="like-btn like-btn-lg" style="margin-left:4px" <button class="release-action-btn secondary" @click="$store.queue.addToEnd($store.library.currentRelease.tracks)" title="{{ t.player_add_to_end_queue }}">
:class="{ liked: $store.likes.isReleaseLiked($store.library.currentRelease) }"
@click.stop="$store.likes.toggleRelease($store.library.currentRelease.id)"
title="Like">
<svg viewBox="0 0 24 24" :fill="$store.likes.isReleaseLiked($store.library.currentRelease) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
</button>
<button class="release-action-btn secondary" @click="$store.queue.addToEnd($store.library.currentRelease.tracks)" title="Add to end of queue">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
Queue {{ t.player_queue }}
</button> </button>
<button class="release-action-btn secondary" @click="$store.queue.addNextInQueue($store.library.currentRelease.tracks)" title="Play next"> <button class="release-action-btn secondary" @click="$store.queue.addNextInQueue($store.library.currentRelease.tracks)" title="{{ t.player_play_next }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg>
Next {{ t.player_next }}
</button> </button>
</div> </div>
</div> </div>
@@ -701,10 +728,10 @@
<!-- Track list --> <!-- Track list -->
<div class="track-list-header"> <div class="track-list-header">
<span>#</span> <span>#</span>
<span>Title</span> <span>{{ t.player_title }}</span>
<span></span> <span></span>
<span></span> <span></span>
<span style="text-align:right">Duration</span> <span style="text-align:right">{{ t.player_duration }}</span>
</div> </div>
<template x-for="(track, idx) in $store.library.currentRelease.tracks" :key="track.id"> <template x-for="(track, idx) in $store.library.currentRelease.tracks" :key="track.id">
<div class="track-row" <div class="track-row"
@@ -724,22 +751,28 @@
</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('Track info', $store.library.trackInfo(track))" :title="$store.library.trackInfo(track)" aria-label="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"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></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="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>
</button> </button>
<button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="Like"> <button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
<svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg> <svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.queue.addNextInQueue([track])" title="Play next"> <button class="track-action-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.queue.addToEnd([track])" title="Add to queue"> <button class="track-action-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.playlists.showPicker([track.id])" title="Add to playlist"> <button class="track-action-btn" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
</button> </button>
</div> </div>
@@ -753,28 +786,28 @@
<template x-if="$store.library.view === 'playlist_detail' && $store.library.currentPlaylist"> <template x-if="$store.library.view === 'playlist_detail' && $store.library.currentPlaylist">
<div> <div>
<div class="breadcrumb"> <div class="breadcrumb">
<a @click="$store.library.goArtists()">Library</a> <a @click="$store.library.goArtists()">{{ t.player_library }}</a>
<span>/</span> <span>/</span>
<span x-text="$store.library.currentPlaylist.title"></span> <span x-text="$store.playlists.displayTitle($store.library.currentPlaylist)"></span>
</div> </div>
<h1 class="section-title" x-text="$store.library.currentPlaylist.title"></h1> <h1 class="section-title" x-text="$store.playlists.displayTitle($store.library.currentPlaylist)"></h1>
<div class="playlist-detail-meta" <div class="playlist-detail-meta"
x-show="$store.library.currentPlaylist.owner_name || $store.library.currentPlaylist.is_public"> x-show="$store.library.currentPlaylist.owner_name || $store.library.currentPlaylist.is_public">
<span x-show="$store.library.currentPlaylist.owner_name" <span x-show="$store.library.currentPlaylist.owner_name"
x-text="'by ' + $store.library.currentPlaylist.owner_name"></span> x-text="'{{ t.player_by }} ' + $store.library.currentPlaylist.owner_name"></span>
<span x-show="$store.library.currentPlaylist.owner_name && $store.library.currentPlaylist.is_public">&middot;</span> <span x-show="$store.library.currentPlaylist.owner_name && $store.library.currentPlaylist.is_public">&middot;</span>
<span class="playlist-public-badge" <span class="playlist-public-badge"
x-show="$store.library.currentPlaylist.is_public">Published</span> x-show="$store.library.currentPlaylist.is_public">{{ t.player_published }}</span>
</div> </div>
<template x-if="$store.library.currentPlaylist.description"> <template x-if="$store.library.currentPlaylist.description">
<p style="color:var(--text-subdued);margin-bottom:16px" x-text="$store.library.currentPlaylist.description"></p> <p style="color:var(--text-subdued);margin-bottom:16px" x-text="$store.library.currentPlaylist.description"></p>
</template> </template>
<div class="track-list-header"> <div class="track-list-header">
<span>#</span> <span>#</span>
<span>Title</span> <span>{{ t.player_title }}</span>
<span></span> <span></span>
<span></span> <span></span>
<span style="text-align:right">Duration</span> <span style="text-align:right">{{ t.player_duration }}</span>
</div> </div>
<template x-for="(track, idx) in $store.library.currentPlaylist.tracks" :key="track.id"> <template x-for="(track, idx) in $store.library.currentPlaylist.tracks" :key="track.id">
<div class="track-row" <div class="track-row"
@@ -794,22 +827,28 @@
</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('Track info', $store.library.trackInfo(track))" :title="$store.library.trackInfo(track)" aria-label="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"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></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="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>
</button> </button>
<button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="Like"> <button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
<svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg> <svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.queue.addNextInQueue([track])" title="Play next"> <button class="track-action-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.queue.addToEnd([track])" title="Add to queue"> <button class="track-action-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
</button> </button>
<button class="track-action-btn" @click.stop="$store.playlists.showPicker([track.id])" title="Add to playlist"> <button class="track-action-btn" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
</button> </button>
</div> </div>
@@ -827,14 +866,14 @@
@click="$store.queue.visible = false"></div> @click="$store.queue.visible = false"></div>
<div class="queue-panel" :class="{ hidden: !$store.queue.visible }"> <div class="queue-panel" :class="{ hidden: !$store.queue.visible }">
<div class="queue-header"> <div class="queue-header">
<h3>Queue</h3> <h3>{{ t.player_queue }}</h3>
<button class="queue-clear-btn" @click="$store.queue.clear()">Clear</button> <button class="queue-clear-btn" @click="$store.queue.clear()">{{ t.player_clear }}</button>
</div> </div>
<div class="queue-tracks"> <div class="queue-tracks">
<template x-if="$store.queue.tracks.length === 0"> <template x-if="$store.queue.tracks.length === 0">
<div class="empty-state"> <div class="empty-state">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><path d="M9 18V5l12-2v13"/><circle cx="6" cy="18" r="3"/><circle cx="18" cy="16" r="3"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><path d="M9 18V5l12-2v13"/><circle cx="6" cy="18" r="3"/><circle cx="18" cy="16" r="3"/></svg>
<p>Queue is empty</p> <p>{{ t.player_queue_empty }}</p>
</div> </div>
</template> </template>
<template x-for="(track, idx) in $store.queue.tracks" :key="idx + '-' + track.id"> <template x-for="(track, idx) in $store.queue.tracks" :key="idx + '-' + track.id">
@@ -870,10 +909,16 @@
</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('Track info', $store.library.trackInfo(track))" :title="$store.library.trackInfo(track)" aria-label="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" width="14" height="14"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></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="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>
</button> </button>
</div> </div>
@@ -897,7 +942,16 @@
</template> </template>
</div> </div>
<div class="player-track-info"> <div class="player-track-info">
<div class="player-track-title" x-text="$store.player.currentTrack.title"></div> <div class="player-track-title-row">
<div class="player-track-title" x-text="$store.player.currentTrack.title"></div>
<button class="like-btn player-current-like"
:class="{ liked: $store.likes.has($store.player.currentTrack.id) }"
@click.stop="$store.likes.toggle($store.player.currentTrack.id)"
title="{{ t.player_like }}"
aria-label="{{ t.player_like }}">
<svg viewBox="0 0 24 24" :fill="$store.likes.has($store.player.currentTrack.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
</button>
</div>
<div class="player-track-artist"> <div class="player-track-artist">
<template x-for="(artist, artistIdx) in $store.library.trackArtistLinks($store.player.currentTrack)" :key="artist.label + '-' + artist.id + '-' + artistIdx"> <template x-for="(artist, artistIdx) in $store.library.trackArtistLinks($store.player.currentTrack)" :key="artist.label + '-' + artist.id + '-' + artistIdx">
<span> <span>
@@ -916,10 +970,10 @@
<div class="player-controls"> <div class="player-controls">
<div class="player-buttons"> <div class="player-buttons">
<button class="player-btn" :class="{ active: $store.player.shuffle }" @click="$store.player.toggleShuffle()" title="Shuffle"> <button class="player-btn" :class="{ active: $store.player.shuffle }" @click="$store.player.toggleShuffle()" title="{{ t.player_shuffle }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="16 3 21 3 21 8"/><line x1="4" y1="20" x2="21" y2="3"/><polyline points="21 16 21 21 16 21"/><line x1="15" y1="15" x2="21" y2="21"/><line x1="4" y1="4" x2="9" y2="9"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="16 3 21 3 21 8"/><line x1="4" y1="20" x2="21" y2="3"/><polyline points="21 16 21 21 16 21"/><line x1="15" y1="15" x2="21" y2="21"/><line x1="4" y1="4" x2="9" y2="9"/></svg>
</button> </button>
<button class="player-btn" @click="$store.player.prev()" title="Previous"> <button class="player-btn" @click="$store.player.prev()" title="{{ t.player_previous }}">
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M6 6h2v12H6zm3.5 6l8.5 6V6z"/></svg> <svg viewBox="0 0 24 24" fill="currentColor"><path d="M6 6h2v12H6zm3.5 6l8.5 6V6z"/></svg>
</button> </button>
<button class="player-btn player-btn-play" @click="$store.player.toggle()"> <button class="player-btn player-btn-play" @click="$store.player.toggle()">
@@ -930,10 +984,10 @@
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M6 4h4v16H6zM14 4h4v16h-4z"/></svg> <svg viewBox="0 0 24 24" fill="currentColor"><path d="M6 4h4v16H6zM14 4h4v16h-4z"/></svg>
</template> </template>
</button> </button>
<button class="player-btn" @click="$store.player.next()" title="Next"> <button class="player-btn" @click="$store.player.next()" title="{{ t.player_next }}">
<svg viewBox="0 0 24 24" fill="currentColor"><path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z"/></svg> <svg viewBox="0 0 24 24" fill="currentColor"><path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z"/></svg>
</button> </button>
<button class="player-btn" :class="{ active: $store.player.repeatMode !== 'off' }" @click="$store.player.cycleRepeat()" title="Repeat"> <button class="player-btn" :class="{ active: $store.player.repeatMode !== 'off' }" @click="$store.player.cycleRepeat()" title="{{ t.player_repeat }}">
<template x-if="$store.player.repeatMode !== 'one'"> <template x-if="$store.player.repeatMode !== 'one'">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="17 1 21 5 17 9"/><path d="M3 11V9a4 4 0 014-4h14"/><polyline points="7 23 3 19 7 15"/><path d="M21 13v2a4 4 0 01-4 4H3"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="17 1 21 5 17 9"/><path d="M3 11V9a4 4 0 014-4h14"/><polyline points="7 23 3 19 7 15"/><path d="M21 13v2a4 4 0 01-4 4H3"/></svg>
</template> </template>
@@ -951,6 +1005,7 @@
</div> </div>
<span class="player-time" x-text="formatTime($store.player.duration)"></span> <span class="player-time" x-text="formatTime($store.player.duration)"></span>
</div> </div>
<div class="player-version-chip">v{{ t.app_version() }}</div>
</div> </div>
<div class="player-right"> <div class="player-right">
@@ -968,13 +1023,13 @@
</button> </button>
<div class="volume-slider" <div class="volume-slider"
@pointerdown.prevent="$store.player.startVolumeDrag($event)" @pointerdown.prevent="$store.player.startVolumeDrag($event)"
aria-label="Volume"> aria-label="{{ t.player_volume }}">
<div class="volume-slider-fill" :style="'width:' + ($store.player.volume * 100) + '%'"> <div class="volume-slider-fill" :style="'width:' + ($store.player.volume * 100) + '%'">
<div class="volume-slider-thumb"></div> <div class="volume-slider-thumb"></div>
</div> </div>
</div> </div>
</div> </div>
<button class="queue-toggle-btn" :class="{ active: $store.queue.visible }" @click="$store.queue.visible = !$store.queue.visible" title="Queue"> <button class="queue-toggle-btn" :class="{ active: $store.queue.visible }" @click="$store.queue.visible = !$store.queue.visible" title="{{ t.player_queue }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
</button> </button>
</div> </div>
+543 -44
View File
@@ -165,6 +165,68 @@ button.user-stat:hover {
color: var(--text-subdued); color: var(--text-subdued);
} }
.lastfm-profile-action {
width: 100%;
min-height: 34px;
margin-top: 8px;
padding: 7px 9px;
border: 1px solid var(--border-color);
border-radius: 6px;
background: var(--bg-primary);
color: var(--text-secondary);
cursor: pointer;
display: flex;
align-items: center;
gap: 8px;
text-align: left;
transition: background 0.15s, border-color 0.15s, color 0.15s;
}
.lastfm-profile-action:not(:disabled):hover {
background: var(--bg-hover);
color: var(--text-primary);
}
.lastfm-profile-action:disabled {
cursor: default;
opacity: 0.72;
}
.lastfm-dot {
width: 8px;
height: 8px;
border-radius: 50%;
background: var(--text-subdued);
flex-shrink: 0;
}
.lastfm-profile-action.connected {
border-color: rgba(29, 185, 84, 0.32);
color: var(--text-primary);
}
.lastfm-profile-action.connected .lastfm-dot {
background: #1db954;
}
.lastfm-profile-action.available .lastfm-dot,
.lastfm-profile-action.needs-auth .lastfm-dot {
background: var(--accent);
}
.lastfm-profile-action.needs-auth {
border-color: rgba(255, 184, 77, 0.4);
}
.lastfm-profile-text {
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 11px;
font-weight: 650;
}
.sidebar-header { .sidebar-header {
padding: 16px; padding: 16px;
display: flex; display: flex;
@@ -571,6 +633,21 @@ button.user-stat:hover {
.release-meta .release-type { font-size: 12px; text-transform: uppercase; letter-spacing: 0.5px; color: var(--text-secondary); } .release-meta .release-type { font-size: 12px; text-transform: uppercase; letter-spacing: 0.5px; color: var(--text-secondary); }
.release-meta .release-title { font-size: 36px; font-weight: 900; line-height: 1.2; margin: 4px 0; } .release-meta .release-title { font-size: 36px; font-weight: 900; line-height: 1.2; margin: 4px 0; }
.release-title-row {
display: flex;
align-items: center;
gap: 10px;
min-width: 0;
}
.release-title-row .release-title {
min-width: 0;
}
.release-title-like {
flex: 0 0 auto;
margin-top: 4px;
}
.release-meta .release-artists { font-size: 14px; color: var(--text-secondary); } .release-meta .release-artists { font-size: 14px; color: var(--text-secondary); }
.artist-link { .artist-link {
@@ -646,11 +723,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;
@@ -677,6 +763,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;
@@ -911,12 +1034,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;
@@ -933,6 +1065,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;
@@ -995,12 +1141,28 @@ button.user-stat:hover {
overflow: hidden; overflow: hidden;
min-width: 0; min-width: 0;
} }
.player-track-title-row {
display: flex;
align-items: center;
gap: 6px;
min-width: 0;
}
.player-track-title { .player-track-title {
font-size: 13px; font-size: 13px;
font-weight: 500; font-weight: 500;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
min-width: 0;
}
.player-current-like {
width: 24px;
height: 24px;
padding: 4px;
flex: 0 0 auto;
} }
.player-track-artist { .player-track-artist {
@@ -1232,6 +1394,20 @@ button.user-stat:hover {
white-space: nowrap; white-space: nowrap;
} }
.player-version-chip {
width: 100%;
max-width: 600px;
margin-top: -2px;
padding-left: 0;
color: var(--text-subdued);
opacity: 0.55;
font-size: 9px;
line-height: 1;
font-weight: 500;
text-align: center;
pointer-events: none;
}
.mobile-account-chip { .mobile-account-chip {
display: none; display: none;
align-items: center; align-items: center;
@@ -1665,7 +1841,7 @@ button.user-stat:hover {
.modal-playlist-item svg { width: 16px; height: 16px; flex-shrink: 0; } .modal-playlist-item svg { width: 16px; height: 16px; flex-shrink: 0; }
.info-modal { .info-modal {
max-width: min(520px, calc(100vw - 24px)); max-width: min(620px, calc(100vw - 24px));
} }
.info-modal-head { .info-modal-head {
@@ -1687,14 +1863,72 @@ button.user-stat:hover {
border-radius: 8px; border-radius: 8px;
background: var(--bg-primary); background: var(--bg-primary);
color: var(--text-secondary); color: var(--text-secondary);
font-family: ui-monospace, SFMono-Regular, Consolas, monospace;
font-size: 13px; font-size: 13px;
line-height: 1.55; line-height: 1.55;
white-space: pre-wrap;
overflow: auto; overflow: auto;
max-height: min(58dvh, 520px); max-height: min(58dvh, 520px);
} }
.info-modal-plain {
margin: 0;
font-family: ui-monospace, SFMono-Regular, Consolas, monospace;
white-space: pre-wrap;
}
.info-table {
width: 100%;
border-collapse: collapse;
}
.info-table th,
.info-table td {
padding: 9px 0;
border-bottom: 1px solid rgba(255, 255, 255, 0.07);
vertical-align: top;
}
.info-table tr:last-child th,
.info-table tr:last-child td {
border-bottom: 0;
}
.info-table th {
width: 34%;
padding-right: 18px;
color: var(--text-subdued);
font-size: 11px;
font-weight: 700;
text-align: left;
text-transform: uppercase;
}
.info-table td {
color: var(--text-primary);
}
.info-link-list {
display: flex;
flex-wrap: wrap;
gap: 6px;
}
.info-link {
border: 1px solid rgba(29, 185, 84, 0.36);
border-radius: 999px;
background: rgba(29, 185, 84, 0.1);
color: var(--text-primary);
cursor: pointer;
padding: 3px 8px;
font: inherit;
line-height: 1.3;
}
.info-link:hover {
border-color: rgba(29, 185, 84, 0.7);
background: rgba(29, 185, 84, 0.18);
color: var(--accent);
}
.modal-btn { .modal-btn {
padding: 8px 16px; padding: 8px 16px;
border-radius: 20px; border-radius: 20px;
@@ -1707,7 +1941,16 @@ button.user-stat:hover {
.modal-btn:hover { filter: brightness(1.1); } .modal-btn:hover { filter: brightness(1.1); }
.modal-btn-primary { background: var(--accent); color: #000; } .modal-btn-primary { background: var(--accent); color: #000; }
.modal-btn-pause {
background: #f0b84d;
color: #111;
}
.modal-btn-ghost { background: transparent; color: var(--text-secondary); } .modal-btn-ghost { background: transparent; color: var(--text-secondary); }
.modal-btn-danger {
background: rgba(229,96,96,0.16);
color: #ffb9b9;
border: 1px solid rgba(229,96,96,0.32);
}
.modal-footer { .modal-footer {
display: flex; display: flex;
@@ -1716,9 +1959,10 @@ button.user-stat:hover {
} }
.torrent-modal { .torrent-modal {
width: min(860px, calc(100vw - 32px)); width: min(1180px, calc(100vw - 48px));
max-width: 860px; max-width: 1180px;
max-height: min(88dvh, 760px); height: min(820px, calc(100dvh - 64px));
max-height: calc(100dvh - 64px);
overflow: hidden; overflow: hidden;
} }
@@ -1728,6 +1972,8 @@ button.user-stat:hover {
justify-content: space-between; justify-content: space-between;
gap: 14px; gap: 14px;
margin-bottom: 12px; margin-bottom: 12px;
flex: 0 0 auto;
position: relative;
} }
.torrent-modal-head h3 { .torrent-modal-head h3 {
@@ -1759,16 +2005,53 @@ button.user-stat:hover {
white-space: nowrap; white-space: nowrap;
} }
.torrent-modal-close {
display: none;
align-items: center;
justify-content: center;
flex: 0 0 auto;
width: 34px;
height: 34px;
border: 1px solid var(--border-color);
border-radius: 999px;
background: var(--bg-primary);
color: var(--text-secondary);
cursor: pointer;
}
.torrent-modal-close svg {
width: 18px;
height: 18px;
}
.torrent-status-pill.active { .torrent-status-pill.active {
border-color: rgba(29,185,84,0.42); border-color: rgba(29,185,84,0.42);
color: #9ff0b9; color: #9ff0b9;
} }
.torrent-agent-pill.active {
border-color: rgba(240,184,77,0.45);
color: #ffd78a;
}
.torrent-agent-dot {
width: 7px;
height: 7px;
border-radius: 50%;
background: var(--text-subdued);
}
.torrent-agent-pill.active .torrent-agent-dot {
background: #f0b84d;
box-shadow: 0 0 0 3px rgba(240,184,77,0.14);
}
.torrent-manager-layout { .torrent-manager-layout {
display: grid; display: grid;
grid-template-columns: minmax(210px, 260px) minmax(0, 1fr); grid-template-columns: minmax(260px, 320px) minmax(0, 1fr);
gap: 14px; gap: 14px;
min-height: 0; min-height: 0;
flex: 1 1 auto;
} }
.torrent-manager-sidebar, .torrent-manager-sidebar,
@@ -1801,23 +2084,67 @@ button.user-stat:hover {
.torrent-session-list { .torrent-session-list {
overflow-y: auto; overflow-y: auto;
min-height: 150px; min-height: 0;
max-height: min(52vh, 470px); max-height: none;
flex: 1 1 auto;
} }
.torrent-session-row { .torrent-session-row {
display: grid; display: grid;
grid-template-columns: minmax(0, 1fr) auto; grid-template-columns: minmax(0, 1fr);
gap: 8px; gap: 8px;
padding: 10px 12px; padding: 10px 12px;
border-bottom: 1px solid var(--border-color); border-bottom: 1px solid var(--border-color);
cursor: pointer; cursor: pointer;
} }
.torrent-session-add {
width: 100%;
grid-template-columns: auto minmax(0, 1fr);
align-items: center;
border: 0;
border-bottom: 1px solid var(--border-color);
background: transparent;
color: var(--text-secondary);
text-align: left;
font: inherit;
font-size: 13px;
font-weight: 800;
}
.torrent-session-add:disabled {
cursor: default;
opacity: 0.6;
}
.torrent-session-add-icon {
display: inline-flex;
align-items: center;
justify-content: center;
width: 22px;
height: 22px;
border-radius: 999px;
border: 1px solid rgba(29,185,84,0.38);
color: #9ff0b9;
font-size: 16px;
line-height: 1;
}
.torrent-session-row:last-child { border-bottom: 0; } .torrent-session-row:last-child { border-bottom: 0; }
.torrent-session-row:hover, .torrent-session-row:hover,
.torrent-session-row.active { background: var(--bg-hover); } .torrent-session-row.active { background: var(--bg-hover); }
.torrent-session-main {
min-width: 0;
}
.torrent-session-topline {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
gap: 8px;
align-items: center;
}
.torrent-session-name { .torrent-session-name {
min-width: 0; min-width: 0;
color: var(--text-primary); color: var(--text-primary);
@@ -1828,6 +2155,54 @@ button.user-stat:hover {
white-space: nowrap; white-space: nowrap;
} }
.torrent-status-badge {
display: inline-flex;
align-items: center;
min-height: 20px;
padding: 2px 7px;
border-radius: 999px;
font-size: 10px;
font-weight: 900;
line-height: 1;
text-transform: uppercase;
white-space: nowrap;
}
.torrent-status-badge.status-preview {
background: rgba(122,162,255,0.16);
color: #adc3ff;
}
.torrent-status-badge.status-resolving {
background: rgba(182,141,255,0.16);
color: #d0b6ff;
}
.torrent-status-badge.status-downloading {
background: rgba(29,185,84,0.16);
color: #9ff0b9;
}
.torrent-status-badge.status-moving {
background: rgba(75,198,240,0.16);
color: #a8e8ff;
}
.torrent-status-badge.status-completed {
background: rgba(110,211,123,0.16);
color: #b8f7be;
}
.torrent-status-badge.status-paused {
background: rgba(240,184,77,0.18);
color: #ffd78a;
}
.torrent-status-badge.status-failed {
background: rgba(229,96,96,0.18);
color: #ffb9b9;
}
.torrent-session-meta { .torrent-session-meta {
margin-top: 4px; margin-top: 4px;
color: var(--text-subdued); color: var(--text-subdued);
@@ -1837,21 +2212,20 @@ button.user-stat:hover {
white-space: nowrap; white-space: nowrap;
} }
.torrent-session-remove { .torrent-session-progress {
align-self: flex-start; height: 5px;
border: 1px solid rgba(229,96,96,0.24); margin-top: 7px;
background: rgba(229,96,96,0.12); overflow: hidden;
color: #ffb9b9; border-radius: 999px;
border-radius: 5px; background: var(--bg-secondary);
padding: 4px 7px;
font-size: 11px;
font-weight: 800;
cursor: pointer;
} }
.torrent-session-remove:hover { .torrent-session-progress-bar {
background: rgba(229,96,96,0.2); height: 100%;
color: #ffd7d7; width: 0%;
border-radius: inherit;
background: linear-gradient(90deg, var(--accent), #7ee4a2);
transition: width 0.25s ease;
} }
.torrent-progress-card { .torrent-progress-card {
@@ -1889,12 +2263,44 @@ button.user-stat:hover {
} }
.torrent-progress-details { .torrent-progress-details {
display: flex; display: grid;
flex-wrap: wrap; grid-template-columns: repeat(4, minmax(0, 1fr));
gap: 8px 12px; gap: 8px;
margin-top: 8px; margin-top: 8px;
color: var(--text-subdued); color: var(--text-subdued);
min-height: 38px;
}
.torrent-progress-details.completed {
grid-template-columns: minmax(0, 1fr);
}
.torrent-progress-metric {
min-width: 0;
min-height: 38px;
padding: 5px 7px;
border-radius: 6px;
background: var(--bg-secondary);
display: flex;
flex-direction: column;
justify-content: center;
gap: 2px;
}
.torrent-progress-label {
color: var(--text-muted);
font-size: 10px;
line-height: 12px;
text-transform: uppercase;
font-weight: 800;
}
.torrent-progress-value {
color: var(--text-secondary);
font-size: 12px; font-size: 12px;
line-height: 14px;
font-weight: 700;
overflow-wrap: anywhere;
} }
.history-modal { .history-modal {
@@ -1958,6 +2364,26 @@ button.user-stat:hover {
max-width: 360px; max-width: 360px;
} }
.torrent-import-panel,
.torrent-workspace-empty {
min-height: 150px;
}
.torrent-upload-summary {
min-height: 16px;
margin-top: 5px;
color: var(--text-subdued);
font-size: 11px;
}
.torrent-upload-progress {
margin-top: 10px;
padding: 10px 12px;
border: 1px solid var(--border-color);
border-radius: 8px;
background: var(--bg-primary);
}
.torrent-modal label { .torrent-modal label {
display: block; display: block;
margin-bottom: 6px; margin-bottom: 6px;
@@ -2002,6 +2428,13 @@ button.user-stat:hover {
margin-top: 16px; margin-top: 16px;
} }
.torrent-preview-actions {
display: flex;
flex-wrap: wrap;
justify-content: flex-end;
gap: 8px;
}
.torrent-preview-title { .torrent-preview-title {
min-width: 0; min-width: 0;
font-size: 14px; font-size: 14px;
@@ -2058,7 +2491,7 @@ button.user-stat:hover {
margin-top: 10px; margin-top: 10px;
overflow-y: auto; overflow-y: auto;
min-height: 140px; min-height: 140px;
max-height: min(46vh, 420px); max-height: none;
border: 1px solid var(--border-color); border: 1px solid var(--border-color);
border-radius: 8px; border-radius: 8px;
background: var(--bg-primary); background: var(--bg-primary);
@@ -2256,12 +2689,8 @@ button.user-stat:hover {
display: block; display: block;
} }
.version-chip {
display: none;
}
.torrent-modal { .torrent-modal {
width: calc(100vw - 24px); width: min(1180px, calc(100vw - 32px));
} }
.card-grid { .card-grid {
@@ -2397,6 +2826,13 @@ button.user-stat:hover {
gap: 6px; gap: 6px;
} }
.player-version-chip {
max-width: none;
padding-left: 0;
opacity: 0.62;
font-size: 9px;
}
.player-time { .player-time {
min-width: 34px; min-width: 34px;
font-size: 10px; font-size: 10px;
@@ -2576,6 +3012,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;
@@ -2598,34 +3052,65 @@ button.user-stat:hover {
} }
.info-modal, .info-modal,
.torrent-modal,
.history-modal { .history-modal {
width: min(400px, calc(100vw - 24px)); width: min(400px, calc(100vw - 24px));
max-width: 400px; max-width: 400px;
} }
.info-table th,
.info-table td {
display: block;
width: 100%;
padding-right: 0;
}
.info-table th {
padding-bottom: 2px;
border-bottom: 0;
}
.info-table td {
padding-top: 0;
}
.torrent-modal { .torrent-modal {
max-height: min(82dvh, 640px); width: 100vw;
padding: 20px; max-width: none;
height: 100dvh;
max-height: none;
border-radius: 0;
padding: calc(14px + env(safe-area-inset-top)) 14px calc(14px + env(safe-area-inset-bottom));
overflow: hidden;
} }
.torrent-modal-head { .torrent-modal-head {
flex-direction: column; display: grid;
grid-template-columns: minmax(0, 1fr) auto;
gap: 8px; gap: 8px;
align-items: start;
} }
.torrent-client-status { .torrent-client-status {
grid-column: 1 / -1;
justify-content: flex-start; justify-content: flex-start;
} }
.torrent-modal-close {
display: inline-flex;
}
.torrent-manager-layout { .torrent-manager-layout {
grid-template-columns: 1fr; grid-template-columns: 1fr;
gap: 10px; gap: 10px;
} }
.torrent-session-list { .torrent-session-list {
max-height: 148px; max-height: none;
min-height: 96px; min-height: 0;
}
.torrent-manager-sidebar {
flex: 0 0 178px;
} }
.torrent-progress-head { .torrent-progress-head {
@@ -2634,6 +3119,14 @@ button.user-stat:hover {
gap: 4px; gap: 4px;
} }
.torrent-progress-details {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
.torrent-progress-details.completed {
grid-template-columns: minmax(0, 1fr);
}
.torrent-modal h3 { .torrent-modal h3 {
margin-bottom: 12px; margin-bottom: 12px;
} }
@@ -2671,8 +3164,8 @@ button.user-stat:hover {
} }
.torrent-file-tree { .torrent-file-tree {
min-height: 120px; min-height: 0;
max-height: min(32dvh, 260px); max-height: none;
} }
.torrent-tree-row { .torrent-tree-row {
@@ -2703,6 +3196,12 @@ button.user-stat:hover {
.player-track-artist { font-size: 10px; } .player-track-artist { font-size: 10px; }
.player-buttons { gap: 10px; } .player-buttons { gap: 10px; }
.player-version-chip {
padding-left: 0;
font-size: 8px;
opacity: 0.58;
}
.volume-control { .volume-control {
gap: 4px; gap: 4px;
} }