From 643e337e615a6aa30335fb7fc6cf4d48653f55ad Mon Sep 17 00:00:00 2001
From: Mark <>
Date: Tue, 28 May 2024 15:49:37 +0200
Subject: [PATCH] using source "remote" for server now has covers

---
 musicdb-lib/src/data/database.rs |  2 +-
 musicdb-lib/src/server/get.rs    | 44 +++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/musicdb-lib/src/data/database.rs b/musicdb-lib/src/data/database.rs
index 10b9e3b..0b93d73 100755
--- a/musicdb-lib/src/data/database.rs
+++ b/musicdb-lib/src/data/database.rs
@@ -1046,7 +1046,7 @@ pub struct Cover {
     pub data: Arc<Mutex<(bool, Option<(Instant, Vec<u8>)>)>>,
 }
 impl Cover {
-    pub fn get_bytes<O>(
+    pub fn get_bytes_from_file<O>(
         &self,
         path: impl FnOnce(&DatabaseLocation) -> PathBuf,
         conv: impl FnOnce(&Vec<u8>) -> O,
diff --git a/musicdb-lib/src/server/get.rs b/musicdb-lib/src/server/get.rs
index 32cd845..1a0041e 100755
--- a/musicdb-lib/src/server/get.rs
+++ b/musicdb-lib/src/server/get.rs
@@ -178,25 +178,39 @@ pub fn handle_one_connection_as_get(
             if let Some(req) = request.next() {
                 match req {
                     "cover-bytes" => {
-                        if let Some(cover) = request
-                            .next()
-                            .and_then(|id| id.parse().ok())
-                            .and_then(|id| db.lock().unwrap().covers().get(&id).cloned())
-                        {
-                            if let Some(v) = cover.get_bytes(
-                                |p| db.lock().unwrap().get_path(p),
-                                |bytes| {
+                        if let Some(cover_id) = request.next().and_then(|id| id.parse().ok()) {
+                            let dbl = db.lock().unwrap();
+                            if let Some(get_con) = &dbl.remote_server_as_song_file_source {
+                                if let Some(bytes) = get_con
+                                    .lock()
+                                    .unwrap()
+                                    .cover_bytes(cover_id)
+                                    .ok()
+                                    .and_then(Result::ok)
+                                {
                                     writeln!(connection.get_mut(), "len: {}", bytes.len())?;
-                                    connection.get_mut().write_all(bytes)?;
-                                    Ok::<(), std::io::Error>(())
-                                },
-                            ) {
-                                v?;
+                                    connection.get_mut().write_all(&bytes)?;
+                                } else {
+                                    writeln!(connection.get_mut(), "no")?;
+                                }
+                            } else if let Some(cover) = dbl.covers().get(&cover_id) {
+                                if let Some(v) = cover.get_bytes_from_file(
+                                    |p| dbl.get_path(p),
+                                    |bytes| {
+                                        writeln!(connection.get_mut(), "len: {}", bytes.len())?;
+                                        connection.get_mut().write_all(bytes)?;
+                                        Ok::<(), std::io::Error>(())
+                                    },
+                                ) {
+                                    v?;
+                                } else {
+                                    writeln!(connection.get_mut(), "no data")?;
+                                }
                             } else {
-                                writeln!(connection.get_mut(), "no data")?;
+                                writeln!(connection.get_mut(), "no cover")?;
                             }
                         } else {
-                            writeln!(connection.get_mut(), "no cover")?;
+                            writeln!(connection.get_mut(), "bad id")?;
                         }
                     }
                     "song-file" => {