wojtek/musichoard
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Add state information to albums and tracks #16

Merged
wojtek merged 1 commits from 8---add-state-information-to-albums-and-tracks into main 2023-04-10 11:27:07 +02:00
Conversation 0 Commits 1 Files Changed 5 +118 -9
5 changed files with 118 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c2a4c7b4c - Show all commits

12
src/database/json.rs
View File

@ -79,7 +79,7 @@ impl DatabaseJsonBackend for DatabaseJsonFile {
mod tests {
use super::*;
use crate::{tests::COLLECTION, Artist};
use crate::{tests::COLLECTION, Artist, TrackFormat};
struct DatabaseJsonTest {
json: String,
@ -91,7 +91,7 @@ mod tests {
}
fn write(&mut self, json: &str) -> Result<(), std::io::Error> {
assert_eq!(self.json, json);
assert_eq!(json, self.json);
Ok(())
}
}
@ -115,11 +115,17 @@ mod tests {
}
let track_artist = track_artist.join(",");
let track_format: &'static str = match track.format {
TrackFormat::Flac => stringify!(Flac),
TrackFormat::Mp3 => stringify!(Mp3),
};
tracks.push(format!(
"{{\
\"number\":{track_number},\
\"title\":\"{track_title}\",\
\"artist\":[{track_artist}]\
\"artist\":[{track_artist}],\
\"format\":\"{track_format}\"\
}}"
));
}

15
src/lib.rs
View File

@ -9,12 +9,20 @@ pub mod library;
/// [MusicBrainz Identifier](https://musicbrainz.org/doc/MusicBrainz_Identifier) (MBID).
pub type Mbid = Uuid;
/// The track file format.
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
pub enum TrackFormat {
Flac,
Mp3,
}
/// A single track on an album.
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
pub struct Track {
pub number: u32,
pub title: String,
pub artist: Vec<String>,
pub format: TrackFormat,
}
/// The album identifier.
@ -67,6 +75,7 @@ mod tests {
number: 1,
title: "track a.a.1".to_string(),
artist: vec!["artist a.a.1".to_string()],
format: TrackFormat::Flac,
},
Track {
number: 2,
@ -75,11 +84,13 @@ mod tests {
"artist a.a.2.1".to_string(),
"artist a.a.2.2".to_string(),
],
format: TrackFormat::Flac,
},
Track {
number: 3,
title: "track a.a.3".to_string(),
artist: vec!["artist a.a.3".to_string()],
format: TrackFormat::Flac,
},
],
},
@ -93,11 +104,13 @@ mod tests {
number: 1,
title: "track a.b.1".to_string(),
artist: vec!["artist a.b.1".to_string()],
format: TrackFormat::Mp3,
},
Track {
number: 2,
title: "track a.b.2".to_string(),
artist: vec!["artist a.b.2".to_string()],
format: TrackFormat::Flac,
},
],
},
@ -117,6 +130,7 @@ mod tests {
number: 1,
title: "track b.a.1".to_string(),
artist: vec!["artist b.a.1".to_string()],
format: TrackFormat::Mp3,
},
Track {
number: 2,
@ -125,6 +139,7 @@ mod tests {
"artist b.a.2.1".to_string(),
"artist b.a.2.2".to_string(),
],
format: TrackFormat::Mp3,
},
],
}],

24
src/library/beets.rs
View File

