andras/reconcile
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Extract binary merging logic

Browse source
This commit is contained in:
Andras Schmelczer 2024-12-12 22:07:36 +00:00
parent 7a8cca8fe7
commit 10bc8c7099
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
9 changed files with 55 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

29
backend/sync_server/src/server/create_document.rs
View file

@ -9,7 +9,7 @@ use axum_extra::{
};
use schemars::JsonSchema;
use serde::Deserialize;
use sync_lib::{base64_to_bytes, base64_to_string};
use sync_lib::{base64_to_bytes, merge};
use super::{auth::auth, requests::CreateDocumentVersion};
use crate::{
@ -53,20 +53,17 @@ pub async fn create_document(
.map_err(server_error)?;
let new_version = if let Some(existing_version) = maybe_existing_version {
let merged_content = if request.is_binary {
base64_to_bytes(&request.content_base64)
.context("Failed to decode base64 content in request")
.map_err(client_error)?
} else {
reconcile::reconcile(
"", // the empty string is the first common parent of the two documents
&existing_version.content_as_string(),
&base64_to_string(&request.content_base64)
.context("Failed to decode base64 content in request")
.map_err(client_error)?,
)
.into_bytes()
};
let content_bytes = base64_to_bytes(&request.content_base64)
.context("Failed to decode base64 content in request")
.map_err(client_error)?;
let merged_content = merge(
&[], // the empty string is the first common parent of the two documents,
&existing_version.content,
&content_bytes,
)
.context("Failed to decode bytes as UTF-8")
.map_err(client_error)?;
StoredDocumentVersion {
vault_id,
@ -76,7 +73,6 @@ pub async fn create_document(
created_date: request.created_date,
relative_path: request.relative_path,
updated_date: chrono::Utc::now(),
is_binary: request.is_binary,
is_deleted: false,
}
} else {
@ -90,7 +86,6 @@ pub async fn create_document(
created_date: request.created_date,
relative_path: request.relative_path,
updated_date: chrono::Utc::now(),
is_binary: request.is_binary,
is_deleted: false,
}
};

1
backend/sync_server/src/server/delete_document.rs
View file

@ -63,7 +63,6 @@ pub async fn delete_document(
created_date: request.created_date,
updated_date: chrono::Utc::now(),
relative_path: latest_version.relative_path,
is_binary: latest_version.is_binary,
is_deleted: true,
};

2
backend/sync_server/src/server/ping.rs
View file

@ -4,7 +4,7 @@ use axum_extra::{
TypedHeader,
};
use super::auth::{self, auth};
use super::auth::auth;
use crate::{app_state::AppState, database::models::PingResponse, errors::SyncServerError};
#[axum::debug_handler]

2
backend/sync_server/src/server/requests.rs
View file

@ -10,7 +10,6 @@ pub struct CreateDocumentVersion {
pub created_date: DateTime<Utc>,
pub relative_path: String,
pub content_base64: String,
pub is_binary: bool,
}
#[derive(Debug, Deserialize, JsonSchema)]
@ -20,7 +19,6 @@ pub struct UpdateDocumentVersion {
pub created_date: DateTime<Utc>,
pub relative_path: String,
pub content_base64: String,
pub is_binary: bool,
}
#[derive(Debug, Deserialize, JsonSchema)]

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

@ -9,7 +9,7 @@ use axum_extra::{
};
use schemars::JsonSchema;
use serde::Deserialize;
use sync_lib::{base64_to_bytes, base64_to_string};
use sync_lib::{base64_to_bytes, merge};
use super::{auth::auth, requests::UpdateDocumentVersion};
use crate::{
@ -76,20 +76,13 @@ pub async fn update_document(
)));
}
let merged_content = if request.is_binary {
base64_to_bytes(&request.content_base64)
.context("Failed to decode base64 content in request")
.map_err(client_error)?
} else {
reconcile::reconcile(
&parent.content_as_string(),
&latest_version.content_as_string(),
&base64_to_string(&request.content_base64)
.context("Failed to decode base64 content in request")
.map_err(client_error)?,
)
.into_bytes()
};
let content_bytes = base64_to_bytes(&request.content_base64)
.context("Failed to decode base64 content in request")
.map_err(client_error)?;
let merged_content = merge(&parent.content, &latest_version.content, &content_bytes)
.context("Failed to decode bytes as UTF-8")
.map_err(client_error)?;
let new_version = StoredDocumentVersion {
vault_id,
@ -99,7 +92,6 @@ pub async fn update_document(
created_date: request.created_date,
relative_path: request.relative_path,
updated_date: chrono::Utc::now(),
is_binary: request.is_binary,
is_deleted: false,
};