From d5576dd1bdd0e4af446b7990acab2a4c6a91a3f2 Mon Sep 17 00:00:00 2001
From: Yuval Adam <_@yuv.al>
Date: Mon, 3 Jun 2024 10:32:37 +0200
Subject: Icy-metadata basic stuff works

---
 Cargo.lock | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'Cargo.lock')

diff --git a/Cargo.lock b/Cargo.lock
index e95ecfc..e31c5e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -622,6 +622,16 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "icy-metadata"
+version = "0.1.0"
+dependencies = [
+ "http",
+ "reqwest",
+ "tracing",
+ "urlencoding",
+]
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -1453,6 +1463,7 @@ dependencies = [
 name = "somafm"
 version = "0.4.0"
 dependencies = [
+ "icy-metadata",
  "inquire",
  "reqwest",
  "rodio",
@@ -1852,6 +1863,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
-- 
cgit v1.3.1


From a4ae080d330b8917b22f2f2e017f508f49fecd5e Mon Sep 17 00:00:00 2001
From: Yuval Adam <_@yuv.al>
Date: Mon, 3 Jun 2024 10:35:22 +0200
Subject: Bump to v0.5.0 and cleanup output for now

---
 Cargo.lock         | 2 +-
 Cargo.toml         | 2 +-
 src/audio/rodio.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Cargo.lock')

diff --git a/Cargo.lock b/Cargo.lock
index e31c5e0..e1197c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1461,7 +1461,7 @@ dependencies = [
 
 [[package]]
 name = "somafm"
-version = "0.4.0"
+version = "0.5.0"
 dependencies = [
  "icy-metadata",
  "inquire",
diff --git a/Cargo.toml b/Cargo.toml
index 9766ed7..e93e03a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "somafm"
 description = "A Rust-based command line player for SomaFM radio"
-version = "0.4.0"
+version = "0.5.0"
 authors = ["Yuval Adam <_@yuv.al>"]
 edition = "2021"
 license = "MIT"
diff --git a/src/audio/rodio.rs b/src/audio/rodio.rs
index 520628c..2557ed4 100644
--- a/src/audio/rodio.rs
+++ b/src/audio/rodio.rs
@@ -53,7 +53,7 @@ impl Rodio {
                         let md = metadata.unwrap();
                         if md.track_title().is_some() {
                             let tr = md.track_title().unwrap();
-                            println!("{tr}");
+                            println!(" {tr}");
                         }
                     }
                 },
-- 
cgit v1.3.1


From 7602f93105510766a5b21878819d6dbc66dd1e01 Mon Sep 17 00:00:00 2001
From: Yuval Adam <_@yuv.al>
Date: Tue, 4 Jun 2024 11:17:38 +0200
Subject: Use published icy-metadata crate

---
 Cargo.lock         | 2 ++
 Cargo.toml         | 2 +-
 src/audio/rodio.rs | 6 ++----
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Cargo.lock')

diff --git a/Cargo.lock b/Cargo.lock
index e1197c5..7fd9568 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -625,6 +625,8 @@ dependencies = [
 [[package]]
 name = "icy-metadata"
 version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "473e3fafde6c9b9d0753315701d000317db6965085bafcf7369c8d945dd5ef3b"
 dependencies = [
  "http",
  "reqwest",
diff --git a/Cargo.toml b/Cargo.toml
index e93e03a..53301d9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ keywords = ["radio", "somafm", "media"]
 repository = "https://github.com/yuvadm/somafm.rs"
 
 [dependencies]
-icy-metadata = { version = "0.1.0", path = "../icy-metadata" }
+icy-metadata = { version = "0.1.0" }
 inquire = "0.7.5"
 reqwest = { version = "0.12.4", features = ["blocking"] }
 rodio = { version = "0.18.1", features = ["symphonia", "symphonia-mp3"] }
diff --git a/src/audio/rodio.rs b/src/audio/rodio.rs
index 2557ed4..0f9fbb2 100644
--- a/src/audio/rodio.rs
+++ b/src/audio/rodio.rs
@@ -49,10 +49,8 @@ impl Rodio {
                 // response. This will allow us to parse the metadata within the stream
                 icy_headers.metadata_interval(),
                 |metadata| {
-                    if metadata.is_ok() {
-                        let md = metadata.unwrap();
-                        if md.track_title().is_some() {
-                            let tr = md.track_title().unwrap();
+                    if let Ok(md) = metadata {
+                        if let Some(tr) = md.stream_title() {
                             println!(" {tr}");
                         }
                     }
-- 
cgit v1.3.1