From 2185c379fba7ab49ca65c800c4a5332fbf63a2af Mon Sep 17 00:00:00 2001
From: Jonas Kruckenberg <iterpre@protonmail.com>
Date: Fri, 6 Jan 2023 14:23:24 +0100
Subject: [PATCH] refactor(upload): use plugin builder style

---
 plugins/upload/src/lib.rs | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/plugins/upload/src/lib.rs b/plugins/upload/src/lib.rs
index b739435d..0ef0bd55 100644
--- a/plugins/upload/src/lib.rs
+++ b/plugins/upload/src/lib.rs
@@ -4,7 +4,7 @@
 
 use futures::TryStreamExt;
 use serde::{ser::Serializer, Serialize};
-use tauri::{command, plugin::Plugin, Invoke, Runtime, Window};
+use tauri::{command, plugin::{Builder as PluginBuilder, TauriPlugin}, Runtime, Window};
 use tokio::fs::File;
 use tokio_util::codec::{BytesCodec, FramedRead};
 
@@ -82,25 +82,8 @@ fn file_to_body<R: Runtime>(id: u32, window: Window<R>, file: File) -> reqwest::
     ))
 }
 
-/// Tauri plugin.
-pub struct Upload<R: Runtime> {
-    invoke_handler: Box<dyn Fn(Invoke<R>) + Send + Sync>,
-}
-
-impl<R: Runtime> Default for Upload<R> {
-    fn default() -> Self {
-        Self {
-            invoke_handler: Box::new(tauri::generate_handler![upload]),
-        }
-    }
-}
-
-impl<R: Runtime> Plugin<R> for Upload<R> {
-    fn name(&self) -> &'static str {
-        "upload"
-    }
-
-    fn extend_api(&mut self, message: Invoke<R>) {
-        (self.invoke_handler)(message)
-    }
+pub fn init<R: Runtime>() -> TauriPlugin<R> {
+    PluginBuilder::new("upload")
+        .invoke_handler(tauri::generate_handler![upload])
+        .build()
 }