andras/vault-link
andras/vault-link
1
0
Fork 0
Code Issues Pull requests 19 Projects Releases 55 Packages Wiki Activity Actions 29

asch/fix-everything #188

Open
andras wants to merge 114 commits from asch/fix-everything into main
pull from: asch/fix-everything
merge into: andras:main
Conversation 0 Commits 114 Files changed 135 +21 -10
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 03b5c223d6 - Show all commits

Reconcile outside of async

Prev Next
Andras Schmelczer 2026-04-01 21:46:00 +01:00
commit 03b5c223d6

31
sync-server/src/server/update_document.rs
View file

@ -237,16 +237,27 @@ pub async fn update_document(
let new_text = str::from_utf8(&content)
.context("New content is not valid UTF-8")
.map_err(client_error)?;
let merged = reconcile(
parent_text,
&latest_text.into(),
&new_text.into(),
&*BuiltinTokenizer::Word,
)
.apply()
.text()
.into_bytes();
let is_different = merged != content;
let parent_owned = parent_text.to_owned();
let latest_owned = latest_text.to_owned();
let new_owned = new_text.to_owned();
let content_clone = content.clone();
let (merged, is_different) = tokio::task::spawn_blocking(move || {
let merged = reconcile(
&parent_owned,
&latest_owned.into(),
&new_owned.into(),
&*BuiltinTokenizer::Word,
)
.apply()
.text()
.into_bytes();
let is_different = merged != content_clone;
(merged, is_different)
})
.await
.map_err(|e| server_error(anyhow::anyhow!("Reconcile task failed: {e}")))?;
(merged, is_different)
} else {
(content, false) // false means that the client doesn't need to refetch the file as we can ensure the remote and local versions are the same as LWW is the merging method for binary files