From d0ce3630e3af07f95d659ae1d0059b2e4d6153f8 Mon Sep 17 00:00:00 2001 From: Antoine Gersant Date: Sun, 4 Jun 2017 14:26:30 -0700 Subject: [PATCH] Updated lewton dependency --- Cargo.lock | 16 ++++------------ Cargo.toml | 3 +-- src/main.rs | 1 - src/metadata.rs | 3 +-- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 75701f2..4dd406d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,10 +11,9 @@ dependencies = [ "image 0.13.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.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lewton 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "metaflac 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "mount 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ogg 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "params 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -479,11 +478,6 @@ dependencies = [ "unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ieee754" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "image" version = "0.13.0" @@ -593,11 +587,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lewton" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ieee754 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ogg 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1545,7 +1538,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum hyper-native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "48fecce9e67dff46707980abb41f10eaa49cf0eded8dd0c26ae94b3ae5c3f705" "checksum id3 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "3c18202b35f40b88e682c8b75bca771ba731ce5192dcd31c0c64271a6c946887" "checksum idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2233d4940b1f19f0418c158509cd7396b8d70a5db5705ce410914dc8fa603b37" -"checksum ieee754 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24477af62edd96fc8de28c9a9b719d9c0e1c9f84838f2a757642215d33664ead" "checksum image 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c3f4f5ea213ed9899eca760a8a14091d4b82d33e27cf8ced336ff730e9f6da8" "checksum inflate 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d1238524675af3938a7c74980899535854b88ba07907bb1c944abe5b8fc437e5" "checksum iron 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9fb1b2d809f84bf347e472d5758762b5c804e0c622970235f156d82673e4d334" @@ -1558,7 +1550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417" "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf" -"checksum lewton 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1674d272633480046096d1fb97eb4fb99de9325bcb342ad349d8fb3b6ab38b89" +"checksum lewton 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c1b7b81410f7895d4793bae921cc62317c5500c6ef211c9c24cad778eda77c20" "checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e" "checksum libflate 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "591fb1342cbc9be24883f22f97bd7ede01dd1f3821833c4ff07435c7270cc1f6" "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b" diff --git a/Cargo.toml b/Cargo.toml index b6dee18..a924243 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,10 +15,9 @@ hyper = "0.10.0" id3 = "0.1.11" image = "0.13.0" iron = "0.5.1" -lewton = "0.4.1" +lewton = "0.5.2" metaflac = "0.1.4" mount = "0.3.0" -ogg = "0.4.0" params = "*" regex = "0.1" reqwest = "0.6.2" diff --git a/src/main.rs b/src/main.rs index f99c381..699b845 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,7 +13,6 @@ extern crate iron; extern crate lewton; extern crate metaflac; extern crate mount; -extern crate ogg; extern crate params; extern crate reqwest; extern crate regex; diff --git a/src/metadata.rs b/src/metadata.rs index 22c6212..5a699ab 100644 --- a/src/metadata.rs +++ b/src/metadata.rs @@ -2,7 +2,6 @@ use ape; use id3; use lewton::inside_ogg::OggStreamReader; use metaflac; -use ogg::PacketReader; use regex::Regex; use std::fs; use std::path::Path; @@ -108,7 +107,7 @@ fn read_ape(path: &Path) -> Result { fn read_vorbis(path: &Path) -> Result { let file = fs::File::open(path)?; - let source = OggStreamReader::new(PacketReader::new(file))?; + let source = OggStreamReader::new(file)?; let mut tags = SongTags { artist: None,