Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c0342ed987 | |||
| 4b8797bb2e |
Generated
+1
-1
@@ -1397,7 +1397,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
|
||||
|
||||
[[package]]
|
||||
name = "furumusic"
|
||||
version = "0.1.13"
|
||||
version = "0.1.15"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "furumusic"
|
||||
version = "0.1.14"
|
||||
version = "0.1.16"
|
||||
edition = "2024"
|
||||
description = "Reusable web-app boilerplate: auth, OIDC/SSO, admin panel, user management, i18n, PostgreSQL"
|
||||
|
||||
|
||||
@@ -264,6 +264,27 @@ impl App for AdminApp {
|
||||
}),
|
||||
"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(
|
||||
"/v2/api/jobs/{name}/toggle",
|
||||
cot::router::method::post({
|
||||
|
||||
+249
-1
@@ -1,6 +1,6 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use cot::db::Database;
|
||||
use cot::db::{Database, Model};
|
||||
use cot::html::Html;
|
||||
use cot::http::StatusCode;
|
||||
use cot::http::header::CONTENT_TYPE;
|
||||
@@ -13,7 +13,9 @@ use serde::{Deserialize, Serialize};
|
||||
use sqlx::{PgPool, Postgres, QueryBuilder};
|
||||
|
||||
use super::BUILD_INFO;
|
||||
use crate::agent;
|
||||
use crate::auth::{self, AuthenticatedUser, Role};
|
||||
use crate::config::{AppConfig, ConfigEntry, ConfigSources};
|
||||
use crate::i18n::{I18n, Translations};
|
||||
use crate::scheduler::{JobRegistry, ScheduledJob};
|
||||
|
||||
@@ -214,6 +216,95 @@ struct MutationResponse {
|
||||
affected: u64,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, JsonSchema)]
|
||||
struct AdminSettingsDto {
|
||||
values: AdminSettingsValues,
|
||||
sources: AdminSettingsSources,
|
||||
lastfm_api_key_configured: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
|
||||
struct AdminSettingsValues {
|
||||
auth_password_enabled: bool,
|
||||
auth_sso_enabled: bool,
|
||||
oidc_button_text: String,
|
||||
oidc_issuer: String,
|
||||
oidc_client_id: String,
|
||||
oidc_client_secret: String,
|
||||
oidc_admin_groups: String,
|
||||
oidc_user_groups: String,
|
||||
swagger_enabled: bool,
|
||||
lastfm_api_key: String,
|
||||
agent_enabled: bool,
|
||||
agent_inbox_dir: String,
|
||||
agent_storage_dir: String,
|
||||
agent_llm_url: String,
|
||||
agent_llm_model: String,
|
||||
agent_llm_auth: String,
|
||||
agent_confidence_threshold: String,
|
||||
agent_context_limit: String,
|
||||
agent_concurrency: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, JsonSchema)]
|
||||
struct AdminSettingsSources {
|
||||
auth_password_enabled: &'static str,
|
||||
auth_sso_enabled: &'static str,
|
||||
oidc_button_text: &'static str,
|
||||
oidc_issuer: &'static str,
|
||||
oidc_client_id: &'static str,
|
||||
oidc_client_secret: &'static str,
|
||||
oidc_admin_groups: &'static str,
|
||||
oidc_user_groups: &'static str,
|
||||
swagger_enabled: &'static str,
|
||||
lastfm_api_key: &'static str,
|
||||
agent_enabled: &'static str,
|
||||
agent_inbox_dir: &'static str,
|
||||
agent_storage_dir: &'static str,
|
||||
agent_llm_url: &'static str,
|
||||
agent_llm_model: &'static str,
|
||||
agent_llm_auth: &'static str,
|
||||
agent_confidence_threshold: &'static str,
|
||||
agent_context_limit: &'static str,
|
||||
agent_concurrency: &'static str,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub(super) struct UpdateSettingsRequest {
|
||||
auth_password_enabled: bool,
|
||||
auth_sso_enabled: bool,
|
||||
oidc_button_text: String,
|
||||
oidc_issuer: String,
|
||||
oidc_client_id: String,
|
||||
oidc_client_secret: String,
|
||||
oidc_admin_groups: String,
|
||||
oidc_user_groups: String,
|
||||
swagger_enabled: bool,
|
||||
lastfm_api_key: String,
|
||||
agent_enabled: bool,
|
||||
agent_inbox_dir: String,
|
||||
agent_storage_dir: String,
|
||||
agent_llm_url: String,
|
||||
agent_llm_model: String,
|
||||
agent_llm_auth: String,
|
||||
agent_confidence_threshold: String,
|
||||
agent_context_limit: String,
|
||||
agent_concurrency: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, JsonSchema)]
|
||||
struct AgentProbeDto {
|
||||
status: String,
|
||||
ok: bool,
|
||||
model_intro: String,
|
||||
model_name: String,
|
||||
prompt_tokens: Option<u32>,
|
||||
completion_tokens: Option<u32>,
|
||||
tokens_per_sec: Option<f64>,
|
||||
latency_ms: u64,
|
||||
error: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, JsonSchema)]
|
||||
struct LibraryOverviewDto {
|
||||
artists: i64,
|
||||
@@ -458,6 +549,163 @@ pub async fn jobs(
|
||||
Json(jobs).into_response()
|
||||
}
|
||||
|
||||
pub async fn settings(session: Session, db: Database) -> cot::Result<cot::response::Response> {
|
||||
if let Err(response) = require_admin_json(&session, &db).await {
|
||||
return Ok(response);
|
||||
}
|
||||
let (config, sources) = AppConfig::load_with_db(&db).await;
|
||||
Json(settings_dto(config, sources)).into_response()
|
||||
}
|
||||
|
||||
pub async fn update_settings(
|
||||
session: Session,
|
||||
db: Database,
|
||||
Json(body): Json<UpdateSettingsRequest>,
|
||||
) -> cot::Result<cot::response::Response> {
|
||||
if let Err(response) = require_admin_json(&session, &db).await {
|
||||
return Ok(response);
|
||||
}
|
||||
let fields = [
|
||||
(
|
||||
"auth_password_enabled",
|
||||
body.auth_password_enabled.to_string(),
|
||||
),
|
||||
("auth_sso_enabled", body.auth_sso_enabled.to_string()),
|
||||
("oidc_button_text", body.oidc_button_text.trim().to_string()),
|
||||
("oidc_issuer", body.oidc_issuer.trim().to_string()),
|
||||
("oidc_client_id", body.oidc_client_id.trim().to_string()),
|
||||
(
|
||||
"oidc_client_secret",
|
||||
body.oidc_client_secret.trim().to_string(),
|
||||
),
|
||||
(
|
||||
"oidc_admin_groups",
|
||||
body.oidc_admin_groups.trim().to_string(),
|
||||
),
|
||||
("oidc_user_groups", body.oidc_user_groups.trim().to_string()),
|
||||
("swagger_enabled", body.swagger_enabled.to_string()),
|
||||
("lastfm_api_key", body.lastfm_api_key.trim().to_string()),
|
||||
("agent_enabled", body.agent_enabled.to_string()),
|
||||
("agent_inbox_dir", body.agent_inbox_dir.trim().to_string()),
|
||||
(
|
||||
"agent_storage_dir",
|
||||
body.agent_storage_dir.trim().to_string(),
|
||||
),
|
||||
("agent_llm_url", body.agent_llm_url.trim().to_string()),
|
||||
("agent_llm_model", body.agent_llm_model.trim().to_string()),
|
||||
("agent_llm_auth", body.agent_llm_auth.trim().to_string()),
|
||||
(
|
||||
"agent_confidence_threshold",
|
||||
body.agent_confidence_threshold.trim().to_string(),
|
||||
),
|
||||
(
|
||||
"agent_context_limit",
|
||||
body.agent_context_limit.trim().to_string(),
|
||||
),
|
||||
(
|
||||
"agent_concurrency",
|
||||
body.agent_concurrency.trim().to_string(),
|
||||
),
|
||||
];
|
||||
for (key, value) in fields {
|
||||
let mut entry = ConfigEntry::new(key.to_string(), value);
|
||||
entry
|
||||
.save(&db)
|
||||
.await
|
||||
.map_err(|e| cot::Error::internal(e.to_string()))?;
|
||||
}
|
||||
Json(serde_json::json!({ "ok": true })).into_response()
|
||||
}
|
||||
|
||||
pub async fn settings_probe(
|
||||
session: Session,
|
||||
db: Database,
|
||||
) -> cot::Result<cot::response::Response> {
|
||||
if let Err(response) = require_admin_json(&session, &db).await {
|
||||
return Ok(response);
|
||||
}
|
||||
let (config, _) = AppConfig::load_with_db(&db).await;
|
||||
let probe = if config.agent_enabled && !config.agent_llm_url.is_empty() {
|
||||
agent::probe_llm(
|
||||
&config.agent_llm_url,
|
||||
&config.agent_llm_model,
|
||||
&config.agent_llm_auth,
|
||||
)
|
||||
.await
|
||||
} else {
|
||||
agent::AgentProbeResult::default()
|
||||
};
|
||||
let status = if !config.agent_enabled {
|
||||
"disabled"
|
||||
} else if config.agent_llm_url.is_empty() {
|
||||
"not_configured"
|
||||
} else if probe.ok {
|
||||
"ok"
|
||||
} else {
|
||||
"error"
|
||||
};
|
||||
Json(AgentProbeDto {
|
||||
status: status.to_string(),
|
||||
ok: probe.ok,
|
||||
model_intro: probe.model_intro,
|
||||
model_name: probe.model_name,
|
||||
prompt_tokens: probe.prompt_tokens,
|
||||
completion_tokens: probe.completion_tokens,
|
||||
tokens_per_sec: probe.tokens_per_sec,
|
||||
latency_ms: probe.latency_ms,
|
||||
error: probe.error,
|
||||
})
|
||||
.into_response()
|
||||
}
|
||||
|
||||
fn settings_dto(config: AppConfig, sources: ConfigSources) -> AdminSettingsDto {
|
||||
AdminSettingsDto {
|
||||
lastfm_api_key_configured: !config.lastfm_api_key.trim().is_empty(),
|
||||
values: AdminSettingsValues {
|
||||
auth_password_enabled: config.auth_password_enabled,
|
||||
auth_sso_enabled: config.auth_sso_enabled,
|
||||
oidc_button_text: config.oidc_button_text,
|
||||
oidc_issuer: config.oidc_issuer,
|
||||
oidc_client_id: config.oidc_client_id,
|
||||
oidc_client_secret: config.oidc_client_secret,
|
||||
oidc_admin_groups: config.oidc_admin_groups,
|
||||
oidc_user_groups: config.oidc_user_groups,
|
||||
swagger_enabled: config.swagger_enabled,
|
||||
lastfm_api_key: config.lastfm_api_key,
|
||||
agent_enabled: config.agent_enabled,
|
||||
agent_inbox_dir: config.agent_inbox_dir,
|
||||
agent_storage_dir: config.agent_storage_dir,
|
||||
agent_llm_url: config.agent_llm_url,
|
||||
agent_llm_model: config.agent_llm_model,
|
||||
agent_llm_auth: config.agent_llm_auth,
|
||||
agent_confidence_threshold: config.agent_confidence_threshold.to_string(),
|
||||
agent_context_limit: config.agent_context_limit.to_string(),
|
||||
agent_concurrency: config.agent_concurrency.to_string(),
|
||||
},
|
||||
sources: AdminSettingsSources {
|
||||
auth_password_enabled: sources.auth_password_enabled.code(),
|
||||
auth_sso_enabled: sources.auth_sso_enabled.code(),
|
||||
oidc_button_text: sources.oidc_button_text.code(),
|
||||
oidc_issuer: sources.oidc_issuer.code(),
|
||||
oidc_client_id: sources.oidc_client_id.code(),
|
||||
oidc_client_secret: sources.oidc_client_secret.code(),
|
||||
oidc_admin_groups: sources.oidc_admin_groups.code(),
|
||||
oidc_user_groups: sources.oidc_user_groups.code(),
|
||||
swagger_enabled: sources.swagger_enabled.code(),
|
||||
lastfm_api_key: sources.lastfm_api_key.code(),
|
||||
agent_enabled: sources.agent_enabled.code(),
|
||||
agent_inbox_dir: sources.agent_inbox_dir.code(),
|
||||
agent_storage_dir: sources.agent_storage_dir.code(),
|
||||
agent_llm_url: sources.agent_llm_url.code(),
|
||||
agent_llm_model: sources.agent_llm_model.code(),
|
||||
agent_llm_auth: sources.agent_llm_auth.code(),
|
||||
agent_confidence_threshold: sources.agent_confidence_threshold.code(),
|
||||
agent_context_limit: sources.agent_context_limit.code(),
|
||||
agent_concurrency: sources.agent_concurrency.code(),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn run_job(
|
||||
session: Session,
|
||||
db: Database,
|
||||
|
||||
@@ -133,6 +133,7 @@ pub struct ConfigSources {
|
||||
pub agent_confidence_threshold: ConfigSource,
|
||||
pub agent_context_limit: ConfigSource,
|
||||
pub agent_concurrency: ConfigSource,
|
||||
pub lastfm_api_key: ConfigSource,
|
||||
}
|
||||
|
||||
impl Default for ConfigSources {
|
||||
@@ -158,6 +159,7 @@ impl Default for ConfigSources {
|
||||
agent_confidence_threshold: ConfigSource::Default,
|
||||
agent_context_limit: ConfigSource::Default,
|
||||
agent_concurrency: ConfigSource::Default,
|
||||
lastfm_api_key: ConfigSource::Default,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -262,6 +264,8 @@ pub struct AppConfig {
|
||||
pub agent_context_limit: u64,
|
||||
/// Number of files to process in parallel via the LLM.
|
||||
pub agent_concurrency: u64,
|
||||
/// Last.fm API key for weekly popularity enrichment.
|
||||
pub lastfm_api_key: String,
|
||||
}
|
||||
|
||||
impl Default for AppConfig {
|
||||
@@ -287,6 +291,7 @@ impl Default for AppConfig {
|
||||
agent_confidence_threshold: 0.85,
|
||||
agent_context_limit: 8192,
|
||||
agent_concurrency: 2,
|
||||
lastfm_api_key: String::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -313,6 +318,7 @@ impl_env_overrides!(
|
||||
agent_confidence_threshold,
|
||||
agent_context_limit,
|
||||
agent_concurrency,
|
||||
lastfm_api_key,
|
||||
);
|
||||
|
||||
impl AppConfig {
|
||||
@@ -396,6 +402,7 @@ impl AppConfig {
|
||||
apply_db_field!(agent_confidence_threshold);
|
||||
apply_db_field!(agent_context_limit);
|
||||
apply_db_field!(agent_concurrency);
|
||||
apply_db_field!(lastfm_api_key);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -321,6 +321,11 @@ translations! {
|
||||
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_play: "Play" , "Играть";
|
||||
player_like: "Like" , "Лайк";
|
||||
player_add_to_queue: "Add to queue" , "Добавить в очередь";
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
@@ -3,6 +3,7 @@ pub mod artist_track_image_backfill;
|
||||
pub mod cover_backfill;
|
||||
pub mod inbox_discover;
|
||||
pub mod inbox_process;
|
||||
pub mod lastfm_popularity;
|
||||
pub mod metadata_backfill;
|
||||
|
||||
use std::path::{Component, Path, PathBuf};
|
||||
|
||||
@@ -53,6 +53,7 @@ fn build_registry() -> Arc<JobRegistry> {
|
||||
registry.register(jobs::artist_image_backfill::ArtistImageBackfillJob);
|
||||
registry.register(jobs::artist_track_image_backfill::ArtistTrackImageBackfillJob);
|
||||
registry.register(jobs::metadata_backfill::MetadataBackfillJob);
|
||||
registry.register(jobs::lastfm_popularity::LastfmPopularityJob);
|
||||
Arc::new(registry)
|
||||
}
|
||||
|
||||
|
||||
@@ -1637,6 +1637,61 @@ pub mod db_migrations {
|
||||
&[Operation::custom(create_torrent_session).build()];
|
||||
}
|
||||
|
||||
// -- M0032: Last.fm track popularity ------------------------------------
|
||||
|
||||
#[cot::db::migrations::migration_op]
|
||||
async fn create_lastfm_track_popularity(
|
||||
ctx: migrations::MigrationContext<'_>,
|
||||
) -> cot::db::Result<()> {
|
||||
ctx.db
|
||||
.raw("ALTER TABLE furumusic__track ADD COLUMN lastfm_listeners BIGINT")
|
||||
.await?;
|
||||
ctx.db
|
||||
.raw("ALTER TABLE furumusic__track ADD COLUMN lastfm_playcount BIGINT")
|
||||
.await?;
|
||||
ctx.db
|
||||
.raw("ALTER TABLE furumusic__track ADD COLUMN lastfm_rating DOUBLE PRECISION")
|
||||
.await?;
|
||||
ctx.db
|
||||
.raw("ALTER TABLE furumusic__track ADD COLUMN lastfm_updated_at VARCHAR(32)")
|
||||
.await?;
|
||||
ctx.db
|
||||
.raw(
|
||||
"CREATE TABLE IF NOT EXISTS furumusic__track_popularity_history (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
track_id BIGINT NOT NULL,
|
||||
source VARCHAR(32) NOT NULL,
|
||||
listeners BIGINT NOT NULL,
|
||||
playcount BIGINT NOT NULL,
|
||||
rating DOUBLE PRECISION NOT NULL,
|
||||
fetched_at VARCHAR(32) NOT NULL
|
||||
)",
|
||||
)
|
||||
.await?;
|
||||
ctx.db
|
||||
.raw(
|
||||
"CREATE INDEX IF NOT EXISTS idx_track_popularity_history_track
|
||||
ON furumusic__track_popularity_history (track_id, fetched_at DESC)",
|
||||
)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct M0032CreateLastfmTrackPopularity;
|
||||
|
||||
impl migrations::Migration for M0032CreateLastfmTrackPopularity {
|
||||
const APP_NAME: &'static str = "furumusic";
|
||||
const MIGRATION_NAME: &'static str = "m_0032_create_lastfm_track_popularity";
|
||||
const DEPENDENCIES: &'static [migrations::MigrationDependency] =
|
||||
&[migrations::MigrationDependency::migration(
|
||||
"furumusic",
|
||||
"m_0031_create_torrent_session",
|
||||
)];
|
||||
const OPERATIONS: &'static [Operation] =
|
||||
&[Operation::custom(create_lastfm_track_popularity).build()];
|
||||
}
|
||||
|
||||
pub const MIGRATIONS: &[&SyncDynMigration] = &[
|
||||
&M0006CreateMediaFile,
|
||||
&M0007CreateArtist,
|
||||
@@ -1659,5 +1714,6 @@ pub mod db_migrations {
|
||||
&M0029AddPlaybackVolume,
|
||||
&M0030AddMediaFileUploader,
|
||||
&M0031CreateTorrentSession,
|
||||
&M0032CreateLastfmTrackPopularity,
|
||||
];
|
||||
}
|
||||
|
||||
+1
-5
@@ -389,11 +389,7 @@ pub async fn oidc_callback_handler(
|
||||
config.oidc_user_groups,
|
||||
);
|
||||
|
||||
if !is_allowed_by_groups(
|
||||
&groups,
|
||||
&config.oidc_user_groups,
|
||||
&config.oidc_admin_groups,
|
||||
) {
|
||||
if !is_allowed_by_groups(&groups, &config.oidc_user_groups, &config.oidc_admin_groups) {
|
||||
tracing::warn!(
|
||||
"OIDC login denied by group allowlist: sub={sub}, groups={groups:?}, user_groups={:?}, admin_groups={:?}",
|
||||
config.oidc_user_groups,
|
||||
|
||||
@@ -64,6 +64,10 @@ pub(super) struct TrackItem {
|
||||
pub(super) audio_sample_rate: Option<i32>,
|
||||
pub(super) audio_bit_depth: Option<i32>,
|
||||
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)]
|
||||
@@ -84,6 +88,10 @@ pub(super) struct ArtistAppearanceTrack {
|
||||
pub(super) audio_sample_rate: Option<i32>,
|
||||
pub(super) audio_bit_depth: Option<i32>,
|
||||
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)]
|
||||
|
||||
+70
-16
@@ -313,7 +313,11 @@ async fn artist_detail_handler(
|
||||
mf.audio_bitrate,
|
||||
mf.audio_sample_rate,
|
||||
mf.audio_bit_depth,
|
||||
mf.file_size_bytes
|
||||
mf.file_size_bytes,
|
||||
t.lastfm_listeners,
|
||||
t.lastfm_playcount,
|
||||
t.lastfm_rating,
|
||||
t.lastfm_updated_at
|
||||
FROM furumusic__track_artist ta
|
||||
JOIN furumusic__track t ON t.id = ta.track_id
|
||||
JOIN furumusic__release r ON r.id = t.release_id
|
||||
@@ -390,6 +394,10 @@ async fn artist_detail_handler(
|
||||
audio_sample_rate: t.audio_sample_rate,
|
||||
audio_bit_depth: t.audio_bit_depth,
|
||||
file_size_bytes: t.file_size_bytes,
|
||||
lastfm_listeners: t.lastfm_listeners,
|
||||
lastfm_playcount: t.lastfm_playcount,
|
||||
lastfm_rating: t.lastfm_rating,
|
||||
lastfm_updated_at: t.lastfm_updated_at,
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
@@ -459,7 +467,11 @@ async fn release_detail_handler(
|
||||
mf.audio_bitrate,
|
||||
mf.audio_sample_rate,
|
||||
mf.audio_bit_depth,
|
||||
mf.file_size_bytes
|
||||
mf.file_size_bytes,
|
||||
t.lastfm_listeners,
|
||||
t.lastfm_playcount,
|
||||
t.lastfm_rating,
|
||||
t.lastfm_updated_at
|
||||
FROM furumusic__track t
|
||||
JOIN furumusic__release r ON r.id = t.release_id
|
||||
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
||||
@@ -535,6 +547,10 @@ async fn release_detail_handler(
|
||||
audio_sample_rate: t.audio_sample_rate,
|
||||
audio_bit_depth: t.audio_bit_depth,
|
||||
file_size_bytes: t.file_size_bytes,
|
||||
lastfm_listeners: t.lastfm_listeners,
|
||||
lastfm_playcount: t.lastfm_playcount,
|
||||
lastfm_rating: t.lastfm_rating,
|
||||
lastfm_updated_at: t.lastfm_updated_at,
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
@@ -689,7 +705,11 @@ async fn playlist_detail_handler(
|
||||
mf.audio_bitrate,
|
||||
mf.audio_sample_rate,
|
||||
mf.audio_bit_depth,
|
||||
mf.file_size_bytes
|
||||
mf.file_size_bytes,
|
||||
t.lastfm_listeners,
|
||||
t.lastfm_playcount,
|
||||
t.lastfm_rating,
|
||||
t.lastfm_updated_at
|
||||
FROM furumusic__playlist_track pt
|
||||
JOIN furumusic__track t ON t.id = pt.track_id
|
||||
JOIN furumusic__release r ON r.id = t.release_id
|
||||
@@ -785,6 +805,10 @@ async fn build_track_items(
|
||||
audio_sample_rate: t.audio_sample_rate,
|
||||
audio_bit_depth: t.audio_bit_depth,
|
||||
file_size_bytes: t.file_size_bytes,
|
||||
lastfm_listeners: t.lastfm_listeners,
|
||||
lastfm_playcount: t.lastfm_playcount,
|
||||
lastfm_rating: t.lastfm_rating,
|
||||
lastfm_updated_at: t.lastfm_updated_at,
|
||||
}
|
||||
})
|
||||
.collect())
|
||||
@@ -962,7 +986,10 @@ async fn local_upload_handler(
|
||||
.await
|
||||
.map_err(|err| cot::Error::internal(err.to_string()))?;
|
||||
if bytes.is_empty() {
|
||||
return Ok(json_error(StatusCode::BAD_REQUEST, "uploaded file is empty"));
|
||||
return Ok(json_error(
|
||||
StatusCode::BAD_REQUEST,
|
||||
"uploaded file is empty",
|
||||
));
|
||||
}
|
||||
|
||||
let upload_dir = inbox_root
|
||||
@@ -1404,7 +1431,11 @@ async fn search_handler(
|
||||
mf.audio_bitrate,
|
||||
mf.audio_sample_rate,
|
||||
mf.audio_bit_depth,
|
||||
mf.file_size_bytes
|
||||
mf.file_size_bytes,
|
||||
t.lastfm_listeners,
|
||||
t.lastfm_playcount,
|
||||
t.lastfm_rating,
|
||||
t.lastfm_updated_at
|
||||
FROM furumusic__track t
|
||||
JOIN furumusic__release rel ON rel.id = t.release_id
|
||||
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
||||
@@ -1469,7 +1500,7 @@ async fn search_handler(
|
||||
let t = sqlx::query_as::<_, SearchTrackRow>(
|
||||
r#"SELECT id, title, track_number, disc_number, duration_seconds, cover_file_id,
|
||||
release_cover_file_id, release_year, uploader_name, audio_format, audio_bitrate,
|
||||
audio_sample_rate, audio_bit_depth, file_size_bytes FROM (
|
||||
audio_sample_rate, audio_bit_depth, file_size_bytes, lastfm_listeners, lastfm_playcount, lastfm_rating, lastfm_updated_at FROM (
|
||||
SELECT t.id, t.title::text AS title, t.track_number, t.disc_number,
|
||||
t.duration_seconds, t.cover_file_id,
|
||||
rel.cover_file_id AS release_cover_file_id,
|
||||
@@ -1480,20 +1511,27 @@ async fn search_handler(
|
||||
mf.audio_sample_rate,
|
||||
mf.audio_bit_depth,
|
||||
mf.file_size_bytes,
|
||||
t.lastfm_listeners,
|
||||
t.lastfm_playcount,
|
||||
t.lastfm_rating,
|
||||
t.lastfm_updated_at,
|
||||
MAX(sim) AS similarity
|
||||
FROM (
|
||||
SELECT id, title, title_sort, track_number, disc_number, duration_seconds, cover_file_id, release_id, audio_file_id,
|
||||
lastfm_listeners, lastfm_playcount, lastfm_rating, lastfm_updated_at,
|
||||
similarity(title_sort, $1) AS sim
|
||||
FROM furumusic__track WHERE is_hidden = false AND title_sort % $1
|
||||
UNION ALL
|
||||
SELECT id, title, title_sort, track_number, disc_number, duration_seconds, cover_file_id, release_id, audio_file_id,
|
||||
lastfm_listeners, lastfm_playcount, lastfm_rating, lastfm_updated_at,
|
||||
0.01::real AS sim
|
||||
FROM furumusic__track WHERE is_hidden = false AND title_sort ILIKE '%' || $1 || '%'
|
||||
) t
|
||||
JOIN furumusic__release rel ON rel.id = t.release_id
|
||||
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
||||
GROUP BY t.id, t.title, t.track_number, t.disc_number, t.duration_seconds, t.cover_file_id, rel.cover_file_id, rel.year,
|
||||
mf.uploader_name, mf.audio_format, mf.audio_bitrate, mf.audio_sample_rate, mf.audio_bit_depth, mf.file_size_bytes
|
||||
mf.uploader_name, mf.audio_format, mf.audio_bitrate, mf.audio_sample_rate, mf.audio_bit_depth, mf.file_size_bytes,
|
||||
t.lastfm_listeners, t.lastfm_playcount, t.lastfm_rating, t.lastfm_updated_at
|
||||
ORDER BY similarity DESC
|
||||
LIMIT $2
|
||||
) sub"#,
|
||||
@@ -1597,6 +1635,10 @@ async fn search_handler(
|
||||
audio_sample_rate: t.audio_sample_rate,
|
||||
audio_bit_depth: t.audio_bit_depth,
|
||||
file_size_bytes: t.file_size_bytes,
|
||||
lastfm_listeners: t.lastfm_listeners,
|
||||
lastfm_playcount: t.lastfm_playcount,
|
||||
lastfm_rating: t.lastfm_rating,
|
||||
lastfm_updated_at: t.lastfm_updated_at,
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
@@ -2161,7 +2203,11 @@ async fn tracks_by_ids_handler(
|
||||
mf.audio_bitrate,
|
||||
mf.audio_sample_rate,
|
||||
mf.audio_bit_depth,
|
||||
mf.file_size_bytes
|
||||
mf.file_size_bytes,
|
||||
t.lastfm_listeners,
|
||||
t.lastfm_playcount,
|
||||
t.lastfm_rating,
|
||||
t.lastfm_updated_at
|
||||
FROM furumusic__track t
|
||||
JOIN furumusic__release r ON r.id = t.release_id
|
||||
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
|
||||
@@ -2236,6 +2282,10 @@ async fn tracks_by_ids_handler(
|
||||
audio_sample_rate: t.audio_sample_rate,
|
||||
audio_bit_depth: t.audio_bit_depth,
|
||||
file_size_bytes: t.file_size_bytes,
|
||||
lastfm_listeners: t.lastfm_listeners,
|
||||
lastfm_playcount: t.lastfm_playcount,
|
||||
lastfm_rating: t.lastfm_rating,
|
||||
lastfm_updated_at: t.lastfm_updated_at,
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -2408,9 +2458,7 @@ impl App for PlayerApp {
|
||||
.await;
|
||||
let service = torrent_service
|
||||
.get_or_init(|| async {
|
||||
Arc::new(TorrentService::new(Arc::clone(
|
||||
&scheduler_handle,
|
||||
)))
|
||||
Arc::new(TorrentService::new(Arc::clone(&scheduler_handle)))
|
||||
})
|
||||
.await;
|
||||
match service.details(pg_pool, user.id, &path.0.id).await {
|
||||
@@ -2422,7 +2470,8 @@ impl App for PlayerApp {
|
||||
}
|
||||
}
|
||||
})
|
||||
.delete(move |session: Session, db: Database, path: Path<PathStringId>| {
|
||||
.delete(
|
||||
move |session: Session, db: Database, path: Path<PathStringId>| {
|
||||
let pool = Arc::clone(&pool);
|
||||
let pool_config = Arc::clone(&pool_config);
|
||||
let torrent_service = Arc::clone(&torrent_service);
|
||||
@@ -2449,13 +2498,16 @@ impl App for PlayerApp {
|
||||
})
|
||||
.await;
|
||||
match service.remove(pg_pool, user.id, &path.0.id).await {
|
||||
Ok(()) => Json(serde_json::json!({ "ok": true })).into_response(),
|
||||
Ok(()) => {
|
||||
Json(serde_json::json!({ "ok": true })).into_response()
|
||||
}
|
||||
Err(err) => {
|
||||
Ok(json_error(StatusCode::NOT_FOUND, &err.to_string()))
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
)
|
||||
},
|
||||
"player_torrent_detail",
|
||||
),
|
||||
@@ -2594,7 +2646,8 @@ impl App for PlayerApp {
|
||||
let pool_config = Arc::clone(&pool_config);
|
||||
let torrent_service = Arc::clone(&torrent_service);
|
||||
let scheduler_handle = Arc::clone(&self.scheduler_handle);
|
||||
post(move |session: Session, db: Database, path: Path<PathStringId>| {
|
||||
post(
|
||||
move |session: Session, db: Database, path: Path<PathStringId>| {
|
||||
let pool = Arc::clone(&pool);
|
||||
let pool_config = Arc::clone(&pool_config);
|
||||
let torrent_service = Arc::clone(&torrent_service);
|
||||
@@ -2627,7 +2680,8 @@ impl App for PlayerApp {
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
)
|
||||
},
|
||||
"player_torrent_pause",
|
||||
),
|
||||
|
||||
@@ -44,6 +44,10 @@ pub(super) struct TrackRow {
|
||||
pub(super) audio_sample_rate: Option<i32>,
|
||||
pub(super) audio_bit_depth: Option<i32>,
|
||||
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)]
|
||||
@@ -110,6 +114,10 @@ pub(super) struct PlaylistTrackRow {
|
||||
pub(super) audio_sample_rate: Option<i32>,
|
||||
pub(super) audio_bit_depth: Option<i32>,
|
||||
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)]
|
||||
@@ -128,6 +136,10 @@ pub(super) struct AppearanceTrackRow {
|
||||
pub(super) audio_sample_rate: Option<i32>,
|
||||
pub(super) audio_bit_depth: Option<i32>,
|
||||
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)]
|
||||
@@ -165,6 +177,10 @@ pub(super) struct SearchTrackRow {
|
||||
pub(super) audio_sample_rate: Option<i32>,
|
||||
pub(super) audio_bit_depth: Option<i32>,
|
||||
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)]
|
||||
|
||||
@@ -1347,7 +1347,7 @@ async fn run_scheduled_job(
|
||||
|
||||
// Check agent_enabled (re-read from DB every run)
|
||||
let (live_config, _) = AppConfig::load_with_db(db).await;
|
||||
if !live_config.agent_enabled {
|
||||
if !live_config.agent_enabled && job_name != "lastfm_popularity" {
|
||||
tracing::warn!(job = job_name, "Skipping: agent_enabled=false");
|
||||
return;
|
||||
}
|
||||
|
||||
+8
-4
@@ -746,9 +746,8 @@ impl TorrentService {
|
||||
self.stop_torrent(&handle).await;
|
||||
}
|
||||
|
||||
let result = sqlx::query(
|
||||
"DELETE FROM furumusic__torrent_session WHERE id = $1 AND user_id = $2",
|
||||
)
|
||||
let result =
|
||||
sqlx::query("DELETE FROM furumusic__torrent_session WHERE id = $1 AND user_id = $2")
|
||||
.bind(id)
|
||||
.bind(user_id)
|
||||
.execute(pool)
|
||||
@@ -784,7 +783,12 @@ impl TorrentService {
|
||||
if job.user_id != uploader_user_id {
|
||||
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");
|
||||
}
|
||||
validate_selection(&job.files, &selected_files)?;
|
||||
|
||||
+618
-12
@@ -667,6 +667,161 @@ tbody tr:hover {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.settings-page {
|
||||
max-width: none;
|
||||
}
|
||||
|
||||
.settings-layout {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(620px, 1fr) minmax(360px, 440px);
|
||||
gap: 14px;
|
||||
align-items: start;
|
||||
}
|
||||
|
||||
.settings-column {
|
||||
display: grid;
|
||||
gap: 14px;
|
||||
align-content: start;
|
||||
}
|
||||
|
||||
.settings-side .settings-grid {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
}
|
||||
|
||||
.settings-actions {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
|
||||
.settings-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 10px;
|
||||
padding: 14px;
|
||||
}
|
||||
|
||||
.settings-card {
|
||||
padding: 14px;
|
||||
}
|
||||
|
||||
.setting-field {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.setting-field label,
|
||||
.setting-toggle label {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 8px;
|
||||
margin-bottom: 6px;
|
||||
color: var(--text-secondary);
|
||||
font-size: 11px;
|
||||
font-weight: 800;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.setting-field input {
|
||||
width: 100%;
|
||||
height: 34px;
|
||||
padding: 0 10px;
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 6px;
|
||||
background: var(--bg-primary);
|
||||
color: var(--text-primary);
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.setting-field input:focus {
|
||||
border-color: var(--accent);
|
||||
}
|
||||
|
||||
.setting-toggle {
|
||||
min-height: 74px;
|
||||
padding: 12px;
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 8px;
|
||||
background: var(--bg-primary);
|
||||
}
|
||||
|
||||
.setting-toggle-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.setting-toggle-row span {
|
||||
color: var(--text-primary);
|
||||
font-size: 13px;
|
||||
font-weight: 800;
|
||||
}
|
||||
|
||||
.setting-toggle input {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
accent-color: var(--accent);
|
||||
}
|
||||
|
||||
.setting-help {
|
||||
margin-top: 6px;
|
||||
color: var(--text-subdued);
|
||||
font-size: 11px;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.source-pill {
|
||||
flex: 0 0 auto;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
height: 18px;
|
||||
padding: 0 6px;
|
||||
border-radius: 999px;
|
||||
background: rgba(255, 255, 255, 0.08);
|
||||
color: var(--text-subdued);
|
||||
font-size: 10px;
|
||||
font-weight: 850;
|
||||
text-transform: lowercase;
|
||||
}
|
||||
|
||||
.source-pill.env { background: rgba(90, 167, 255, 0.16); color: #9ccbff; }
|
||||
.source-pill.database { background: rgba(29, 185, 84, 0.16); color: #8ef0b2; }
|
||||
.source-pill.default { background: rgba(255, 255, 255, 0.08); color: var(--text-subdued); }
|
||||
|
||||
.settings-wide {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
|
||||
.settings-note {
|
||||
padding: 14px;
|
||||
color: var(--text-secondary);
|
||||
font-size: 12px;
|
||||
line-height: 1.55;
|
||||
}
|
||||
|
||||
.probe-body {
|
||||
padding: 14px;
|
||||
}
|
||||
|
||||
.probe-intro {
|
||||
margin: 0 0 12px;
|
||||
color: var(--text-primary);
|
||||
font-size: 13px;
|
||||
line-height: 1.45;
|
||||
}
|
||||
|
||||
.probe-table {
|
||||
display: grid;
|
||||
gap: 7px;
|
||||
color: var(--text-secondary);
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.probe-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.library-row {
|
||||
display: grid;
|
||||
grid-template-columns: 38px minmax(0, 1fr) 300px 130px;
|
||||
@@ -799,40 +954,45 @@ tbody tr:hover {
|
||||
|
||||
<div class="nav-group">
|
||||
<div class="nav-label">Operations</div>
|
||||
<button class="nav-btn" :class="{active: activeView === 'reviews'}" @click="activeView = 'reviews'">
|
||||
<button class="nav-btn" :class="{active: activeView === 'reviews'}" @click="openReviews()">
|
||||
<i data-lucide="inbox"></i>
|
||||
<span>Review Queue</span>
|
||||
<span class="nav-count" x-text="reviews.total || 0"></span>
|
||||
</button>
|
||||
<button class="nav-btn" :class="{active: activeView === 'jobs'}" @click="activeView = 'jobs'; loadJobs()">
|
||||
<button class="nav-btn" :class="{active: activeView === 'jobs'}" @click="openJobs()">
|
||||
<i data-lucide="calendar-clock"></i>
|
||||
<span>Tasks</span>
|
||||
<span class="nav-count" x-text="jobs.length || 0"></span>
|
||||
</button>
|
||||
<button class="nav-btn" :class="{active: activeView === 'library'}" @click="activeView = 'library'; loadLibrary()">
|
||||
<button class="nav-btn" :class="{active: activeView === 'library'}" @click="openLibrary(libraryKind)">
|
||||
<i data-lucide="library"></i>
|
||||
<span>Library Workbench</span>
|
||||
<span class="nav-count" x-text="fmt(stats.tracks || 0)"></span>
|
||||
</button>
|
||||
<button class="nav-btn" :class="{active: activeView === 'tools'}" @click="activeView = 'tools'">
|
||||
<button class="nav-btn" :class="{active: activeView === 'tools'}" @click="openTools()">
|
||||
<i data-lucide="wrench"></i>
|
||||
<span>Future Tools</span>
|
||||
</button>
|
||||
<button class="nav-btn" :class="{active: activeView === 'settings'}" @click="openSettings()">
|
||||
<i data-lucide="settings"></i>
|
||||
<span>Settings</span>
|
||||
<span class="nav-count" x-text="settings.lastfm_api_key_configured ? 'ok' : ''"></span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="nav-group">
|
||||
<div class="nav-label">Entities</div>
|
||||
<button class="nav-btn" @click="activeView = 'library'; libraryKind = 'artists'; loadLibrary()">
|
||||
<button class="nav-btn" @click="openLibrary('artists')">
|
||||
<i data-lucide="mic-2"></i>
|
||||
<span>Artists</span>
|
||||
<span class="nav-count" x-text="fmt(libraryOverview.artists || 0)"></span>
|
||||
</button>
|
||||
<button class="nav-btn" @click="activeView = 'library'; libraryKind = 'releases'; loadLibrary()">
|
||||
<button class="nav-btn" @click="openLibrary('releases')">
|
||||
<i data-lucide="disc-3"></i>
|
||||
<span>Releases</span>
|
||||
<span class="nav-count" x-text="fmt(libraryOverview.releases || 0)"></span>
|
||||
</button>
|
||||
<button class="nav-btn" @click="activeView = 'library'; libraryKind = 'playlists'; loadLibrary()">
|
||||
<button class="nav-btn" @click="openLibrary('playlists')">
|
||||
<i data-lucide="list-music"></i>
|
||||
<span>Playlists</span>
|
||||
<span class="nav-count" x-text="fmt(libraryOverview.playlists || 0)"></span>
|
||||
@@ -1130,9 +1290,9 @@ tbody tr:hover {
|
||||
</div>
|
||||
<div class="toolbar">
|
||||
<div class="segmented">
|
||||
<button class="seg-btn" :class="{active: libraryKind === 'artists'}" @click="libraryKind = 'artists'; loadLibrary()">Artists</button>
|
||||
<button class="seg-btn" :class="{active: libraryKind === 'releases'}" @click="libraryKind = 'releases'; loadLibrary()">Releases</button>
|
||||
<button class="seg-btn" :class="{active: libraryKind === 'playlists'}" @click="libraryKind = 'playlists'; loadLibrary()">Playlists</button>
|
||||
<button class="seg-btn" :class="{active: libraryKind === 'artists'}" @click="openLibrary('artists')">Artists</button>
|
||||
<button class="seg-btn" :class="{active: libraryKind === 'releases'}" @click="openLibrary('releases')">Releases</button>
|
||||
<button class="seg-btn" :class="{active: libraryKind === 'playlists'}" @click="openLibrary('playlists')">Playlists</button>
|
||||
</div>
|
||||
<input class="search" placeholder="Search library" x-model="librarySearch" @input.debounce.350ms="loadLibrary()" />
|
||||
</div>
|
||||
@@ -1236,6 +1396,253 @@ tbody tr:hover {
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<div class="content" x-show="activeView === 'settings'">
|
||||
<div class="settings-page">
|
||||
<form class="settings-layout" @submit.prevent="saveSettings()">
|
||||
<div class="settings-column">
|
||||
<section class="panel">
|
||||
<div class="panel-head">
|
||||
<div class="panel-title">
|
||||
<strong>OIDC</strong>
|
||||
<span>Identity provider and group mapping</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="settings-grid">
|
||||
<div class="setting-field settings-wide">
|
||||
<label>Callback URL</label>
|
||||
<input readonly :value="callbackUrl()" />
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>SSO button text</span>
|
||||
<span class="source-pill" :class="sourceClass('oidc_button_text')" x-text="settingSource('oidc_button_text')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.oidc_button_text" />
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>Issuer URL</span>
|
||||
<span class="source-pill" :class="sourceClass('oidc_issuer')" x-text="settingSource('oidc_issuer')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.oidc_issuer" placeholder="https://accounts.google.com" />
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>Client ID</span>
|
||||
<span class="source-pill" :class="sourceClass('oidc_client_id')" x-text="settingSource('oidc_client_id')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.oidc_client_id" />
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>Client secret</span>
|
||||
<span class="source-pill" :class="sourceClass('oidc_client_secret')" x-text="settingSource('oidc_client_secret')"></span>
|
||||
</label>
|
||||
<input type="password" x-model="settingsDraft.oidc_client_secret" autocomplete="off" />
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>Admin groups</span>
|
||||
<span class="source-pill" :class="sourceClass('oidc_admin_groups')" x-text="settingSource('oidc_admin_groups')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.oidc_admin_groups" placeholder="/admin,/furumusic-admins" />
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>User groups</span>
|
||||
<span class="source-pill" :class="sourceClass('oidc_user_groups')" x-text="settingSource('oidc_user_groups')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.oidc_user_groups" />
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="panel">
|
||||
<div class="panel-head">
|
||||
<div class="panel-title">
|
||||
<strong>Agent</strong>
|
||||
<span>AI processing directories, LLM endpoint, and execution limits</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="settings-grid">
|
||||
<div class="setting-toggle">
|
||||
<label>
|
||||
<span>Agent enabled</span>
|
||||
<span class="source-pill" :class="sourceClass('agent_enabled')" x-text="settingSource('agent_enabled')"></span>
|
||||
</label>
|
||||
<div class="setting-toggle-row">
|
||||
<span x-text="settingsDraft.agent_enabled ? 'Enabled' : 'Disabled'"></span>
|
||||
<input type="checkbox" x-model="settingsDraft.agent_enabled" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>Concurrency</span>
|
||||
<span class="source-pill" :class="sourceClass('agent_concurrency')" x-text="settingSource('agent_concurrency')"></span>
|
||||
</label>
|
||||
<input type="number" min="1" max="32" x-model="settingsDraft.agent_concurrency" />
|
||||
</div>
|
||||
<div class="setting-field settings-wide">
|
||||
<label>
|
||||
<span>Inbox directory</span>
|
||||
<span class="source-pill" :class="sourceClass('agent_inbox_dir')" x-text="settingSource('agent_inbox_dir')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.agent_inbox_dir" />
|
||||
</div>
|
||||
<div class="setting-field settings-wide">
|
||||
<label>
|
||||
<span>Storage directory</span>
|
||||
<span class="source-pill" :class="sourceClass('agent_storage_dir')" x-text="settingSource('agent_storage_dir')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.agent_storage_dir" />
|
||||
</div>
|
||||
<div class="setting-field settings-wide">
|
||||
<label>
|
||||
<span>LLM API URL</span>
|
||||
<span class="source-pill" :class="sourceClass('agent_llm_url')" x-text="settingSource('agent_llm_url')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.agent_llm_url" />
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>LLM model</span>
|
||||
<span class="source-pill" :class="sourceClass('agent_llm_model')" x-text="settingSource('agent_llm_model')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.agent_llm_model" />
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>LLM auth header</span>
|
||||
<span class="source-pill" :class="sourceClass('agent_llm_auth')" x-text="settingSource('agent_llm_auth')"></span>
|
||||
</label>
|
||||
<input type="password" x-model="settingsDraft.agent_llm_auth" autocomplete="off" />
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>Confidence threshold</span>
|
||||
<span class="source-pill" :class="sourceClass('agent_confidence_threshold')" x-text="settingSource('agent_confidence_threshold')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.agent_confidence_threshold" />
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>Context limit</span>
|
||||
<span class="source-pill" :class="sourceClass('agent_context_limit')" x-text="settingSource('agent_context_limit')"></span>
|
||||
</label>
|
||||
<input x-model="settingsDraft.agent_context_limit" />
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<div class="settings-column settings-side">
|
||||
<section class="panel">
|
||||
<div class="panel-head">
|
||||
<div class="panel-title">
|
||||
<strong>Authentication</strong>
|
||||
<span>Password and SSO access switches</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="settings-grid">
|
||||
<div class="setting-toggle">
|
||||
<label>
|
||||
<span>Password login</span>
|
||||
<span class="source-pill" :class="sourceClass('auth_password_enabled')" x-text="settingSource('auth_password_enabled')"></span>
|
||||
</label>
|
||||
<div class="setting-toggle-row">
|
||||
<span x-text="settingsDraft.auth_password_enabled ? 'Enabled' : 'Disabled'"></span>
|
||||
<input type="checkbox" x-model="settingsDraft.auth_password_enabled" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="setting-toggle">
|
||||
<label>
|
||||
<span>SSO login</span>
|
||||
<span class="source-pill" :class="sourceClass('auth_sso_enabled')" x-text="settingSource('auth_sso_enabled')"></span>
|
||||
</label>
|
||||
<div class="setting-toggle-row">
|
||||
<span x-text="settingsDraft.auth_sso_enabled ? 'Enabled' : 'Disabled'"></span>
|
||||
<input type="checkbox" x-model="settingsDraft.auth_sso_enabled" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="panel">
|
||||
<div class="panel-head">
|
||||
<div class="panel-title">
|
||||
<strong>API</strong>
|
||||
<span>Developer and enrichment integrations</span>
|
||||
</div>
|
||||
<span class="badge" :class="settings.lastfm_api_key_configured ? 'ok' : 'disabled'" x-text="settings.lastfm_api_key_configured ? 'Last.fm configured' : 'Last.fm missing'"></span>
|
||||
</div>
|
||||
<div class="settings-grid">
|
||||
<div class="setting-toggle">
|
||||
<label>
|
||||
<span>Swagger UI</span>
|
||||
<span class="source-pill" :class="sourceClass('swagger_enabled')" x-text="settingSource('swagger_enabled')"></span>
|
||||
</label>
|
||||
<div class="setting-toggle-row">
|
||||
<span x-text="settingsDraft.swagger_enabled ? 'Enabled' : 'Disabled'"></span>
|
||||
<input type="checkbox" x-model="settingsDraft.swagger_enabled" />
|
||||
</div>
|
||||
<div class="setting-help">Interactive API docs at /swagger/ after restart.</div>
|
||||
</div>
|
||||
<div class="setting-field">
|
||||
<label>
|
||||
<span>Last.fm API key</span>
|
||||
<span class="source-pill" :class="sourceClass('lastfm_api_key')" x-text="settingSource('lastfm_api_key')"></span>
|
||||
</label>
|
||||
<input type="password" x-model="settingsDraft.lastfm_api_key" autocomplete="off" />
|
||||
<div class="setting-help">Used by the weekly Last.fm popularity task.</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="panel">
|
||||
<div class="panel-head">
|
||||
<div class="panel-title">
|
||||
<strong>Agent Status</strong>
|
||||
<span x-text="settingsProbeSubtitle()"></span>
|
||||
</div>
|
||||
<span class="badge" :class="settingsProbeBadge()" x-text="settingsProbe.status || 'idle'"></span>
|
||||
</div>
|
||||
<div class="probe-body">
|
||||
<p class="probe-intro" x-show="settingsProbe.model_intro" x-text="settingsProbe.model_intro"></p>
|
||||
<p class="probe-intro muted" x-show="!settingsProbe.model_intro" x-text="settingsProbeText()"></p>
|
||||
<div class="probe-table" x-show="settingsProbe.ok">
|
||||
<div class="probe-row"><span>Model</span><strong x-text="settingsProbe.model_name || 'unknown'"></strong></div>
|
||||
<div class="probe-row"><span>Latency</span><strong x-text="settingsProbe.latency_ms + ' ms'"></strong></div>
|
||||
<div class="probe-row"><span>Prompt tokens</span><strong x-text="settingsProbe.prompt_tokens ?? '-'"></strong></div>
|
||||
<div class="probe-row"><span>Completion tokens</span><strong x-text="settingsProbe.completion_tokens ?? '-'"></strong></div>
|
||||
<div class="probe-row"><span>Tokens/sec</span><strong x-text="settingsProbe.tokens_per_sec != null ? settingsProbe.tokens_per_sec.toFixed(1) : '-'"></strong></div>
|
||||
</div>
|
||||
<div class="toolbar" style="margin-top:14px">
|
||||
<button class="btn" type="button" @click="loadSettingsProbe()" :disabled="settingsProbeLoading">
|
||||
<i data-lucide="activity"></i>
|
||||
Test agent
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<div class="action-strip settings-actions">
|
||||
<span class="selection-summary">Settings are stored as database overrides unless an environment variable wins.</span>
|
||||
<div class="toolbar">
|
||||
<button class="btn" type="button" @click="loadSettings()">
|
||||
<i data-lucide="refresh-cw"></i>
|
||||
Reload
|
||||
</button>
|
||||
<button class="btn primary" type="submit" :disabled="settingsSaving">
|
||||
<i :data-lucide="settingsSaving ? 'loader-circle' : 'save'"></i>
|
||||
<span x-text="settingsSaving ? 'Saving...' : 'Save settings'"></span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<div class="modal-backdrop" x-show="reviewModalOpen && activeReview" x-transition @click.self="reviewModalOpen = false">
|
||||
@@ -1366,10 +1773,43 @@ function adminV2() {
|
||||
activeLibraryItem: null,
|
||||
editorOpen: false,
|
||||
editorDraft: { title: '', hidden: 'false' },
|
||||
settings: { values: {}, sources: {}, lastfm_api_key_configured: false },
|
||||
settingsDraft: {
|
||||
auth_password_enabled: false,
|
||||
auth_sso_enabled: false,
|
||||
oidc_button_text: '',
|
||||
oidc_issuer: '',
|
||||
oidc_client_id: '',
|
||||
oidc_client_secret: '',
|
||||
oidc_admin_groups: '',
|
||||
oidc_user_groups: '',
|
||||
swagger_enabled: false,
|
||||
lastfm_api_key: '',
|
||||
agent_enabled: false,
|
||||
agent_inbox_dir: '',
|
||||
agent_storage_dir: '',
|
||||
agent_llm_url: '',
|
||||
agent_llm_model: '',
|
||||
agent_llm_auth: '',
|
||||
agent_confidence_threshold: '',
|
||||
agent_context_limit: '',
|
||||
agent_concurrency: ''
|
||||
},
|
||||
settingsProbe: { status: 'idle', ok: false },
|
||||
settingsProbeLoading: false,
|
||||
settingsSaving: false,
|
||||
routeReady: false,
|
||||
poller: null,
|
||||
|
||||
async init() {
|
||||
this.applyRouteFromHash();
|
||||
await this.refreshAll();
|
||||
this.routeReady = true;
|
||||
this.activateCurrentView(false);
|
||||
window.addEventListener('hashchange', () => {
|
||||
this.applyRouteFromHash();
|
||||
this.activateCurrentView(false);
|
||||
});
|
||||
this.poller = setInterval(() => this.poll(), 6000);
|
||||
this.icons();
|
||||
},
|
||||
@@ -1399,6 +1839,7 @@ function adminV2() {
|
||||
this.jobs = data.jobs || [];
|
||||
this.recentRuns = data.recent_runs || [];
|
||||
if (!this.activeJobName && this.jobs.length) this.activeJobName = this.jobs[0].name;
|
||||
await this.loadSettings(false);
|
||||
await this.loadLibrary(false);
|
||||
} catch (error) {
|
||||
this.showToast(error.message);
|
||||
@@ -1413,6 +1854,84 @@ function adminV2() {
|
||||
await Promise.allSettled([this.loadJobs(false), this.loadReviews(false)]);
|
||||
},
|
||||
|
||||
applyRouteFromHash() {
|
||||
const raw = (window.location.hash || '#reviews').replace(/^#\/?/, '');
|
||||
const parts = raw.split('/').filter(Boolean);
|
||||
const view = parts[0] || 'reviews';
|
||||
if (view === 'reviews') {
|
||||
this.activeView = 'reviews';
|
||||
this.reviewFilter.status = parts[1] || null;
|
||||
} else if (view === 'jobs') {
|
||||
this.activeView = 'jobs';
|
||||
if (parts[1]) this.activeJobName = decodeURIComponent(parts[1]);
|
||||
} else if (view === 'library') {
|
||||
this.activeView = 'library';
|
||||
this.libraryKind = ['artists', 'releases', 'playlists'].includes(parts[1]) ? parts[1] : 'artists';
|
||||
} else if (view === 'settings') {
|
||||
this.activeView = 'settings';
|
||||
} else if (view === 'tools') {
|
||||
this.activeView = 'tools';
|
||||
} else {
|
||||
this.activeView = 'reviews';
|
||||
}
|
||||
},
|
||||
|
||||
setRoute(path) {
|
||||
if (!path.startsWith('#')) path = '#' + path;
|
||||
if (window.location.hash !== path) {
|
||||
window.history.pushState(null, '', path);
|
||||
}
|
||||
},
|
||||
|
||||
async activateCurrentView(updateRoute = true) {
|
||||
if (this.activeView === 'reviews') {
|
||||
if (updateRoute) this.setRoute(this.reviewFilter.status ? `#reviews/${this.reviewFilter.status}` : '#reviews');
|
||||
await this.loadReviews(false);
|
||||
} else if (this.activeView === 'jobs') {
|
||||
if (updateRoute) this.setRoute(this.activeJobName ? `#jobs/${encodeURIComponent(this.activeJobName)}` : '#jobs');
|
||||
await this.loadJobs();
|
||||
if (this.activeJobName) await this.loadRunsForJob(this.activeJobName);
|
||||
} else if (this.activeView === 'library') {
|
||||
if (updateRoute) this.setRoute(`#library/${this.libraryKind}`);
|
||||
await this.loadLibrary(false);
|
||||
} else if (this.activeView === 'settings') {
|
||||
if (updateRoute) this.setRoute('#settings');
|
||||
await this.loadSettings();
|
||||
if (!this.settingsProbe.status || this.settingsProbe.status === 'idle') {
|
||||
await this.loadSettingsProbe(false);
|
||||
}
|
||||
} else if (this.activeView === 'tools' && updateRoute) {
|
||||
this.setRoute('#tools');
|
||||
}
|
||||
},
|
||||
|
||||
openReviews(status = null) {
|
||||
this.activeView = 'reviews';
|
||||
this.reviewFilter.status = status;
|
||||
this.setRoute(status ? `#reviews/${status}` : '#reviews');
|
||||
this.loadReviews();
|
||||
},
|
||||
|
||||
openJobs(name = this.activeJobName) {
|
||||
this.activeView = 'jobs';
|
||||
if (name) this.activeJobName = name;
|
||||
this.setRoute(this.activeJobName ? `#jobs/${encodeURIComponent(this.activeJobName)}` : '#jobs');
|
||||
this.loadJobs();
|
||||
if (this.activeJobName) this.loadRunsForJob(this.activeJobName);
|
||||
},
|
||||
|
||||
openLibrary(kind = this.libraryKind) {
|
||||
this.activeView = 'library';
|
||||
this.libraryKind = ['artists', 'releases', 'playlists'].includes(kind) ? kind : 'artists';
|
||||
this.setRoute(`#library/${this.libraryKind}`);
|
||||
this.loadLibrary();
|
||||
},
|
||||
|
||||
openTools() {
|
||||
this.activeView = 'tools';
|
||||
this.setRoute('#tools');
|
||||
},
|
||||
|
||||
async loadReviews(resetOffset = true) {
|
||||
if (resetOffset) this.reviews.offset = 0;
|
||||
const params = new URLSearchParams();
|
||||
@@ -1462,9 +1981,93 @@ function adminV2() {
|
||||
}
|
||||
},
|
||||
|
||||
async loadSettings(showErrors = true) {
|
||||
try {
|
||||
this.settings = await this.request(`${this.apiBase}/settings`);
|
||||
this.settingsDraft = Object.assign({}, this.settingsDraft, this.settings.values || {});
|
||||
} catch (error) {
|
||||
if (showErrors) this.showToast(error.message);
|
||||
} finally {
|
||||
this.icons();
|
||||
}
|
||||
},
|
||||
|
||||
async saveSettings() {
|
||||
if (this.settingsSaving) return;
|
||||
this.settingsSaving = true;
|
||||
try {
|
||||
await this.request(`${this.apiBase}/settings`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(this.settingsDraft)
|
||||
});
|
||||
await this.loadSettings(false);
|
||||
this.showToast('Settings saved');
|
||||
} catch (error) {
|
||||
this.showToast(error.message);
|
||||
} finally {
|
||||
this.settingsSaving = false;
|
||||
this.icons();
|
||||
}
|
||||
},
|
||||
|
||||
async openSettings() {
|
||||
this.activeView = 'settings';
|
||||
this.setRoute('#settings');
|
||||
await this.loadSettings();
|
||||
if (!this.settingsProbe.status || this.settingsProbe.status === 'idle') {
|
||||
await this.loadSettingsProbe(false);
|
||||
}
|
||||
},
|
||||
|
||||
async loadSettingsProbe(showErrors = true) {
|
||||
this.settingsProbeLoading = true;
|
||||
try {
|
||||
this.settingsProbe = await this.request(`${this.apiBase}/settings/probe`);
|
||||
} catch (error) {
|
||||
this.settingsProbe = { status: 'error', ok: false, error: error.message };
|
||||
if (showErrors) this.showToast(error.message);
|
||||
} finally {
|
||||
this.settingsProbeLoading = false;
|
||||
this.icons();
|
||||
}
|
||||
},
|
||||
|
||||
settingSource(key) {
|
||||
return (this.settings.sources || {})[key] || 'default';
|
||||
},
|
||||
|
||||
sourceClass(key) {
|
||||
return this.settingSource(key);
|
||||
},
|
||||
|
||||
callbackUrl() {
|
||||
return `${window.location.origin}/auth/oidc/callback`;
|
||||
},
|
||||
|
||||
settingsProbeBadge() {
|
||||
if (this.settingsProbeLoading) return 'running';
|
||||
if (this.settingsProbe.status === 'ok') return 'ok';
|
||||
if (this.settingsProbe.status === 'error') return 'failed';
|
||||
return 'disabled';
|
||||
},
|
||||
|
||||
settingsProbeSubtitle() {
|
||||
if (this.settingsProbeLoading) return 'Checking LLM connection';
|
||||
if (this.settingsProbe.status === 'ok') return 'LLM connection OK';
|
||||
if (this.settingsProbe.status === 'error') return 'LLM connection error';
|
||||
if (this.settingsProbe.status === 'disabled') return 'Agent is disabled';
|
||||
if (this.settingsProbe.status === 'not_configured') return 'LLM URL is not configured';
|
||||
return 'Connection probe';
|
||||
},
|
||||
|
||||
settingsProbeText() {
|
||||
if (this.settingsProbeLoading) return 'Checking connection...';
|
||||
if (this.settingsProbe.error) return this.settingsProbe.error;
|
||||
return this.settingsProbeSubtitle();
|
||||
},
|
||||
|
||||
setReviewStatus(status) {
|
||||
this.reviewFilter.status = status;
|
||||
this.loadReviews();
|
||||
this.openReviews(status);
|
||||
},
|
||||
|
||||
openReview(row) {
|
||||
@@ -1590,6 +2193,7 @@ function adminV2() {
|
||||
|
||||
async selectJob(name) {
|
||||
this.activeJobName = name;
|
||||
this.setRoute(`#jobs/${encodeURIComponent(name)}`);
|
||||
this.activeReview = null;
|
||||
this.activeRunDetail = null;
|
||||
await this.loadRunsForJob(name);
|
||||
@@ -1770,6 +2374,7 @@ function adminV2() {
|
||||
if (this.activeView === 'library') return 'Library Workbench';
|
||||
if (this.activeView === 'jobs') return 'Tasks';
|
||||
if (this.activeView === 'tools') return 'Future Tools';
|
||||
if (this.activeView === 'settings') return 'Settings';
|
||||
return 'Review Queue';
|
||||
},
|
||||
|
||||
@@ -1777,6 +2382,7 @@ function adminV2() {
|
||||
if (this.activeView === 'library') return 'Fast entity control surface for artists, releases, and playlists';
|
||||
if (this.activeView === 'jobs') return 'Scheduler state, recent runs, and manual controls in one place';
|
||||
if (this.activeView === 'tools') return 'Reserved space for merge, split, enrichment, and destructive workflows';
|
||||
if (this.activeView === 'settings') return 'Application configuration and external API credentials';
|
||||
return 'Full-screen review triage with filter-aware bulk actions';
|
||||
},
|
||||
|
||||
|
||||
@@ -21,6 +21,11 @@ const T = {
|
||||
audio: "{{ t.player_audio }}",
|
||||
size: "{{ t.player_size }}",
|
||||
uploader: "{{ t.player_uploader }}",
|
||||
lastfmRating: "{{ t.player_lastfm_rating }}",
|
||||
lastfmListeners: "{{ t.player_lastfm_listeners }}",
|
||||
lastfmPlaycount: "{{ t.player_lastfm_playcount }}",
|
||||
lastfmUpdated: "{{ t.player_lastfm_updated }}",
|
||||
lastfmNotLoaded: "{{ t.player_lastfm_not_loaded }}",
|
||||
trackWord: "{{ t.player_tracks_count }}",
|
||||
clientIdle: "{{ t.player_client_idle }}",
|
||||
active: "{{ t.player_active }}",
|
||||
@@ -825,6 +830,15 @@ document.addEventListener('alpine:init', () => {
|
||||
`${T.size}: ${this.bytes(track.file_size_bytes)}`,
|
||||
`${T.uploader}: ${track.uploader_name || 'UFO'}`,
|
||||
];
|
||||
if (track.lastfm_rating != null || track.lastfm_listeners != null || track.lastfm_playcount != null) {
|
||||
const rating = Number(track.lastfm_rating || 0);
|
||||
lines.push(`${T.lastfmRating}: ${Number.isFinite(rating) ? rating.toFixed(2) : T.unknown}`);
|
||||
lines.push(`${T.lastfmListeners}: ${new Intl.NumberFormat().format(track.lastfm_listeners || 0)}`);
|
||||
lines.push(`${T.lastfmPlaycount}: ${new Intl.NumberFormat().format(track.lastfm_playcount || 0)}`);
|
||||
if (track.lastfm_updated_at) lines.push(`${T.lastfmUpdated}: ${track.lastfm_updated_at}`);
|
||||
} else {
|
||||
lines.push(`${T.lastfmRating}: ${T.lastfmNotLoaded}`);
|
||||
}
|
||||
return lines.join('\n');
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user