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

Merge based on file type

Browse source
This commit is contained in:
Andras Schmelczer 2025-01-11 10:53:05 +00:00
parent 47a34ed7e2
commit a9227fa5bb
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
4 changed files with 60 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backend/sync_server/src/server/update_document.rs
View file

@ -10,7 +10,7 @@ use chrono::{DateTime, Utc};
use log::info;
use schemars::JsonSchema;
use serde::Deserialize;
use sync_lib::{base64_to_bytes, merge};
use sync_lib::{base64_to_bytes, is_file_type_mergable, merge};
use super::{
app_state::AppState,
@ -155,7 +155,12 @@ async fn internal_update_document(
)));
}
let merged_content = merge(&parent_document.content, &latest_version.content, &content);
let merged_content = if is_file_type_mergable(&sanitized_relative_path) {
merge(&parent_document.content, &latest_version.content, &content)
} else {
content.clone()
};
let is_different_from_request_content = merged_content != content;
// We can only update the relative path if we're the first one to do so