vikarti.anatra/polaris-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved song sorting to collection.rs

Browse source
This commit is contained in:
Antoine Gersant 2025-01-01 16:46:14 -08:00
parent de39b2f4a5
commit 41187199ba
2 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/app/index/collection.rs
View file

@ -234,12 +234,12 @@ impl Collection {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
artists.sort_by(|a, b| collator.compare(&a.name, &b.name)); artists.sort_by(|a, b| collator.compare(&a.name, &b.name));
let songs = genre let mut songs = genre
.songs .songs
.iter() .iter()
.filter_map(|k| self.get_song(dictionary, *k)) .filter_map(|k| self.get_song(dictionary, *k))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
// TODO sort songs songs.sort_by(compare_songs);
let related_genres = genre let related_genres = genre
.related_genres .related_genres
@ -268,6 +268,29 @@ impl Collection {
} }
} }
pub fn compare_songs(a: &Song, b: &Song) -> Ordering {
let a_key = {
let artists = if a.album_artists.is_empty() {
&a.artists
} else {
&a.album_artists
};
(artists, a.year, &a.album, a.disc_number, a.track_number)
};
let b_key = {
let artists = if b.album_artists.is_empty() {
&b.artists
} else {
&b.album_artists
};
(artists, b.year, &b.album, b.disc_number, b.track_number)
};
// TODO collator
a_key.cmp(&b_key)
}
fn make_album_header(album: &storage::Album, dictionary: &Dictionary) -> AlbumHeader { fn make_album_header(album: &storage::Album, dictionary: &Dictionary) -> AlbumHeader {
AlbumHeader { AlbumHeader {
name: dictionary.resolve(&album.name).to_string(), name: dictionary.resolve(&album.name).to_string(),

29
src/app/index/search.rs
View file

@ -3,10 +3,7 @@ use enum_map::EnumMap;
use lasso2::Spur; use lasso2::Spur;
use nohash_hasher::IntSet; use nohash_hasher::IntSet;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{ use std::collections::{BTreeMap, HashMap};
cmp::Ordering,
collections::{BTreeMap, HashMap},
};
use tinyvec::TinyVec; use tinyvec::TinyVec;
use crate::app::{ use crate::app::{
@ -35,28 +32,6 @@ impl Default for Search {
} }
} }
fn compare_songs(a: &collection::Song, b: &collection::Song) -> Ordering {
let a_key = {
let artists = if a.album_artists.is_empty() {
&a.artists
} else {
&a.album_artists
};
(artists, a.year, &a.album, a.disc_number, a.track_number)
};
let b_key = {
let artists = if b.album_artists.is_empty() {
&b.artists
} else {
&b.album_artists
};
(artists, b.year, &b.album, b.disc_number, b.track_number)
};
a_key.cmp(&b_key)
}
impl Search { impl Search {
pub fn find_songs( pub fn find_songs(
&self, &self,
@ -75,7 +50,7 @@ impl Search {
.filter_map(|song_key| collection.get_song(dictionary, song_key)) .filter_map(|song_key| collection.get_song(dictionary, song_key))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
songs.sort_by(compare_songs); songs.sort_by(collection::compare_songs);
Ok(songs) Ok(songs)
} }