Fixed merge feature
Build and Publish / Build and Publish Docker Image (push) Successful in 5m23s

This commit is contained in:
Ultradesu
2026-08-14 18:15:03 +01:00
parent 1ab53e3898
commit 34e90b33f6
5 changed files with 1080 additions and 1 deletions
+245
View File
@@ -68,6 +68,239 @@ pub async fn delete_releases(
delete_locked_scope(transaction, track_ids, release_ids, storage_dir, true).await
}
#[derive(Debug)]
pub struct ReleaseMergeTrack {
pub id: i64,
pub track_number: Option<i32>,
pub disc_number: Option<i32>,
}
#[derive(Debug)]
pub struct ReleaseMergeSpec {
pub release_ids: Vec<i64>,
pub target_release_id: i64,
pub title: String,
pub title_sort: String,
pub release_type: String,
pub year: Option<i32>,
pub hidden: bool,
pub cover_file_id: Option<i64>,
pub artist_ids: Vec<i64>,
pub tracks: Vec<ReleaseMergeTrack>,
}
#[derive(Debug)]
pub struct ReleaseMergeResult {
pub merged_releases: u64,
pub moved_tracks: u64,
}
/// Merge several releases into one while preserving their tracks and media.
///
/// Source cover files are quarantined before the database transaction commits,
/// just like normal library deletion. The cover selected for the destination
/// and any media still referenced elsewhere are retained.
pub async fn merge_releases(
pool: &PgPool,
mut spec: ReleaseMergeSpec,
storage_dir: &str,
) -> anyhow::Result<ReleaseMergeResult> {
spec.release_ids.retain(|id| *id > 0);
spec.release_ids.sort_unstable();
spec.release_ids.dedup();
if spec.release_ids.len() < 2 {
bail!("select at least two releases to merge");
}
if !spec.release_ids.contains(&spec.target_release_id) {
bail!("destination release must be part of the selection");
}
let mut transaction = pool.begin().await?;
let locked_release_ids: Vec<i64> = sqlx::query_scalar(
"SELECT id FROM furumusic__release WHERE id = ANY($1) ORDER BY id FOR UPDATE",
)
.bind(&spec.release_ids)
.fetch_all(&mut *transaction)
.await?;
if locked_release_ids != spec.release_ids {
bail!("one or more selected releases no longer exist; reopen the merge wizard");
}
let original_target_cover: Option<i64> =
sqlx::query_scalar("SELECT cover_file_id FROM furumusic__release WHERE id = $1")
.bind(spec.target_release_id)
.fetch_one(&mut *transaction)
.await?;
let source_release_ids = spec
.release_ids
.iter()
.copied()
.filter(|id| *id != spec.target_release_id)
.collect::<Vec<_>>();
let locked_track_ids: Vec<i64> = sqlx::query_scalar(
"SELECT id FROM furumusic__track WHERE release_id = ANY($1) ORDER BY id FOR UPDATE",
)
.bind(&spec.release_ids)
.fetch_all(&mut *transaction)
.await?;
let mut requested_track_ids = spec.tracks.iter().map(|track| track.id).collect::<Vec<_>>();
requested_track_ids.sort_unstable();
if requested_track_ids.windows(2).any(|ids| ids[0] == ids[1]) {
bail!("the merge track list contains duplicates");
}
if requested_track_ids != locked_track_ids {
bail!("the selected releases changed; reopen the merge wizard before merging");
}
if let Some(cover_file_id) = spec.cover_file_id {
let valid_cover: Option<i64> = sqlx::query_scalar(
r#"SELECT r.cover_file_id
FROM furumusic__release r
JOIN furumusic__media_file mf ON mf.id = r.cover_file_id
WHERE r.id = ANY($1)
AND r.cover_file_id = $2
AND mf.file_type = 'cover_art'
LIMIT 1"#,
)
.bind(&spec.release_ids)
.bind(cover_file_id)
.fetch_optional(&mut *transaction)
.await?;
if valid_cover.is_none() {
bail!("selected cover does not belong to one of the merged releases");
}
}
let mut seen_artist_ids = HashSet::new();
spec.artist_ids
.retain(|id| *id > 0 && seen_artist_ids.insert(*id));
if !spec.artist_ids.is_empty() {
let existing_artist_ids: Vec<i64> =
sqlx::query_scalar("SELECT id FROM furumusic__artist WHERE id = ANY($1) ORDER BY id")
.bind(&spec.artist_ids)
.fetch_all(&mut *transaction)
.await?;
let mut requested_artist_ids = spec.artist_ids.clone();
requested_artist_ids.sort_unstable();
if existing_artist_ids != requested_artist_ids {
bail!("one or more selected artists no longer exist");
}
}
let now = chrono::Utc::now().format("%Y-%m-%dT%H:%M:%SZ").to_string();
let total_discs = spec
.tracks
.iter()
.filter_map(|track| track.disc_number)
.max();
sqlx::query(
r#"UPDATE furumusic__release
SET title = $2, title_sort = $3, release_type = $4, year = $5,
cover_file_id = $6, total_tracks = $7, total_discs = $8,
is_hidden = $9, model_name = NULL, updated_at = $10
WHERE id = $1"#,
)
.bind(spec.target_release_id)
.bind(&spec.title)
.bind(&spec.title_sort)
.bind(&spec.release_type)
.bind(spec.year)
.bind(spec.cover_file_id)
.bind(i32::try_from(spec.tracks.len()).unwrap_or(i32::MAX))
.bind(total_discs)
.bind(spec.hidden)
.bind(&now)
.execute(&mut *transaction)
.await?;
sqlx::query("DELETE FROM furumusic__release_artist WHERE release_id = $1")
.bind(spec.target_release_id)
.execute(&mut *transaction)
.await?;
for (position, artist_id) in spec.artist_ids.iter().enumerate() {
sqlx::query(
"INSERT INTO furumusic__release_artist (release_id, artist_id, position) VALUES ($1, $2, $3)",
)
.bind(spec.target_release_id)
.bind(*artist_id)
.bind(i32::try_from(position).unwrap_or(i32::MAX))
.execute(&mut *transaction)
.await?;
}
for track in &spec.tracks {
sqlx::query(
r#"UPDATE furumusic__track
SET release_id = $1, track_number = $2, disc_number = $3,
updated_at = $4
WHERE id = $5"#,
)
.bind(spec.target_release_id)
.bind(track.track_number)
.bind(track.disc_number)
.bind(&now)
.bind(track.id)
.execute(&mut *transaction)
.await?;
}
sqlx::query(
r#"INSERT INTO furumusic__entity_genre_tag
(entity_kind, entity_id, genre_id, source, weight, updated_at)
SELECT 'release', $1, genre_id, source, weight, $3
FROM furumusic__entity_genre_tag
WHERE entity_kind = 'release' AND entity_id = ANY($2)
ON CONFLICT (entity_kind, entity_id, genre_id, source) DO UPDATE
SET weight = GREATEST(furumusic__entity_genre_tag.weight, EXCLUDED.weight),
updated_at = EXCLUDED.updated_at"#,
)
.bind(spec.target_release_id)
.bind(&spec.release_ids)
.bind(&now)
.execute(&mut *transaction)
.await?;
let extra_media_ids = original_target_cover.into_iter().collect::<Vec<_>>();
let media_files = deletable_media_files_with_extra(
&mut transaction,
&[],
&source_release_ids,
&extra_media_ids,
)
.await?;
let quarantine = match quarantine_media_files(storage_dir, &media_files).await {
Ok(quarantine) => quarantine,
Err(error) => {
transaction.rollback().await?;
return Err(error);
}
};
let deletion = delete_database_rows(
&mut transaction,
&[],
&source_release_ids,
&media_files,
true,
)
.await;
if let Err(error) = deletion {
transaction.rollback().await?;
restore_quarantine(&quarantine).await;
return Err(error);
}
if let Err(error) = transaction.commit().await {
restore_quarantine(&quarantine).await;
return Err(error.into());
}
purge_quarantine(&quarantine).await;
remove_empty_storage_parents(storage_dir, &quarantine.files).await;
Ok(ReleaseMergeResult {
merged_releases: u64::try_from(spec.release_ids.len()).unwrap_or(u64::MAX),
moved_tracks: u64::try_from(spec.tracks.len()).unwrap_or(u64::MAX),
})
}
async fn delete_scope(
pool: &PgPool,
requested_track_ids: &[i64],
@@ -141,6 +374,15 @@ async fn deletable_media_files(
transaction: &mut Transaction<'_, Postgres>,
track_ids: &[i64],
release_ids: &[i64],
) -> anyhow::Result<Vec<MediaFileRow>> {
deletable_media_files_with_extra(transaction, track_ids, release_ids, &[]).await
}
async fn deletable_media_files_with_extra(
transaction: &mut Transaction<'_, Postgres>,
track_ids: &[i64],
release_ids: &[i64],
extra_media_ids: &[i64],
) -> anyhow::Result<Vec<MediaFileRow>> {
Ok(sqlx::query_as(
r#"WITH seed_media(id) AS (
@@ -151,6 +393,8 @@ async fn deletable_media_files(
UNION
SELECT cover_file_id FROM furumusic__release
WHERE id = ANY($2) AND cover_file_id IS NOT NULL
UNION
SELECT UNNEST($3::bigint[])
), candidate_media(id) AS (
SELECT id FROM seed_media
UNION
@@ -205,6 +449,7 @@ async fn deletable_media_files(
)
.bind(track_ids)
.bind(release_ids)
.bind(extra_media_ids)
.fetch_all(&mut **transaction)
.await?)
}