zobally/RustDesk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: identical msg in flutter and sciter

Browse source
This commit is contained in:
Kingtous 2023-03-15 17:18:59 +08:00
parent 33ca87718b
commit 7a05910807
41 changed files with 71 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -301,6 +301,7 @@ message FileTransferDigest {
uint64 last_modified = 3;
uint64 file_size = 4;
bool is_upload = 5;
bool is_identical = 6;
}
message FileTransferBlock {

13
libs/hbb_common/src/fs.rs
View file

@ -821,20 +821,21 @@ pub fn is_write_need_confirmation(
if path.exists() && path.is_file() {
let metadata = std::fs::metadata(path)?;
let modified_time = metadata.modified()?;
// let remote_mt = Duration::from_secs(digest.last_modified);
let remote_mt = Duration::from_secs(digest.last_modified);
let local_mt = modified_time.duration_since(UNIX_EPOCH)?;
// [Note]
// We decide not to compare the file with peers,
// We decide to give the decision whether to override the existing file to users,
// which obey the behavior of the file manager in our system.
//
// if remote_mt == local_mt && digest.file_size == metadata.len() {
// return Ok(DigestCheckResult::IsSame);
// }
let mut is_identical = false;
if remote_mt == local_mt && digest.file_size == metadata.len() {
is_identical = true;
}
Ok(DigestCheckResult::NeedConfirm(FileTransferDigest {
id: digest.id,
file_num: digest.file_num,
last_modified: local_mt.as_secs(),
file_size: metadata.len(),
is_identical,
..Default::default()
}))
} else {