fixed build

src-tauri/Cargo.toml

@@ -6,7 +6,7 @@ authors = ["Ningyuan Li"]
 license = "Apache-2.0"
 repository = "https://github.com/webosbrew/dev-manager-desktop"
 edition = "2021"
-rust-version = "1.76.0"
+rust-version = "1.80.1"
 links = "devman"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src-tauri/capabilities/app.json

@@ -5,10 +5,10 @@
     "main"
   ],
   "permissions": [
-    "event:default",
-    "webview:default",
-    "path:default",
-    "path:allow-resolve-directory",
+    "core:event:default",
+    "core:webview:default",
+    "core:path:default",
+    "core:path:allow-resolve-directory",
     "fs:default",
     "shell:allow-open",
     "dialog:allow-open",

src-tauri/src/event_channel/channel.rs

@@ -1,9 +1,11 @@
-use crate::event_channel::{EventChannel, EventHandler};
-use serde::Serialize;
 use std::sync::{Arc, Mutex};
-use tauri::{AppHandle, Manager, Runtime};
+
+use serde::Serialize;
+use tauri::{AppHandle, Emitter, Listener, Runtime};
 use uuid::Uuid;
 
+use crate::event_channel::{EventChannel, EventHandler};
+
 impl<R, H> EventChannel<R, H>
 where
     R: Runtime,

src-tauri/src/plugins/file.rs

@@ -6,18 +6,18 @@ use std::path::Path;
 use flate2::read::GzDecoder;
 use libssh_rs::OpenFlags;
 use serde::Serialize;
-use tauri::ipc::Channel;
-use tauri::plugin::{Builder, TauriPlugin};
 use tauri::{AppHandle, Manager, Runtime};
+use tauri::ipc::{Channel, IpcResponse};
+use tauri::plugin::{Builder, TauriPlugin};
 use uuid::Uuid;
 
 use crate::device_manager::Device;
 use crate::error::Error;
-use crate::remote_files::serve;
 use crate::remote_files::{FileItem, PermInfo};
+use crate::remote_files::serve;
 use crate::session_manager::SessionManager;
 
-#[derive(Clone, Serialize)]
+#[derive(Copy, Clone, Serialize)]
 struct CopyProgress {
     copied: usize,
     total: usize,
@@ -91,8 +91,11 @@ async fn write<R: Runtime>(
         let sessions = app.state::<SessionManager>();
         return Ok(sessions.with_session(device, |session| {
             let sftp = session.sftp()?;
-            let mut file =
-                sftp.open(&path,  OpenFlags::WRITE_ONLY | OpenFlags::CREATE | OpenFlags::TRUNCATE, 0o644)?;
+            let mut file = sftp.open(
+                &path,
+                OpenFlags::WRITE_ONLY | OpenFlags::CREATE | OpenFlags::TRUNCATE,
+                0o644,
+            )?;
             file.write_all(&content)?;
             return Ok(());
         })?);
@@ -107,7 +110,7 @@ async fn get<R: Runtime>(
     device: Device,
     path: String,
     target: String,
-    on_progress: Channel,
+    on_progress: Channel<CopyProgress>,
 ) -> Result<(), Error> {
     return tokio::task::spawn_blocking(move || {
         let sessions = app.state::<SessionManager>();
@@ -131,15 +134,19 @@ async fn put<R: Runtime>(
     device: Device,
     path: String,
     source: String,
-    on_progress: Channel,
+    on_progress: Channel<CopyProgress>,
 ) -> Result<(), Error> {
     return tokio::task::spawn_blocking(move || {
         let sessions = app.state::<SessionManager>();
         let on_progress = on_progress.clone();
         return sessions.with_session(device, move |session| {
             let sftp = session.sftp()?;
             let mut sfile = sftp
-                .open(&path, OpenFlags::WRITE_ONLY | OpenFlags::CREATE | OpenFlags::TRUNCATE, 0o644)
+                .open(
+                    &path,
+                    OpenFlags::WRITE_ONLY | OpenFlags::CREATE | OpenFlags::TRUNCATE,
+                    0o644,
+                )
                 .map_err(|e| {
                     let e: Error = e.into();
                     return match e {
@@ -175,7 +182,7 @@ fn copy<R: ?Sized, W: ?Sized>(
     reader: &mut R,
     writer: &mut W,
     total: usize,
-    progress: &Channel,
+    progress: &Channel<CopyProgress>,
 ) -> std::io::Result<usize>
 where
     R: Read,
@@ -208,7 +215,7 @@ async fn get_temp<R: Runtime>(
     app: AppHandle<R>,
     device: Device,
     path: String,
-    on_progress: Channel,
+    on_progress: Channel<CopyProgress>,
 ) -> Result<String, Error> {
     let source = Path::new(&path);
     let extension = source

src-tauri/src/plugins/shell.rs

@@ -1,5 +1,5 @@
 use tauri::plugin::{Builder, TauriPlugin};
-use tauri::{AppHandle, Manager, Runtime, State};
+use tauri::{AppHandle, Emitter, Manager, Runtime, State};
 
 use crate::device_manager::Device;
 use crate::error::Error;
@@ -102,8 +102,6 @@ impl<R: Runtime> ShellCallback for PluginShellCb<R> {
                 .emit("shell-removed", self.token.clone())
                 .unwrap_or(());
         }
-        self.app
-            .emit("shells-updated", shells.list())
-            .unwrap_or(());
+        self.app.emit("shells-updated", shells.list()).unwrap_or(());
     }
 }