opti

rklipd/src/ws/wayland.rs

@@ -1,15 +1,22 @@
-use crate::database::Database;
 use crate::models::{ClipboardData, ClipboardEntry, Image};
+use std::collections::hash_map::DefaultHasher;
 use std::error::Error;
-use std::sync::{Arc, Mutex};
+use std::hash::{Hash, Hasher};
+use std::sync::mpsc;
 use std::time::SystemTime;
 use uuid::Uuid;
 use wayland_clipboard_listener::{WlClipboardPasteStream, WlListenType};
 
 const MAX_IMAGE_PIXELS: usize = 3840 * 2160;
 
+fn hash_bytes(data: &[u8]) -> u64 {
+    let mut hasher = DefaultHasher::new();
+    data.hash(&mut hasher);
+    hasher.finish()
+}
+
 pub fn start(
-    db: Arc<Mutex<Database>>,
+    tx: mpsc::Sender<ClipboardEntry>,
     _clipboard: arboard::Clipboard,
 ) -> Result<(), Box<dyn Error>> {
     let mut stream = WlClipboardPasteStream::init(WlListenType::ListenOnCopy)
@@ -17,9 +24,11 @@ pub fn start(
 
     println!("Écoute du presse-papier Wayland...");
 
+    let mut last_text: Option<String> = None;
+    let mut last_image_hash: Option<u64> = None;
+
     for msg in stream.paste_stream().flatten() {
-        let context = &msg.context;
-        let data: &[u8] = context.context.as_slice();
+        let data: &[u8] = msg.context.context.as_slice();
 
         if data.is_empty() {
             continue;
@@ -27,14 +36,22 @@ pub fn start(
 
         let entry = if let Ok(text) = String::from_utf8(data.to_vec()) {
             let text = text.trim_end_matches('\n').to_string();
-            if text.is_empty() {
+            if text.is_empty() || Some(&text) == last_text.as_ref() {
                 continue;
             }
+            last_text = Some(text.clone());
+            last_image_hash = None;
+            println!("Clipboard update (texte)");
             ClipboardEntry {
                 content: ClipboardData::Text(text),
                 timestamp: SystemTime::now(),
             }
         } else {
+            let hash = hash_bytes(data);
+            if Some(hash) == last_image_hash {
+                continue;
+            }
+
             match image::load_from_memory(data) {
                 Ok(img) => {
                     let (width, height) = (img.width(), img.height());
@@ -48,9 +65,15 @@ pub fn start(
                             3840,
                             2160
                         );
+                        last_image_hash = Some(hash);
+                        last_text = None;
                         continue;
                     }
 
+                    last_image_hash = Some(hash);
+                    last_text = None;
+                    println!("Clipboard update (image)");
+
                     let rgba = img.into_rgba8();
                     ClipboardEntry {
                         content: ClipboardData::Image(Image {
@@ -69,15 +92,10 @@ pub fn start(
             }
         };
 
-        println!("Clipboard update détecté");
-
-        let db_clone = Arc::clone(&db);
-        std::thread::spawn(move || {
-            let db_lock = db_clone.lock().unwrap();
-            if let Err(e) = db_lock.append(entry) {
-                eprintln!("SQLite error : {e}");
-            }
-        });
+        if tx.send(entry).is_err() {
+            eprintln!("Wayland : writer thread disparu, arrêt");
+            break;
+        }
     }
 
     Ok(())