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

add: file_num offset

Browse Source
This commit is contained in:
Kingtous
2022-05-13 11:23:30 +08:00
parent 9dbd94daac
commit a2bc2a21bb
8 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hbb_common/protos/message.proto
View File

@@ -294,6 +294,7 @@ message FileTransferSendRequest {
int32 id = 1;
string path = 2;
bool include_hidden = 3;
int32 file_num = 4;
}
message FileTransferSendConfirmRequest {
@@ -322,6 +323,7 @@ message FileTransferReceiveRequest {
int32 id = 1;
string path = 2; // path written to
repeated FileEntry files = 3;
int32 file_num = 4;
}
message FileRemoveDir {

10
libs/hbb_common/src/fs.rs
View File

@@ -270,6 +270,7 @@ impl TransferJob {
id: i32,
remote: String,
path: String,
file_num: i32,
show_hidden: bool,
is_remote: bool,
files: Vec<FileEntry>,
@@ -281,6 +282,7 @@ impl TransferJob {
id,
remote,
path: get_path(&path),
file_num,
show_hidden,
is_remote,
files,
@@ -294,6 +296,7 @@ impl TransferJob {
id: i32,
remote: String,
path: String,
file_num: i32,
show_hidden: bool,
is_remote: bool,
include_hidden: bool,
@@ -306,6 +309,7 @@ impl TransferJob {
id,
remote,
path: get_path(&path),
file_num,
show_hidden,
is_remote,
files,
@@ -645,12 +649,13 @@ pub fn new_send_confirm(r: FileTransferSendConfirmRequest) -> Message {
}
#[inline]
pub fn new_receive(id: i32, path: String, files: Vec<FileEntry>) -> Message {
pub fn new_receive(id: i32, path: String, file_num: i32, files: Vec<FileEntry>) -> Message {
let mut action = FileAction::new();
action.set_receive(FileTransferReceiveRequest {
id,
path,
files: files.into(),
file_num,
..Default::default()
});
let mut msg_out = Message::new();
@@ -659,13 +664,14 @@ pub fn new_receive(id: i32, path: String, files: Vec<FileEntry>) -> Message {
}
#[inline]
pub fn new_send(id: i32, path: String, include_hidden: bool) -> Message {
pub fn new_send(id: i32, path: String, file_num: i32, include_hidden: bool) -> Message {
log::info!("new send: {},id : {}", path, id);
let mut action = FileAction::new();
action.set_send(FileTransferSendRequest {
id,
path,
include_hidden,
file_num,
..Default::default()
});
let mut msg_out = Message::new();