From 2f8bc4fef297e09f06060c7e47c4064dad1c50d3 Mon Sep 17 00:00:00 2001 From: vorotamoroz Date: Wed, 11 Mar 2026 14:44:37 +0100 Subject: [PATCH] - Now `useOfflineScanner`, `useCheckRemoteSize`, and `useRedFlagFeatures` are set from `main.ts`, instead of `LiveSyncBaseCore`. --- src/LiveSyncBaseCore.ts | 11 +++-------- src/lib | 2 +- src/main.ts | 6 ++++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/LiveSyncBaseCore.ts b/src/LiveSyncBaseCore.ts index 1f822bd..87eb268 100644 --- a/src/LiveSyncBaseCore.ts +++ b/src/LiveSyncBaseCore.ts @@ -12,8 +12,6 @@ import type { LiveSyncCouchDBReplicatorEnv } from "./lib/src/replication/couchdb import type { CheckPointInfo } from "./lib/src/replication/journal/JournalSyncTypes"; import type { LiveSyncJournalReplicatorEnv } from "./lib/src/replication/journal/LiveSyncJournalReplicatorEnv"; import type { LiveSyncReplicatorEnv } from "./lib/src/replication/LiveSyncAbstractReplicator"; -import { useCheckRemoteSize } from "./lib/src/serviceFeatures/checkRemoteSize"; -import { useOfflineScanner } from "./lib/src/serviceFeatures/offlineScanner"; import { useTargetFilters } from "./lib/src/serviceFeatures/targetFilter"; import type { ServiceContext } from "./lib/src/services/base/ServiceBase"; import type { InjectableServiceHub } from "./lib/src/services/InjectableServices"; @@ -27,8 +25,8 @@ import { ModuleConflictResolver } from "./modules/coreFeatures/ModuleConflictRes import { ModuleResolvingMismatchedTweaks } from "./modules/coreFeatures/ModuleResolveMismatchedTweaks"; import { ModuleLiveSyncMain } from "./modules/main/ModuleLiveSyncMain"; import type { ServiceModules } from "./lib/src/interfaces/ServiceModule"; -import { useRedFlagFeatures } from "./serviceFeatures/redFlag"; import { ModuleBasicMenu } from "./modules/essential/ModuleBasicMenu"; +import { usePrepareDatabaseForUse } from "./lib/src/serviceFeatures/prepareDatabaseForUse"; export class LiveSyncBaseCore< T extends ServiceContext = ServiceContext, @@ -271,12 +269,9 @@ export class LiveSyncBaseCore< * (Please refer `serviceFeatures` for more details) */ initialiseServiceFeatures() { - useRedFlagFeatures(this); - useOfflineScanner(this); - - // enable target filter feature. useTargetFilters(this); - useCheckRemoteSize(this); + // enable target filter feature. + usePrepareDatabaseForUse(this); } } diff --git a/src/lib b/src/lib index 7989f57..83e2704 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit 7989f57e06c6858e3a99ebde02ec71d6a7811dbf +Subproject commit 83e2704c818c9563c4649ce3d9c13ed11a774d37 diff --git a/src/main.ts b/src/main.ts index 807ec55..bef08a0 100644 --- a/src/main.ts +++ b/src/main.ts @@ -34,6 +34,9 @@ import { ModuleObsidianSettingsAsMarkdown } from "./modules/features/ModuleObsid import { SetupManager } from "./modules/features/SetupManager.ts"; import { ModuleMigration } from "./modules/essential/ModuleMigration.ts"; import { enableI18nFeature } from "./serviceFeatures/onLayoutReady/enablei18n.ts"; +import { useOfflineScanner } from "./lib/src/serviceFeatures/offlineScanner.ts"; +import { useCheckRemoteSize } from "./lib/src/serviceFeatures/checkRemoteSize.ts"; +import { useRedFlagFeatures } from "./serviceFeatures/redFlag.ts"; export type LiveSyncCore = LiveSyncBaseCore; export default class ObsidianLiveSyncPlugin extends Plugin { core: LiveSyncCore; @@ -167,6 +170,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin { const featuresInitialiser = enableI18nFeature; const curriedFeature = () => featuresInitialiser(core); core.services.appLifecycle.onLayoutReady.addHandler(curriedFeature); + useOfflineScanner(core); + useRedFlagFeatures(core); + useCheckRemoteSize(core); } ); }