From 4e5257263865f9a5dd29b24d43d1a7783559b156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= Date: Sun, 3 Dec 2017 21:40:54 +0000 Subject: [PATCH] update cargo lock --- Cargo.lock | 84 ++++++++++++++++++++++++------------------------- src/metadata.rs | 6 ++-- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de403b3..106fef9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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]] name = "adler32" version = "1.0.0" @@ -1091,6 +1049,48 @@ dependencies = [ "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]] name = "quote" version = "0.3.15" diff --git a/src/metadata.rs b/src/metadata.rs index 2bc6726..71ff39b 100644 --- a/src/metadata.rs +++ b/src/metadata.rs @@ -148,8 +148,8 @@ fn read_flac(path: &Path) -> Result { let year = vorbis.get("DATE").and_then(|d| d[0].parse::().ok()); let streaminfo = tag.get_blocks(metaflac::BlockType::StreamInfo); let duration = match streaminfo.first() { - Some(&&metaflac::Block::StreamInfo(ref s)) => (s.total_samples as u32 / s.sample_rate) as u32, - _ => 0 + Some(&&metaflac::Block::StreamInfo(ref s)) => Some((s.total_samples as u32 / s.sample_rate) as u32), + _ => None }; Ok(SongTags { @@ -157,7 +157,7 @@ fn read_flac(path: &Path) -> Result { album_artist: vorbis.album_artist().map(|v| v[0].clone()), album: vorbis.album().map(|v| v[0].clone()), title: vorbis.title().map(|v| v[0].clone()), - duration: Some(duration), + duration: duration, disc_number: disc_number, track_number: vorbis.track(), year: year,