mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-04-01 22:55:16 +00:00
c79dc30cba
### Fixed
- No longer conflicted files are handled in the boot-up process. No more unexpected overwriting.
- It ignores `Always overwrite with a newer file`, and always be prevented for the safety. Please pick it manually or open the file.
- Some log messages on conflict resolution has been corrected.
- Automatic merge notifications, displayed on the grounds of `same`, have been degraded to logs.
### Improved
- Now we can fetch the remote database with keeping local files completely intact.
- In new option, all files are stored into the local database before the fetching, and will be merged automatically or detected as conflicts.
- The dialogue presenting options when performing `Fetch` are now more informative.
### Refactored
- Some class methods have been fixed its arguments to be more consistent.
- Types have been defined for some conditional results.
13 lines
494 B
TypeScript
13 lines
494 B
TypeScript
export interface Rebuilder {
|
|
$performRebuildDB(
|
|
method: "localOnly" | "remoteOnly" | "rebuildBothByThisDevice" | "localOnlyWithChunks"
|
|
): Promise<void>;
|
|
$rebuildRemote(): Promise<void>;
|
|
$rebuildEverything(): Promise<void>;
|
|
$fetchLocal(makeLocalChunkBeforeSync?: boolean, preventMakeLocalFilesBeforeSync?: boolean): Promise<void>;
|
|
|
|
scheduleRebuild(): Promise<void>;
|
|
scheduleFetch(): Promise<void>;
|
|
resolveAllConflictedFilesByNewerOnes(): Promise<void>;
|
|
}
|