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

Merge master

Browse Source
This commit is contained in:
csf
2022-08-04 17:24:02 +08:00
parent 07debe8363
commit 3ff2f60fb7
27 changed files with 1015 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,7 @@ message LoginRequest {
}
bool video_ack_required = 9;
uint64 session_id = 10;
string version = 11;
}
message ChatMessage { string text = 1; }

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

@@ -276,7 +276,7 @@ impl TransferJob {
show_hidden: bool,
is_remote: bool,
files: Vec<FileEntry>,
enable_override_detection: bool,
enable_overwrite_detection: bool,
) -> Self {
log::info!("new write {}", path);
let total_size = files.iter().map(|x| x.size as u64).sum();
@@ -289,7 +289,7 @@ impl TransferJob {
is_remote,
files,
total_size,
enable_overwrite_detection: enable_override_detection,
enable_overwrite_detection,
..Default::default()
}
}
@@ -301,7 +301,7 @@ impl TransferJob {
file_num: i32,
show_hidden: bool,
is_remote: bool,
enable_override_detection: bool,
enable_overwrite_detection: bool,
) -> ResultType<Self> {
log::info!("new read {}", path);
let files = get_recursive_files(&path, show_hidden)?;
@@ -315,7 +315,7 @@ impl TransferJob {
is_remote,
files,
total_size,
enable_overwrite_detection: enable_override_detection,
enable_overwrite_detection,
..Default::default()
})
}