From 26f5f54f244c9f56320319cc65b1544a336ac14d Mon Sep 17 00:00:00 2001 From: vorotamoroz Date: Thu, 4 Jun 2026 09:40:27 +0100 Subject: [PATCH 1/2] fixed: `Reset Syncronisation on This Device` for minio and P2P is now working properly. --- src/lib | 2 +- updates.md | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib b/src/lib index dfca398..62990f5 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit dfca398f8f88a532b01ee47e36207893f0f95374 +Subproject commit 62990f5a8f84542c3f360bcc4582d8ea343db4bd diff --git a/updates.md b/updates.md index ebb0451..9ce332c 100644 --- a/updates.md +++ b/updates.md @@ -3,6 +3,14 @@ Since 19th July, 2025 (beta1 in 0.25.0-beta1, 13th July, 2025) The head note of 0.25 is now in [updates_old.md](https://github.com/vrtmrz/obsidian-livesync/blob/main/updates_old.md). Because 0.25 got a lot of updates, thankfully, compatibility is kept and we do not need breaking changes! In other words, when get enough stabled. The next version will be v1.0.0. Even though it my hope. +## Unreleased + +4th June, 2026 + +### Fixed + +- `Reset Syncronisation on This Device` for minio and P2P is now working properly. + ## ~~0.25.71~~ 0.25.72 0.25.71 was cancelled due to the fixes needed (Object Storage related) From f8998d544190f0ee91a30d8e02886827c515b82d Mon Sep 17 00:00:00 2001 From: vorotamoroz Date: Thu, 4 Jun 2026 10:17:34 +0100 Subject: [PATCH 2/2] (fixed): No longer path corruption on windows environment (at least, pass the check) on CLI --- src/apps/cli/managers/CLIStorageEventManagerAdapter.ts | 4 ++-- .../cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/apps/cli/managers/CLIStorageEventManagerAdapter.ts b/src/apps/cli/managers/CLIStorageEventManagerAdapter.ts index c2f11e1..f6bc9e0 100644 --- a/src/apps/cli/managers/CLIStorageEventManagerAdapter.ts +++ b/src/apps/cli/managers/CLIStorageEventManagerAdapter.ts @@ -105,7 +105,7 @@ class CLIWatchAdapter implements IStorageEventWatchAdapter { private _toNodeFile(filePath: string, stats: Stats | undefined): NodeFile { return { - path: path.relative(this.basePath, filePath) as FilePath, + path: path.relative(this.basePath, filePath).replace(/\\/g, "/") as FilePath, stat: { ctime: stats?.ctimeMs ?? Date.now(), mtime: stats?.mtimeMs ?? Date.now(), @@ -117,7 +117,7 @@ class CLIWatchAdapter implements IStorageEventWatchAdapter { private _toNodeFolder(dirPath: string): NodeFolder { return { - path: path.relative(this.basePath, dirPath) as FilePath, + path: path.relative(this.basePath, dirPath).replace(/\\/g, "/") as FilePath, isFolder: true, }; } diff --git a/src/apps/cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts b/src/apps/cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts index f646b33..5af69a9 100644 --- a/src/apps/cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts +++ b/src/apps/cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts @@ -80,9 +80,7 @@ describe("CLIStorageEventManagerAdapter", () => { expect(handlers.onCreate).toHaveBeenCalledTimes(1); const created = (handlers.onCreate as ReturnType).mock.calls[0][0] as NodeFile; - if (process.platform !== "win32") { - expect(created.path).toBe("subdir/note.md"); - } + expect(created.path).toBe("subdir/note.md"); expect(created.stat?.size).toBe(42); });