mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-07-23 13:02:58 +00:00
Merge branch 'main' into fix_926
This commit is contained in:
@@ -105,7 +105,7 @@ class CLIWatchAdapter implements IStorageEventWatchAdapter {
|
|||||||
|
|
||||||
private _toNodeFile(filePath: string, stats: Stats | undefined): NodeFile {
|
private _toNodeFile(filePath: string, stats: Stats | undefined): NodeFile {
|
||||||
return {
|
return {
|
||||||
path: path.relative(this.basePath, filePath) as FilePath,
|
path: path.relative(this.basePath, filePath).replace(/\\/g, "/") as FilePath,
|
||||||
stat: {
|
stat: {
|
||||||
ctime: stats?.ctimeMs ?? Date.now(),
|
ctime: stats?.ctimeMs ?? Date.now(),
|
||||||
mtime: stats?.mtimeMs ?? Date.now(),
|
mtime: stats?.mtimeMs ?? Date.now(),
|
||||||
@@ -117,7 +117,7 @@ class CLIWatchAdapter implements IStorageEventWatchAdapter {
|
|||||||
|
|
||||||
private _toNodeFolder(dirPath: string): NodeFolder {
|
private _toNodeFolder(dirPath: string): NodeFolder {
|
||||||
return {
|
return {
|
||||||
path: path.relative(this.basePath, dirPath) as FilePath,
|
path: path.relative(this.basePath, dirPath).replace(/\\/g, "/") as FilePath,
|
||||||
isFolder: true,
|
isFolder: true,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,9 +80,7 @@ describe("CLIStorageEventManagerAdapter", () => {
|
|||||||
|
|
||||||
expect(handlers.onCreate).toHaveBeenCalledTimes(1);
|
expect(handlers.onCreate).toHaveBeenCalledTimes(1);
|
||||||
const created = (handlers.onCreate as ReturnType<typeof vi.fn>).mock.calls[0][0] as NodeFile;
|
const created = (handlers.onCreate as ReturnType<typeof vi.fn>).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);
|
expect(created.stat?.size).toBe(42);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+1
-1
Submodule src/lib updated: dfca398f8f...62990f5a8f
@@ -5,9 +5,12 @@ The head note of 0.25 is now in [updates_old.md](https://github.com/vrtmrz/obsid
|
|||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
|
4th June, 2026
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Adjust CouchDB's database name checking to its specification (#926).
|
- Adjust CouchDB's database name checking to its specification (#926).
|
||||||
|
- `Reset Syncronisation on This Device` for minio and P2P is now working properly.
|
||||||
|
|
||||||
## ~~0.25.71~~ 0.25.72
|
## ~~0.25.71~~ 0.25.72
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user