Genre key cleanup
This commit is contained in:
parent
ef6951faba
commit
6c2b192f8e
3 changed files with 3 additions and 5 deletions
|
@ -129,7 +129,7 @@ impl Manager {
|
||||||
.strings
|
.strings
|
||||||
.get(&name)
|
.get(&name)
|
||||||
.ok_or_else(|| Error::GenreNotFound)?;
|
.ok_or_else(|| Error::GenreNotFound)?;
|
||||||
let genre_key = GenreKey { name };
|
let genre_key = GenreKey(name);
|
||||||
index
|
index
|
||||||
.collection
|
.collection
|
||||||
.get_genre(&index.strings, genre_key)
|
.get_genre(&index.strings, genre_key)
|
||||||
|
|
|
@ -408,7 +408,7 @@ impl Builder {
|
||||||
|
|
||||||
fn add_song_to_genres(&mut self, song: &storage::Song) {
|
fn add_song_to_genres(&mut self, song: &storage::Song) {
|
||||||
for name in &song.genres {
|
for name in &song.genres {
|
||||||
let genre_key = GenreKey { name: *name };
|
let genre_key = GenreKey(*name);
|
||||||
let genre = self.genres.entry(genre_key).or_insert(storage::Genre {
|
let genre = self.genres.entry(genre_key).or_insert(storage::Genre {
|
||||||
name: *name,
|
name: *name,
|
||||||
songs: Vec::new(),
|
songs: Vec::new(),
|
||||||
|
|
|
@ -70,9 +70,7 @@ pub struct Song {
|
||||||
pub struct PathKey(pub Spur);
|
pub struct PathKey(pub Spur);
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq, Serialize, Deserialize)]
|
#[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq, Serialize, Deserialize)]
|
||||||
pub struct GenreKey {
|
pub struct GenreKey(pub Spur);
|
||||||
pub name: Spur,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq, Serialize, Deserialize)]
|
#[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq, Serialize, Deserialize)]
|
||||||
pub struct ArtistKey(pub Spur);
|
pub struct ArtistKey(pub Spur);
|
||||||
|
|
Loading…
Add table
Reference in a new issue