From 0f25a128772766da882dc356c4ac6a7ba3b7a391 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Sat, 13 Jul 2024 19:01:06 -0700
Subject: [PATCH] Dependency bumps

---
 Cargo.lock                | 31 ++++++++++++++++---------------
 Cargo.toml                |  8 ++++----
 build.rs                  |  5 ++++-
 src/app/index/metadata.rs |  4 ++--
 src/app/thumbnail.rs      |  4 ++--
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a5eedc4..4e80231 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -557,13 +557,14 @@ dependencies = [
 
 [[package]]
 name = "embed-resource"
-version = "1.8.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e62abb876c07e4754fae5c14cafa77937841f01740637e17d78dc04352f32a5e"
+checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d"
 dependencies = [
  "cc",
+ "memchr",
  "rustc_version 0.4.0",
- "toml 0.5.11",
+ "toml 0.8.14",
  "vswhom",
  "winreg",
 ]
@@ -1005,9 +1006,9 @@ dependencies = [
 
 [[package]]
 name = "id3"
-version = "1.7.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9389dd9c8c4671b1e4b2878a6329bccb573f9c24a75bc91c641c451ce5436501"
+checksum = "55f4e785f2c700217ee82a1c727c720449421742abd5fcb2f1df04e1244760e9"
 dependencies = [
  "bitflags 2.4.0",
  "byteorder",
@@ -1171,9 +1172,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memoffset"
@@ -1186,13 +1187,12 @@ dependencies = [
 
 [[package]]
 name = "metaflac"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1470d3cc1bb0d692af5eb3afb594330b8ba09fd91c32c4e1c6322172a5ba750"
+checksum = "d0f083edae4a21f5acb1fda8220d1c14fa31f725bfd4e21005a14c2d8944db9b"
 dependencies = [
  "byteorder",
  "hex",
- "log",
 ]
 
 [[package]]
@@ -1965,9 +1965,9 @@ dependencies = [
 
 [[package]]
 name = "sd-notify"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32"
+checksum = "4646d6f919800cd25c50edb49438a1381e2cd4833c027e75e8897981c50b8b5e"
 
 [[package]]
 name = "semver"
@@ -3259,11 +3259,12 @@ dependencies = [
 
 [[package]]
 name = "winreg"
-version = "0.10.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
- "winapi",
+ "cfg-if",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index dddf293..27c3283 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,10 +19,10 @@ futures-util = { version = "0.3.30" }
 getopts = "0.2.21"
 headers = "0.4"
 http = "1.1.0"
-id3 = "1.7.0"
+id3 = "1.14.0"
 lewton = "0.10.2"
 log = "0.4.22"
-metaflac = "0.2.5"
+metaflac = "0.2.7"
 mp3-duration = "0.1.10"
 mp4ameta = "0.11.0"
 num_cpus = "1.14.0"
@@ -72,10 +72,10 @@ native-windows-derive = { version = "1.0.5", optional = true }
 
 [target.'cfg(unix)'.dependencies]
 daemonize = "0.5"
-sd-notify = "0.4.1"
+sd-notify = "0.4.2"
 
 [target.'cfg(windows)'.build-dependencies]
-embed-resource = "1.8"
+embed-resource = "2.4.2"
 winres = "0.1"
 
 [dev-dependencies]
diff --git a/build.rs b/build.rs
index eeebfdd..5652b5c 100644
--- a/build.rs
+++ b/build.rs
@@ -3,7 +3,10 @@ fn main() {
 	let mut res = winres::WindowsResource::new();
 	res.set_icon("./res/windows/application/icon_polaris_512.ico");
 	res.compile().unwrap();
-	embed_resource::compile("res/windows/application/polaris-manifest.rc");
+	embed_resource::compile(
+		"res/windows/application/polaris-manifest.rc",
+		embed_resource::NONE,
+	);
 }
 
 #[cfg(unix)]
diff --git a/src/app/index/metadata.rs b/src/app/index/metadata.rs
index 5e6af88..943b00d 100644
--- a/src/app/index/metadata.rs
+++ b/src/app/index/metadata.rs
@@ -141,7 +141,7 @@ fn read_mp3(path: &Path) -> Result<SongTags, Error> {
 }
 
 fn read_aiff(path: &Path) -> Result<SongTags, Error> {
-	let tag = id3::Tag::read_from_aiff_path(path).or_else(|error| {
+	let tag = id3::Tag::read_from_path(path).or_else(|error| {
 		if let Some(tag) = error.partial_tag {
 			Ok(tag)
 		} else {
@@ -152,7 +152,7 @@ fn read_aiff(path: &Path) -> Result<SongTags, Error> {
 }
 
 fn read_wave(path: &Path) -> Result<SongTags, Error> {
-	let tag = id3::Tag::read_from_wav_path(path).or_else(|error| {
+	let tag = id3::Tag::read_from_path(path).or_else(|error| {
 		if let Some(tag) = error.partial_tag {
 			Ok(tag)
 		} else {
diff --git a/src/app/thumbnail.rs b/src/app/thumbnail.rs
index 97475a6..edad43f 100644
--- a/src/app/thumbnail.rs
+++ b/src/app/thumbnail.rs
@@ -180,12 +180,12 @@ fn read_mp3(path: &Path) -> Result<DynamicImage, Error> {
 }
 
 fn read_aiff(path: &Path) -> Result<DynamicImage, Error> {
-	let tag = id3::Tag::read_from_aiff_path(path).map_err(|e| Error::Id3(path.to_owned(), e))?;
+	let tag = id3::Tag::read_from_path(path).map_err(|e| Error::Id3(path.to_owned(), e))?;
 	read_id3(path, &tag)
 }
 
 fn read_wave(path: &Path) -> Result<DynamicImage, Error> {
-	let tag = id3::Tag::read_from_wav_path(path).map_err(|e| Error::Id3(path.to_owned(), e))?;
+	let tag = id3::Tag::read_from_path(path).map_err(|e| Error::Id3(path.to_owned(), e))?;
 	read_id3(path, &tag)
 }