chore: Changes per review

Author: velocitysystems

README.md

@@ -33,7 +33,7 @@ This repo and all plugins require a Rust version of at least **1.77.2**
 | [store](plugins/store)                         | Persistent key value storage.                                                                                                                                  | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [stronghold](plugins/stronghold)               | Encrypted, secure database.                                                                                                                                    | ✅  | ✅  | ✅  | ?   | ?   |
 | [updater](plugins/updater)                     | In-app updates for Tauri applications.                                                                                                                         | ✅  | ✅  | ✅  | ❌  | ❌  |
-| [upload](plugins/upload)                       | Tauri plugin for file uploads through HTTP.                                                                                                                    | ✅  | ✅  | ✅  | ?   | ?   |
+| [upload](plugins/upload)                       | Tauri plugin for file uploads through HTTP.                                                                                                                    | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [websocket](plugins/websocket)                 | Open a WebSocket connection using a Rust client in JS.                                                                                                         | ✅  | ✅  | ✅  | ?   | ?   |
 | [window-state](plugins/window-state)           | Persist window sizes and positions.                                                                                                                            | ✅  | ✅  | ✅  | ❌  | ❌  |
 

plugins/upload/src/lib.rs

@@ -66,15 +66,12 @@ struct ProgressPayload {
 
 #[command]
 async fn download(
-    url: &str,
-    file_path: &str,
+    url: String,
+    file_path: String,
     headers: HashMap<String, String>,
     body: Option<String>,
     on_progress: Channel<ProgressPayload>,
 ) -> Result<()> {
-    let url = url.to_string();
-    let file_path = file_path.to_string();
-
     tokio::spawn(async move {
         let client = reqwest::Client::new();
         let mut request = if let Some(body) = body {
@@ -120,14 +117,11 @@ async fn download(
 
 #[command]
 async fn upload(
-    url: &str,
-    file_path: &str,
+    url: String,
+    file_path: String,
     headers: HashMap<String, String>,
     on_progress: Channel<ProgressPayload>,
 ) -> Result<String> {
-    let url = url.to_string();
-    let file_path = file_path.to_string();
-
     tokio::spawn(async move {
         // Read the file
         let file = File::open(&file_path).await?;
@@ -198,15 +192,15 @@ mod tests {
     #[tokio::test]
     async fn should_error_on_download_if_status_not_success() {
         let mocked_server = spawn_server_mocked(400).await;
-        let result = download_file(&mocked_server.url).await;
+        let result = download_file(mocked_server.url).await;
         mocked_server.mocked_endpoint.assert();
         assert!(result.is_err());
     }
 
     #[tokio::test]
     async fn should_download_file_successfully() {
         let mocked_server = spawn_server_mocked(200).await;
-        let result = download_file(&mocked_server.url).await;
+        let result = download_file(mocked_server.url).await;
         mocked_server.mocked_endpoint.assert();
         assert!(
             result.is_ok(),
@@ -218,7 +212,7 @@ mod tests {
     #[tokio::test]
     async fn should_error_on_upload_if_status_not_success() {
         let mocked_server = spawn_upload_server_mocked(500).await;
-        let result = upload_file(&mocked_server.url).await;
+        let result = upload_file(mocked_server.url).await;
         mocked_server.mocked_endpoint.assert();
         assert!(result.is_err());
         match result.unwrap_err() {
@@ -230,15 +224,15 @@ mod tests {
     #[tokio::test]
     async fn should_error_on_upload_if_file_not_found() {
         let mocked_server = spawn_upload_server_mocked(200).await;
-        let file_path = "/nonexistent/file.txt";
+        let file_path = "/nonexistent/file.txt".to_string();
         let headers = HashMap::new();
         let sender: Channel<ProgressPayload> =
             Channel::new(|msg: InvokeResponseBody| -> tauri::Result<()> {
                 let _ = msg;
                 Ok(())
             });
 
-        let result = upload(&mocked_server.url, file_path, headers, sender).await;
+        let result = upload(mocked_server.url, file_path, headers, sender).await;
         assert!(result.is_err());
         match result.unwrap_err() {
             Error::Io(_) => {}
@@ -249,7 +243,7 @@ mod tests {
     #[tokio::test]
     async fn should_upload_file_successfully() {
         let mocked_server = spawn_upload_server_mocked(200).await;
-        let result = upload_file(&mocked_server.url).await;
+        let result = upload_file(mocked_server.url).await;
         mocked_server.mocked_endpoint.assert();
         assert!(
             result.is_ok(),
@@ -260,8 +254,8 @@ mod tests {
         assert_eq!(response_body, "upload successful");
     }
 
-    async fn download_file(url: &str) -> Result<()> {
-        let file_path = concat!(env!("CARGO_MANIFEST_DIR"), "/test/test.txt");
+    async fn download_file(url: String) -> Result<()> {
+        let file_path = concat!(env!("CARGO_MANIFEST_DIR"), "/test/test.txt").to_string();
         let headers = HashMap::new();
         let sender: Channel<ProgressPayload> =
             Channel::new(|msg: InvokeResponseBody| -> tauri::Result<()> {
@@ -271,8 +265,8 @@ mod tests {
         download(url, file_path, headers, None, sender).await
     }
 
-    async fn upload_file(url: &str) -> Result<String> {
-        let file_path = concat!(env!("CARGO_MANIFEST_DIR"), "/test/test.txt");
+    async fn upload_file(url: String) -> Result<String> {
+        let file_path = concat!(env!("CARGO_MANIFEST_DIR"), "/test/test.txt").to_string();
         let headers = HashMap::new();
         let sender: Channel<ProgressPayload> =
             Channel::new(|msg: InvokeResponseBody| -> tauri::Result<()> {