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

Clean up

Browse source
This commit is contained in:
Andras Schmelczer 2025-11-29 11:02:27 +00:00
commit 4456767ec4
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/sync-client/src/file-operations/file-operations.ts
View file

@ -251,8 +251,7 @@ export class FileOperations {
: ""; : "";
let stem = extension ? nameParts.slice(0, -1).join(".") : fileName; let stem = extension ? nameParts.slice(0, -1).join(".") : fileName;
let currentCount = Number.parseInt( let currentCount = Number.parseInt(
FileOperations.PARENTHESES_REGEX.exec(stem)?.groups?.["count"] ?? FileOperations.PARENTHESES_REGEX.exec(stem)?.groups?.count ?? "0"
"0"
); );
stem = stem.replace(FileOperations.PARENTHESES_REGEX, ""); stem = stem.replace(FileOperations.PARENTHESES_REGEX, "");

6
sync-server/src/utils/find_first_available_path.rs
View file

@ -8,17 +8,15 @@ pub async fn find_first_available_path(
database: &crate::app_state::database::Database, database: &crate::app_state::database::Database,
transaction: &mut Transaction<'_>, transaction: &mut Transaction<'_>,
) -> Result<String> { ) -> Result<String> {
let mut new_relative_path = String::default();
for candidate in dedup_paths(sanitized_relative_path) { for candidate in dedup_paths(sanitized_relative_path) {
if database if database
.get_latest_document_by_path(vault_id, &candidate, Some(transaction)) .get_latest_document_by_path(vault_id, &candidate, Some(transaction))
.await? .await?
.is_none() .is_none()
{ {
new_relative_path = candidate; return Ok(candidate);
break;
} }
} }
Ok(new_relative_path) unreachable!("dedup_paths produces infinite paths");
} }