@ -9,7 +9,7 @@ use std::{
str,
};
use crate::{Album, AlbumId, Artist, ArtistId, Track};
use crate::{Album, AlbumId, Artist, ArtistId, Track, TrackFormat};
use super::{Error, Library, Query, QueryOption};
@ -98,6 +98,8 @@ trait LibraryPrivate {
const CMD_LIST: &'static str;
const LIST_FORMAT_SEPARATOR: &'static str;
const LIST_FORMAT_ARG: &'static str;
const TRACK_FORMAT_FLAC: &'static str;
const TRACK_FORMAT_MP3: &'static str;
fn list_cmd_and_args(query: &Query) -> Vec<String>;
fn list_to_artists(list_output: Vec<String>) -> Result<Vec<Artist>, Error>;
@ -138,8 +140,12 @@ impl LibraryPrivate for Beets {
list_format_separator!(),
"$title",
list_format_separator!(),
"$artist"
"$artist",
list_format_separator!(),
"$format"
);
const TRACK_FORMAT_FLAC: &'static str = "FLAC";
const TRACK_FORMAT_MP3: &'static str = "MP3";
fn list_cmd_and_args(query: &Query) -> Vec<String> {
let mut cmd: Vec<String> = vec![String::from(Self::CMD_LIST)];
@ -158,7 +164,7 @@ impl LibraryPrivate for Beets {
}
let split: Vec<&str> = line.split(Self::LIST_FORMAT_SEPARATOR).collect();
if split.len() != 6 {
if split.len() != 7 {
return Err(Error::InvalidData(line.to_string()));
}
@ -168,6 +174,7 @@ impl LibraryPrivate for Beets {
let track_number = split[3].parse::<u32>()?;
let track_title = split[4].to_string();
let track_artist = split[5].to_string();
let track_format = split[6].to_string();
let artist_id = ArtistId { name: album_artist };
@ -180,6 +187,11 @@ impl LibraryPrivate for Beets {
number: track_number,
title: track_title,
artist: track_artist.split("; ").map(|s| s.to_owned()).collect(),
format: match track_format.as_ref() {
Self::TRACK_FORMAT_FLAC => TrackFormat::Flac,
Self::TRACK_FORMAT_MP3 => TrackFormat::Mp3,
_ => return Err(Error::InvalidData(track_format)),
},
};
let artist = if album_ids.contains_key(&artist_id) {
@ -298,10 +310,14 @@ mod tests {
let track_number = &track.number;
let track_title = &track.title;
let track_artist = &track.artist.join("; ");
let track_format = match track.format {
TrackFormat::Flac => Beets::TRACK_FORMAT_FLAC,
TrackFormat::Mp3 => Beets::TRACK_FORMAT_MP3,
};
strings.push(format!(
"{album_artist}{0}{album_year}{0}{album_title}{0}\
{track_number}{0}{track_title}{0}{track_artist}",
{track_number}{0}{track_title}{0}{track_artist}{0}{track_format}",
Beets::LIST_FORMAT_SEPARATOR,
));
}

2
tests/files/database/database.json
View File

File diff suppressed because one or more lines are too long

74
tests/lib.rs
View File

@ -1,7 +1,7 @@
mod database;
mod library;
use musichoard::{Album, AlbumId, Artist, ArtistId, Track};
use musichoard::{Album, AlbumId, Artist, ArtistId, Track, TrackFormat};
use once_cell::sync::Lazy;
static COLLECTION: Lazy<Vec<Artist>> = Lazy::new(|| {
@ -20,71 +20,85 @@ static COLLECTION: Lazy<Vec<Artist>> = Lazy::new(|| {
number: 01,
title: String::from("Az’"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 02,
title: String::from("Arkaim"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 03,
title: String::from("Bol’no mne"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 04,
title: String::from("Leshiy"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 05,
title: String::from("Zakliatie"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 06,
title: String::from("Predok"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 07,
title: String::from("Nikogda"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 08,
title: String::from("Tam za tumanami"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 09,
title: String::from("Potomok"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 10,
title: String::from("Slovo"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 11,
title: String::from("Odna"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 12,
title: String::from("Vo moiom sadochke…"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 13,
title: String::from("Stenka na stenku"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
Track {
number: 14,
title: String::from("Zimushka"),
artist: vec![String::from("Аркона")],
format: TrackFormat::Flac,
},
],
}],
@ -104,61 +118,73 @@ static COLLECTION: Lazy<Vec<Artist>> = Lazy::new(|| {
number: 01,
title: String::from("Samon"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 02,
title: String::from("Primordial Breath"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 03,
title: String::from("Inis Mona"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 04,
title: String::from("Gray Sublime Archon"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 05,
title: String::from("Anagantios"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 06,
title: String::from("Bloodstained Ground"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 07,
title: String::from("The Somber Lay"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 08,
title: String::from("Slanias Song"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 09,
title: String::from("Giamonios"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 10,
title: String::from("Tarvos"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 11,
title: String::from("Calling the Rain"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 12,
title: String::from("Elembivos"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
],
},
@ -172,31 +198,37 @@ static COLLECTION: Lazy<Vec<Artist>> = Lazy::new(|| {
number: 01,
title: String::from("Verja Urit an Bitus"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 02,
title: String::from("Uis Elveti"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 03,
title: String::from("Ôrô"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 04,
title: String::from("Lament"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 05,
title: String::from("Druid"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
Track {
number: 06,
title: String::from("Jêzaïg"),
artist: vec![String::from("Eluveitie")],
format: TrackFormat::Flac,
},
],
},
@ -216,56 +248,67 @@ static COLLECTION: Lazy<Vec<Artist>> = Lazy::new(|| {
number: 01,
title: String::from("Intro = Chaos"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
Track {
number: 02,
title: String::from("Modlitwa"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
Track {
number: 03,
title: String::from("Długa droga z piekła"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
Track {
number: 04,
title: String::from("Synowie ognia"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
Track {
number: 05,
title: String::from("1902"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
Track {
number: 06,
title: String::from("Krew za krew"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
Track {
number: 07,
title: String::from("Kulminacja"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
Track {
number: 08,
title: String::from("Judasz"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
Track {
number: 09,
title: String::from("Więzy"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
Track {
number: 10,
title: String::from("Zagubione dusze"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
Track {
number: 11,
title: String::from("Linia życia"),
artist: vec![String::from("Frontside")],
format: TrackFormat::Flac,
},
],
}],
@ -285,41 +328,49 @@ static COLLECTION: Lazy<Vec<Artist>> = Lazy::new(|| {
number: 01,
title: String::from("Fight Fire with Fire"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 02,
title: String::from("Ride the Lightning"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 03,
title: String::from("For Whom the Bell Tolls"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 04,
title: String::from("Fade to Black"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 05,
title: String::from("Trapped under Ice"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 06,
title: String::from("Escape"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 07,
title: String::from("Creeping Death"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 08,
title: String::from("The Call of Ktulu"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
],
},
@ -333,106 +384,127 @@ static COLLECTION: Lazy<Vec<Artist>> = Lazy::new(|| {
number: 01,
title: String::from("The Ecstasy of Gold"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 02,
title: String::from("The Call of Ktulu"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 03,
title: String::from("Master of Puppets"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 04,
title: String::from("Of Wolf and Man"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 05,
title: String::from("The Thing That Should Not Be"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 06,
title: String::from("Fuel"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 07,
title: String::from("The Memory Remains"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 08,
title: String::from("No Leaf Clover"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 09,
title: String::from("Hero of the Day"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 10,
title: String::from("Devil’s Dance"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 11,
title: String::from("Bleeding Me"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 12,
title: String::from("Nothing Else Matters"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 13,
title: String::from("Until It Sleeps"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 14,
title: String::from("For Whom the Bell Tolls"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 15,
title: String::from("−Human"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 16,
title: String::from("Wherever I May Roam"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 17,
title: String::from("Outlaw Torn"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 18,
title: String::from("Sad but True"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 19,
title: String::from("One"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 20,
title: String::from("Enter Sandman"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
Track {
number: 21,
title: String::from("Battery"),
artist: vec![String::from("Metallica")],
format: TrackFormat::Flac,
},
],
},