weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: adjust windows file layout

Browse Source 
Signed-off-by: cailue <cailue@bupt.edu.cn>
This commit is contained in:
cailue
2023-08-24 22:34:12 +08:00
parent 422062b432
commit c25d648321
12 changed files with 1309 additions and 1184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/io_loop.rs
View File

@@ -6,7 +6,7 @@ use std::sync::{
};
#[cfg(windows)]
use clipboard::{cliprdr::CliprdrClientContext, empty_clipboard, ContextSend};
use clipboard::ContextSend;
use crossbeam_queue::ArrayQueue;
use hbb_common::config::{PeerConfig, TransferSerde};
use hbb_common::fs::{
@@ -27,7 +27,7 @@ use hbb_common::tokio::{
sync::mpsc,
time::{self, Duration, Instant, Interval},
};
use hbb_common::{allow_err, fs, get_time, log, message_proto::*, Stream};
use hbb_common::{allow_err, fs, get_time, log, message_proto::*, ResultType, Stream};
use scrap::CodecFormat;
use crate::client::{
@@ -281,9 +281,9 @@ impl<T: InvokeUiSession> Remote<T> {
#[cfg(windows)]
{
let conn_id = self.client_conn_id;
ContextSend::proc(|context: &mut Box<CliprdrClientContext>| -> u32 {
empty_clipboard(context, conn_id);
0
let _ = ContextSend::proc(|context| -> ResultType<()> {
context.empty_clipboard(conn_id);
Ok(())
});
}
}
@@ -1578,8 +1578,10 @@ impl<T: InvokeUiSession> Remote<T> {
"Process clipboard message from server peer, stop: {}, is_stopping_allowed: {}, file_transfer_enabled: {}",
stop, is_stopping_allowed, file_transfer_enabled);
if !stop {
ContextSend::proc(|context: &mut Box<CliprdrClientContext>| -> u32 {
clipboard::server_clip_file(context, self.client_conn_id, clip)
let _ = ContextSend::proc(|context| -> ResultType<()> {
context
.server_clip_file(self.client_conn_id, clip)
.map_err(|e| e.into())
});
}
}

14
src/ui_cm_interface.rs
View File

@@ -16,7 +16,7 @@ use crate::ipc::Connection;
#[cfg(not(any(target_os = "ios")))]
use crate::ipc::{self, Data};
#[cfg(windows)]
use clipboard::{cliprdr::CliprdrClientContext, empty_clipboard, ContextSend};
use clipboard::ContextSend;
#[cfg(not(any(target_os = "android", target_os = "ios")))]
use hbb_common::tokio::sync::mpsc::unbounded_channel;
#[cfg(windows)]
@@ -34,6 +34,7 @@ use hbb_common::{
sync::mpsc::{self, UnboundedSender},
task::spawn_blocking,
},
ResultType,
};
use serde_derive::Serialize;
@@ -175,9 +176,9 @@ impl<T: InvokeUiCM> ConnectionManager<T> {
#[cfg(windows)]
{
ContextSend::proc(|context: &mut Box<CliprdrClientContext>| -> u32 {
empty_clipboard(context, id);
0
let _ = ContextSend::proc(|context| -> ResultType<()> {
context.empty_clipboard(id);
Ok(())
});
}
@@ -414,8 +415,9 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
ContextSend::set_is_stopped();
} else {
let conn_id = self.conn_id;
ContextSend::proc(|context: &mut Box<CliprdrClientContext>| -> u32 {
clipboard::server_clip_file(context, conn_id, _clip)
let _ = ContextSend::proc(|context| -> ResultType<()> {
context.server_clip_file(conn_id, _clip)
.map_err(|e| e.into())
});
}
}