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

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 +8 -5
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1bb1ca99dd - Show all commits

Delete shouldn't move

Prev Next
Andras Schmelczer 2026-04-01 21:45:45 +01:00
commit 1bb1ca99dd

13
sync-server/src/server/delete_document.rs
View file

@ -1,4 +1,4 @@
use anyhow::{Context, anyhow}; use anyhow::Context;
use axum::{ use axum::{
Extension, Json, Extension, Json,
extract::{Path, State}, extract::{Path, State},
@ -16,8 +16,8 @@ use crate::{
}, },
}, },
config::user_config::User, config::user_config::User,
errors::{SyncServerError, client_error, not_found_error, server_error, write_transaction_error}, errors::{SyncServerError, server_error, write_transaction_error},
utils::{normalize::normalize, sanitize_path::sanitize_path}, utils::normalize::normalize,
}; };
#[derive(Deserialize)] #[derive(Deserialize)]
@ -72,12 +72,15 @@ pub async fn delete_document(
return Ok(Json(latest_version.clone().into())); return Ok(Json(latest_version.clone().into()));
} }
let latest_content = latest_version.map_or_else(Vec::new, |version| version.content); // in case the document has never existed before deleting it let (latest_relative_path, latest_content) = latest_version.map_or_else(
|| (String::new(), Vec::new()),
|version| (version.relative_path, version.content),
);
let new_version = StoredDocumentVersion { let new_version = StoredDocumentVersion {
vault_update_id: last_update_id + 1, vault_update_id: last_update_id + 1,
document_id, document_id,
relative_path: sanitize_path(&request.relative_path).map_err(client_error)?, relative_path: latest_relative_path,
content: latest_content, // copy the content from the latest version content: latest_content, // copy the content from the latest version
updated_date: chrono::Utc::now(), updated_date: chrono::Utc::now(),
is_deleted: true, is_deleted: true,