From 7637037e3db74718c73a3fb47d8314901766e419 Mon Sep 17 00:00:00 2001 From: Ray <7869818+rayrrr@users.noreply.github.com> Date: Tue, 16 Jun 2020 08:06:27 -0400 Subject: [PATCH] add m4a support via mp4ameta crate --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- src/index/metadata.rs | 13 +++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 10a5838..7874aeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1204,7 +1204,7 @@ dependencies = [ [[package]] name = "mp4ameta" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1485,7 +1485,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "metaflac 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "mp3-duration 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "mp4ameta 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "mp4ameta 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2948,7 +2948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" "checksum mp3-duration 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "eda61ba6c266cd2c7bfcea9a2719837dc062869e24e101a93c1b0873d17c2d35" -"checksum mp4ameta 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3538f327d5d3afbc25b3677f5bd1e917ae7e9d3eae2aa9c3b57bc77f0356e829" +"checksum mp4ameta 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c1c3784b35bb34f94341fd1e2bf9a2c66fc40804464a155b06b3cd71f8d623e" "checksum native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" "checksum net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)" = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" "checksum notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd" diff --git a/Cargo.toml b/Cargo.toml index fde6aa4..3430306 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ lewton = "0.10.1" log = "0.4.5" metaflac = "0.2.3" mp3-duration = "0.1.9" -mp4ameta = "0.2.0" +mp4ameta = "0.2.1" pbkdf2 = "0.3" rand = "0.7" rayon = "1.3" diff --git a/src/index/metadata.rs b/src/index/metadata.rs index 4ae4614..d8ec7fe 100644 --- a/src/index/metadata.rs +++ b/src/index/metadata.rs @@ -218,14 +218,15 @@ fn read_mp4(path: &Path) -> Result { track_number: None, year: None, }; - tags.artist = Some(tag.artist().unwrap().to_string()); - tags.album_artist = Some(tag.album_artist().unwrap().to_string()); - tags.album = Some(tag.album().unwrap().to_string()); - tags.title = Some(tag.title().unwrap().to_string()); - tags.duration = Some(tag.duration().unwrap() as u32); + tags.artist = tag.artist().map(|v| v.to_string()); + tags.album_artist = tag.album_artist().map(|v| v.to_string()); + tags.album = tag.album().map(|v| v.to_string()); + tags.title = tag.title().map(|v| v.to_string()); + tags.duration = tag.duration().map(|v| v as u32); tags.disc_number = tag.disk_number().0.and_then(|d| Some(d as u32)); tags.track_number = tag.track_number().0.and_then(|d| Some(d as u32)); - tags.year = tag.year().unwrap().parse::().ok(); + let year = tag.year().and_then(|v| Some(v.parse::().ok())); + tags.year = match year { None => None, Some(year) => year}; Ok(tags) }