Fix album-art-data fetching, bump version 0.2.4

diff --git a/Cargo.lock b/Cargo.lock
index c0773b1fa47bfc7881208b5c55ee2944b4ebd146..2e047791b1a600b7c29a7df365392b525ea94a4b 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1427,7 +1427,7 @@ dependencies = [
 
 [[package]]
 name = "mpd_info_screen"
-version = "0.2.3"
+version = "0.2.4"
 dependencies = [
  "ggez",
  "image",

diff --git a/Cargo.toml b/Cargo.toml
index a6e5d8c59969517f3ed4cc6a95a5d5cdcd11b6c9..2321829c1623e9d1c921403f3d606b2e84e0aa41 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mpd_info_screen"
-version = "0.2.3"
+version = "0.2.4"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/README.md b/README.md
index f81efa6ba4ab02b528db05ea9b3ff72357f2c003..def6bac615629bcb888346101af9ba87917ce553 100644 (file)
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ counter, and the filename currently being played
 
 # Usage
 
-    mpd_info_screen 0.2.3
+    mpd_info_screen 0.2.4
     
     USAGE:
         mpd_info_screen [FLAGS] [OPTIONS] <host> [port]

diff --git a/src/display.rs b/src/display.rs
index d03886cba488024253eaa316fab0ac23ca0f2bfd..d59d01f3391c872d996f56681470bbdb678d1317 100644 (file)
--- a/src/display.rs
+++ b/src/display.rs
@@ -186,6 +186,12 @@ impl MPDDisplay {
             .try_read()
             .map_err(|_| String::from("ERROR get_image_from_data: Failed to get read_handle"))?;
 
+        if !read_handle.is_art_data_ready() {
+            return Err(String::from(
+                "ERROR get_image_from_data: art data not ready",
+            ));
+        }
+
         let mut image_format: image::ImageFormat = image::ImageFormat::Png;
         match read_handle.get_art_type().as_str() {
             "image/png" => image_format = image::ImageFormat::Png,

diff --git a/src/mpd_handler.rs b/src/mpd_handler.rs
index 364dbc80226d909a9faeb61397a72fd1c1206a1d..ffec118a520239bc9453014abd43bd8baec4196e 100644 (file)
--- a/src/mpd_handler.rs
+++ b/src/mpd_handler.rs
@@ -318,6 +318,10 @@ impl MPDHandler {
         self.art_data_type.clone()
     }
 
+    pub fn is_art_data_ready(&self) -> bool {
+        self.art_data.len() == self.art_data_size
+    }
+
     pub fn get_art_data(&self) -> &[u8] {
         &self.art_data
     }