Mirrors/polaris
2
0
Fork 0
mirror of https://github.com/agersant/polaris synced 2024-12-11 13:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #15 from jxs/master

Browse source 
Calculate flac duration
This commit is contained in:
Antoine Gersant 2017-12-06 21:06:43 -08:00 committed by GitHub
commit d09e0d96fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 80 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
Cargo.lock generated
View file

@ -1,45 +1,3 @@
[root]
name = "polaris"
version = "0.7.1"
dependencies = [
"ape 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"diesel 0.16.0 (git+https://github.com/diesel-rs/diesel?rev=034049d)",
"diesel_codegen 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
"id3 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.2.2 (git+https://github.com/retep998/winapi-rs?branch=0.2)",
"lewton 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"metaflac 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"mount 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"params 0.6.0 (git+https://github.com/euclio/params?branch=update)",
"rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"reqwest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)",
"router 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rusqlite 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"secure-session 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"shell32-sys 0.1.1 (git+https://github.com/retep998/winapi-rs?branch=0.2)",
"simplelog 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"staticfile 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unix-daemonize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"user32-sys 0.2.0 (git+https://github.com/retep998/winapi-rs?branch=0.2)",
"uuid 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (git+https://github.com/retep998/winapi-rs?branch=0.2)",
]
[[package]] [[package]]
name = "adler32" name = "adler32"
version = "1.0.0" version = "1.0.0"
@ -1091,6 +1049,48 @@ dependencies = [
"num-iter 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "polaris"
version = "0.7.1"
dependencies = [
"ape 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"diesel 0.16.0 (git+https://github.com/diesel-rs/diesel?rev=034049d)",
"diesel_codegen 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
"id3 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.2.2 (git+https://github.com/retep998/winapi-rs?branch=0.2)",
"lewton 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"metaflac 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"mount 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"params 0.6.0 (git+https://github.com/euclio/params?branch=update)",
"rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"reqwest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)",
"router 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rusqlite 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"secure-session 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"shell32-sys 0.1.1 (git+https://github.com/retep998/winapi-rs?branch=0.2)",
"simplelog 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"staticfile 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unix-daemonize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"user32-sys 0.2.0 (git+https://github.com/retep998/winapi-rs?branch=0.2)",
"uuid 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (git+https://github.com/retep998/winapi-rs?branch=0.2)",
]
[[package]] [[package]]
name = "quote" name = "quote"
version = "0.3.15" version = "0.3.15"

19
src/db/migrations/20171015224223_add_song_duration/down.sql Normal file
View file

@ -0,0 +1,19 @@
CREATE TEMPORARY TABLE songs_backup(id, path, parent, track_number, disc_number, title, artist, album_artist, year, album, artwork);
INSERT INTO songs_backup SELECT id, path, parent, track_number, disc_number, title, artist, album_artist, year, album, artwork FROM songs;
DROP TABLE songs;
CREATE TABLE songs (
id INTEGER PRIMARY KEY NOT NULL,
path TEXT NOT NULL,
parent TEXT NOT NULL,
track_number INTEGER,
disc_number INTEGER,
title TEXT,
artist TEXT,
album_artist TEXT,
year INTEGER,
album TEXT,
artwork TEXT,
UNIQUE(path) ON CONFLICT REPLACE
);
INSERT INTO songs SELECT * FROM songs_backup;
DROP TABLE songs_backup;

1
src/db/migrations/20171015224223_add_song_duration/up.sql Normal file
View file

@ -0,0 +1 @@
ALTER TABLE songs ADD COLUMN duration INTEGER;

BIN
src/db/schema.sqlite
View file

Binary file not shown.

3
src/index.rs
View file

@ -49,6 +49,7 @@ pub struct Song {
pub year: Option<i32>, pub year: Option<i32>,
pub album: Option<String>, pub album: Option<String>,
pub artwork: Option<String>, pub artwork: Option<String>,
pub duration: Option<i32>,
} }
#[derive(Debug, Queryable, Serialize)] #[derive(Debug, Queryable, Serialize)]
@ -84,6 +85,7 @@ struct NewSong {
year: Option<i32>, year: Option<i32>,
album: Option<String>, album: Option<String>,
artwork: Option<String>, artwork: Option<String>,
duration: Option<i32>
} }
#[derive(Debug, Insertable)] #[derive(Debug, Insertable)]
@ -247,6 +249,7 @@ impl<'conn> IndexBuilder<'conn> {
disc_number: tags.disc_number.map(|n| n as i32), disc_number: tags.disc_number.map(|n| n as i32),
track_number: tags.track_number.map(|n| n as i32), track_number: tags.track_number.map(|n| n as i32),
title: tags.title, title: tags.title,
duration: tags.duration.map(|n| n as i32),
artist: tags.artist, artist: tags.artist,
album_artist: tags.album_artist, album_artist: tags.album_artist,
album: tags.album, album: tags.album,

17
src/metadata.rs
View file

@ -10,11 +10,12 @@ use errors::*;
use utils; use utils;
use utils::AudioFormat; use utils::AudioFormat;
#[derive(Debug, PartialEq)] #[derive(Debug, Clone, PartialEq)]
pub struct SongTags { pub struct SongTags {
pub disc_number: Option<u32>, pub disc_number: Option<u32>,
pub track_number: Option<u32>, pub track_number: Option<u32>,
pub title: Option<String>, pub title: Option<String>,
pub duration: Option<u32>,
pub artist: Option<String>, pub artist: Option<String>,
pub album_artist: Option<String>, pub album_artist: Option<String>,
pub album: Option<String>, pub album: Option<String>,
@ -50,6 +51,7 @@ fn read_id3(path: &Path) -> Result<SongTags> {
album_artist: album_artist, album_artist: album_artist,
album: album, album: album,
title: title, title: title,
duration: None,
disc_number: disc_number, disc_number: disc_number,
track_number: track_number, track_number: track_number,
year: year, year: year,
@ -98,6 +100,7 @@ fn read_ape(path: &Path) -> Result<SongTags> {
album_artist: album_artist, album_artist: album_artist,
album: album, album: album,
title: title, title: title,
duration: None,
disc_number: disc_number, disc_number: disc_number,
track_number: track_number, track_number: track_number,
year: year, year: year,
@ -114,6 +117,7 @@ fn read_vorbis(path: &Path) -> Result<SongTags> {
album_artist: None, album_artist: None,
album: None, album: None,
title: None, title: None,
duration:None,
disc_number: None, disc_number: None,
track_number: None, track_number: None,
year: None, year: None,
@ -142,11 +146,18 @@ fn read_flac(path: &Path) -> Result<SongTags> {
.get("DISCNUMBER") .get("DISCNUMBER")
.and_then(|d| d[0].parse::<u32>().ok()); .and_then(|d| d[0].parse::<u32>().ok());
let year = vorbis.get("DATE").and_then(|d| d[0].parse::<i32>().ok()); let year = vorbis.get("DATE").and_then(|d| d[0].parse::<i32>().ok());
let streaminfo = tag.get_blocks(metaflac::BlockType::StreamInfo);
let duration = match streaminfo.first() {
Some(&&metaflac::Block::StreamInfo(ref s)) => Some((s.total_samples as u32 / s.sample_rate) as u32),
_ => None
};
Ok(SongTags { Ok(SongTags {
artist: vorbis.artist().map(|v| v[0].clone()), artist: vorbis.artist().map(|v| v[0].clone()),
album_artist: vorbis.album_artist().map(|v| v[0].clone()), album_artist: vorbis.album_artist().map(|v| v[0].clone()),
album: vorbis.album().map(|v| v[0].clone()), album: vorbis.album().map(|v| v[0].clone()),
title: vorbis.title().map(|v| v[0].clone()), title: vorbis.title().map(|v| v[0].clone()),
duration: duration,
disc_number: disc_number, disc_number: disc_number,
track_number: vorbis.track(), track_number: vorbis.track(),
year: year, year: year,
@ -162,9 +173,11 @@ fn test_read_metadata() {
artist: Some("TEST ARTIST".into()), artist: Some("TEST ARTIST".into()),
album_artist: Some("TEST ALBUM ARTIST".into()), album_artist: Some("TEST ALBUM ARTIST".into()),
album: Some("TEST ALBUM".into()), album: Some("TEST ALBUM".into()),
duration: None,
year: Some(2016), year: Some(2016),
}; };
let flac_sample_tag = SongTags {duration: Some(0), ..sample_tags.clone()};
assert_eq!(read(Path::new("test/sample.mp3")).unwrap(), sample_tags); assert_eq!(read(Path::new("test/sample.mp3")).unwrap(), sample_tags);
assert_eq!(read(Path::new("test/sample.ogg")).unwrap(), sample_tags); assert_eq!(read(Path::new("test/sample.ogg")).unwrap(), sample_tags);
assert_eq!(read(Path::new("test/sample.flac")).unwrap(), sample_tags); assert_eq!(read(Path::new("test/sample.flac")).unwrap(), flac_sample_tag);
} }