Fix CI, update README

CrossCopy · May 1, 2024 · 63c0b21 · 63c0b21
1 parent 63aabc3
commit 63c0b21
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 30 deletions.
diff --git a/.changes/v0.6.8-win-html-fix.md b/.changes/v0.6.8-win-html-fix.md
@@ -0,0 +1,19 @@
+
+---
+"tauri-plugin-clipboard": patch
+---
+
+# v0.6.8
+
+> 2024-05-01
+
+Fix Windows html write bug.
+
+> On windows, writing large chunks of html to clipboard fails. Data truncated.
+
+This was fixed in `clipboard-rs` in v0.1.7.
+
+Issues:
+- https://github.com/CrossCopy/tauri-plugin-clipboard/issues/29
+- https://github.com/ChurchTao/clipboard-rs/issues/23
+
diff --git a/Makefile b/Makefile
@@ -0,0 +1,4 @@
+check:
+	cargo fmt
+	cargo clippy --all-targets --all-features -- -D warnings
+
diff --git a/README.md b/README.md
@@ -1,5 +1,14 @@
 # Tauri Plugin clipboard
 
+[![Deploy VitePress site to Pages](https://github.com/CrossCopy/tauri-plugin-clipboard/actions/workflows/docs.yml/badge.svg)](https://github.com/CrossCopy/tauri-plugin-clipboard/actions/workflows/docs.yml)
+[![Clippy](https://github.com/CrossCopy/tauri-plugin-clipboard/actions/workflows/clippy.yml/badge.svg)](https://github.com/CrossCopy/tauri-plugin-clipboard/actions/workflows/clippy.yml)
+[![Format](https://github.com/CrossCopy/tauri-plugin-clipboard/actions/workflows/format.yml/badge.svg)](https://github.com/CrossCopy/tauri-plugin-clipboard/actions/workflows/format.yml)
+[![Test](https://github.com/CrossCopy/tauri-plugin-clipboard/actions/workflows/test.yml/badge.svg)](https://github.com/CrossCopy/tauri-plugin-clipboard/actions/workflows/test.yml)
+![Crates.io Version](https://img.shields.io/crates/v/tauri-plugin-clipboard)
+![NPM Version](https://img.shields.io/npm/v/tauri-plugin-clipboard-api)
+[![Documentation](https://docs.rs/tauri-plugin-clipboard/badge.svg)](https://docs.rs/tauri-plugin-clipboard)
+![GitHub License](https://img.shields.io/github/license/CrossCopy/tauri-plugin-clipboard)
+
 ## Documentation Website: https://crosscopy.github.io/tauri-plugin-clipboard
 
 > A Tauri plugin for clipboard read/write/monitor. Support text, rich text, HTML, files and image.

diff --git a/src/bin/files.rs b/src/bin/files.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -36,7 +36,7 @@ where
     fn on_clipboard_change(&mut self) {
         let _ = self.app_handle.emit_all(
             "plugin:clipboard://clipboard-monitor/update",
-            format!("clipboard update"),
+            "clipboard update",
         );
     }
 }
@@ -46,14 +46,16 @@ pub struct ClipboardManager {
     watcher_shutdown: Arc<Mutex<Option<WatcherShutdown>>>,
 }
 
-impl ClipboardManager {
-    pub fn default() -> Self {
-        return ClipboardManager {
-            clipboard: Arc::new(Mutex::from(ClipboardContext::new().unwrap())),
+impl Default for ClipboardManager {
+    fn default() -> Self {
+        Self {
+            clipboard: Arc::new(Mutex::new(ClipboardContext::new().unwrap())),
             watcher_shutdown: Arc::default(),
-        };
+        }
     }
+}
 
+impl ClipboardManager {
     pub fn has(&self, format: ContentFormat) -> Result<bool, String> {
         Ok(self
             .clipboard
@@ -132,7 +134,7 @@ impl ClipboardManager {
             .iter()
             .map(|file| {
                 if file.starts_with("file://") {
-                    file[7..].to_string()
+                    file.strip_prefix("file://").unwrap().to_string()
                 } else {
                     file.to_string()
                 }
@@ -179,7 +181,7 @@ impl ClipboardManager {
     /// read image from clipboard and return a base64 string
     pub fn read_image_base64(&self) -> Result<String, String> {
         let image_bytes = self.read_image_binary()?;
-        let base64_str = general_purpose::STANDARD_NO_PAD.encode(&image_bytes);
+        let base64_str = general_purpose::STANDARD_NO_PAD.encode(image_bytes);
         Ok(base64_str)
     }