mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-03-29 05:05:17 +00:00
### Fixed - The description of `Enable Developers' Debug Tools.` has been refined. - Automatic conflict checking and resolution has been improved. - Resolving conflicts dialogue will not be shown for the multiple files at once.
77 lines
3.1 KiB
TypeScript
77 lines
3.1 KiB
TypeScript
import { AbstractModule } from "../AbstractModule.ts";
|
|
import { LOG_LEVEL_NOTICE, type FilePathWithPrefix } from "../../lib/src/common/types";
|
|
import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
|
|
import { sendValue } from "octagonal-wheels/messagepassing/signal";
|
|
import type { ICoreModule } from "../ModuleTypes.ts";
|
|
|
|
export class ModuleConflictChecker extends AbstractModule implements ICoreModule {
|
|
async $$queueConflictCheckIfOpen(file: FilePathWithPrefix): Promise<void> {
|
|
const path = file;
|
|
if (this.settings.checkConflictOnlyOnOpen) {
|
|
const af = this.core.$$getActiveFilePath();
|
|
if (af && af != path) {
|
|
this._log(`${file} is conflicted, merging process has been postponed.`, LOG_LEVEL_NOTICE);
|
|
return;
|
|
}
|
|
}
|
|
await this.core.$$queueConflictCheck(path);
|
|
}
|
|
|
|
async $$queueConflictCheck(file: FilePathWithPrefix): Promise<void> {
|
|
const optionalConflictResult = await this.core.$anyGetOptionalConflictCheckMethod(file);
|
|
if (optionalConflictResult == true) {
|
|
// The conflict has been resolved by another process.
|
|
return;
|
|
} else if (optionalConflictResult === "newer") {
|
|
// The conflict should be resolved by the newer entry.
|
|
await this.core.$anyResolveConflictByNewest(file);
|
|
} else {
|
|
this.conflictCheckQueue.enqueue(file);
|
|
}
|
|
}
|
|
|
|
$$waitForAllConflictProcessed(): Promise<boolean> {
|
|
return this.conflictResolveQueue.waitForAllProcessed();
|
|
}
|
|
|
|
// TODO-> Move to ModuleConflictResolver?
|
|
conflictResolveQueue = new QueueProcessor(
|
|
async (filenames: FilePathWithPrefix[]) => {
|
|
const filename = filenames[0];
|
|
return await this.core.$$resolveConflict(filename);
|
|
},
|
|
{
|
|
suspended: false,
|
|
batchSize: 1,
|
|
// No need to limit concurrency to `1` here, subsequent process will handle it,
|
|
// And, some cases, we do not need to synchronised. (e.g., auto-merge available).
|
|
// Therefore, limiting global concurrency is performed on resolver with the UI.
|
|
concurrentLimit: 10,
|
|
delay: 0,
|
|
keepResultUntilDownstreamConnected: false,
|
|
}
|
|
).replaceEnqueueProcessor((queue, newEntity) => {
|
|
const filename = newEntity;
|
|
sendValue("cancel-resolve-conflict:" + filename, true);
|
|
const newQueue = [...queue].filter((e) => e != newEntity);
|
|
return [...newQueue, newEntity];
|
|
});
|
|
|
|
conflictCheckQueue = // First process - Check is the file actually need resolve -
|
|
new QueueProcessor(
|
|
(files: FilePathWithPrefix[]) => {
|
|
const filename = files[0];
|
|
return Promise.resolve([filename]);
|
|
},
|
|
{
|
|
suspended: false,
|
|
batchSize: 1,
|
|
concurrentLimit: 10,
|
|
delay: 0,
|
|
keepResultUntilDownstreamConnected: true,
|
|
pipeTo: this.conflictResolveQueue,
|
|
totalRemainingReactiveSource: this.core.conflictProcessQueueCount,
|
|
}
|
|
);
|
|
}
|