From 26ebd0deb92e630511fe4ee65a66b1c4e77b20fe Mon Sep 17 00:00:00 2001
From: fufesou <13586388+fufesou@users.noreply.github.com>
Date: Thu, 5 Sep 2024 23:39:07 +0800
Subject: [PATCH] fix: clipboard, cmd ipc (#9270)

1. Send raw contents if `content_len` > 1024*3.
2. Send raw contents if it is not empty.
3. Try read clipboard again if no data from cm.

Signed-off-by: fufesou <linlong1266@gmail.com>
---
 src/server/clipboard_service.rs | 43 ++++++++++++++++++---------------
 src/ui_cm_interface.rs          |  8 +++---
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/server/clipboard_service.rs b/src/server/clipboard_service.rs
index 3040a8f88..e70974258 100644
--- a/src/server/clipboard_service.rs
+++ b/src/server/clipboard_service.rs
@@ -95,25 +95,30 @@ impl Handler {
                     log::error!("Failed to read clipboard from cm: {}", e);
                 }
                 Ok(data) => {
-                    let mut msg = Message::new();
-                    let multi_clipboards = MultiClipboards {
-                        clipboards: data
-                            .into_iter()
-                            .map(|c| Clipboard {
-                                compress: c.compress,
-                                content: c.content,
-                                width: c.width,
-                                height: c.height,
-                                format: ClipboardFormat::from_i32(c.format)
-                                    .unwrap_or(ClipboardFormat::Text)
-                                    .into(),
-                                ..Default::default()
-                            })
-                            .collect(),
-                        ..Default::default()
-                    };
-                    msg.set_multi_clipboards(multi_clipboards);
-                    return Some(msg);
+                    // Skip sending empty clipboard data.
+                    // Maybe there's something wrong reading the clipboard data in cm, but no error msg is returned.
+                    // The clipboard data should not be empty, the last line will try again to get the clipboard data.
+                    if !data.is_empty() {
+                        let mut msg = Message::new();
+                        let multi_clipboards = MultiClipboards {
+                            clipboards: data
+                                .into_iter()
+                                .map(|c| Clipboard {
+                                    compress: c.compress,
+                                    content: c.content,
+                                    width: c.width,
+                                    height: c.height,
+                                    format: ClipboardFormat::from_i32(c.format)
+                                        .unwrap_or(ClipboardFormat::Text)
+                                        .into(),
+                                    ..Default::default()
+                                })
+                                .collect(),
+                            ..Default::default()
+                        };
+                        msg.set_multi_clipboards(multi_clipboards);
+                        return Some(msg);
+                    }
                 }
             }
         }
diff --git a/src/ui_cm_interface.rs b/src/ui_cm_interface.rs
index 89e9ceabb..f1748112e 100644
--- a/src/ui_cm_interface.rs
+++ b/src/ui_cm_interface.rs
@@ -498,10 +498,10 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
                                                 let (content, next_raw) = {
                                                     // TODO: find out a better threshold
                                                     if content_len > 1024 * 3 {
-                                                        (c.content, false)
-                                                    } else {
                                                         raw_contents.extend(c.content);
                                                         (bytes::Bytes::new(), true)
+                                                    } else {
+                                                        (c.content, false)
                                                     }
                                                 };
                                                 main_data.push(ClipboardNonFile {
@@ -515,7 +515,9 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
                                                 });
                                             }
                                             allow_err!(self.stream.send(&Data::ClipboardNonFile(Some(("".to_owned(), main_data)))).await);
-                                            allow_err!(self.stream.send_raw(raw_contents.into()).await);
+                                            if !raw_contents.is_empty() {
+                                                allow_err!(self.stream.send_raw(raw_contents.into()).await);
+                                            }
                                         }
                                         Err(e) => {
                                             allow_err!(self.stream.send(&Data::ClipboardNonFile(Some((format!("{}", e), vec![])))).await);