Refactor (write notes later)

2026-05-07 00:01:51 +00:00 · 2026-02-12 08:56:30 +00:00
parent 787627a156
commit 1b5ca9e52c
25 changed files with 204 additions and 234 deletions
--- a/src/modules/AbstractModule.ts
+++ b/src/modules/AbstractModule.ts
@@ -1,7 +1,8 @@
 import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "octagonal-wheels/common/logger";
-import type { LOG_LEVEL } from "../lib/src/common/types";
-import type { LiveSyncCore } from "../main";
-import { __$checkInstanceBinding } from "../lib/src/dev/checks";
+import type { AnyEntry, FilePathWithPrefix, LOG_LEVEL } from "@lib/common/types";
+import type { LiveSyncCore } from "@/main";
+import { __$checkInstanceBinding } from "@lib/dev/checks";
+import { stripAllPrefixes } from "@lib/string_and_binary/path";

 export abstract class AbstractModule {
    _log = (msg: any, level: LOG_LEVEL = LOG_LEVEL_INFO, key?: string) => {
@@ -22,6 +23,14 @@ export abstract class AbstractModule {
        this.core.settings = value;
    }

+    getPath(entry: AnyEntry): FilePathWithPrefix {
+        return this.services.path.getPath(entry);
+    }
+
+    getPathWithoutPrefix(entry: AnyEntry): FilePathWithPrefix {
+        return stripAllPrefixes(this.services.path.getPath(entry));
+    }
+
    onBindFunction(core: LiveSyncCore, services: typeof core.services) {
        // Override if needed.
    }
--- a/src/modules/core/ModuleFileHandler.ts
+++ b/src/modules/core/ModuleFileHandler.ts
@@ -10,14 +10,7 @@ import type {
    UXInternalFileInfoStub,
 } from "../../lib/src/common/types";
 import { AbstractModule } from "../AbstractModule.ts";
-import {
-    compareFileFreshness,
-    EVEN,
-    getPath,
-    getPathWithoutPrefix,
-    getStoragePathFromUXFileInfo,
-    markChangesAreSame,
-} from "../../common/utils";
+import { compareFileFreshness, EVEN, getStoragePathFromUXFileInfo, markChangesAreSame } from "../../common/utils";
 import { getDocDataAsArray, isDocContentSame, readAsBlob, readContent } from "../../lib/src/common/utils";
 import { shouldBeIgnored } from "../../lib/src/string_and_binary/path";
 import { Semaphore } from "octagonal-wheels/concurrency/semaphore";
@@ -209,13 +202,13 @@ export class ModuleFileHandler extends AbstractModule {
    ): Promise<boolean> {
        const file = typeof info === "string" ? this.storage.getFileStub(info) : info;
        const mode = file == null ? "create" : "modify";
-        const pathFromEntryInfo = typeof entryInfo === "string" ? entryInfo : getPath(entryInfo);
+        const pathFromEntryInfo = typeof entryInfo === "string" ? entryInfo : this.getPath(entryInfo);
        const docEntry = await this.db.fetchEntryMeta(pathFromEntryInfo, undefined, true);
        if (!docEntry) {
            this._log(`File ${pathFromEntryInfo} is not exist on the database`, LOG_LEVEL_VERBOSE);
            return false;
        }
-        const path = getPath(docEntry);
+        const path = this.getPath(docEntry);

        // 1. Check if it already conflicted.
        const revs = await this.db.getConflictedRevs(path);
@@ -364,11 +357,11 @@ export class ModuleFileHandler extends AbstractModule {
                this._log(`File ${entry.path} should be ignored`, LOG_LEVEL_VERBOSE);
                return false;
            }
-            const path = getPath(entry);
+            const path = this.getPath(entry);

-            const targetFile = this.storage.getStub(getPathWithoutPrefix(entry));
+            const targetFile = this.storage.getStub(this.getPathWithoutPrefix(entry));
            if (targetFile && targetFile.isFolder) {
-                this._log(`${getPath(entry)} is already exist as the folder`);
+                this._log(`${path} is already exist as the folder`);
                // Nothing to do and other modules should also nothing to do.
                return true;
            } else {
--- a/src/modules/core/ModuleLocalDatabaseObsidian.ts
+++ b/src/modules/core/ModuleLocalDatabaseObsidian.ts
@@ -22,9 +22,9 @@ export class ModuleLocalDatabaseObsidian extends AbstractModule {
                return getDB();
            },
            getActiveReplicator: () => this.core.replicator,
-            id2path: this.services.path.id2path,
+            id2path: this.services.path.id2path.bind(this.services.path),
            // path2id: this.core.$$path2id.bind(this.core),
-            path2id: this.services.path.path2id,
+            path2id: this.services.path.path2id.bind(this.services.path),
            get settings() {
                return getSettings();
            },
--- a/src/modules/core/ModuleTargetFilter.ts
+++ b/src/modules/core/ModuleTargetFilter.ts
@@ -1,22 +1,12 @@
 import { LRUCache } from "octagonal-wheels/memory/LRUCache";
-import {
-    getStoragePathFromUXFileInfo,
-    id2path,
-    isInternalMetadata,
-    path2id,
-    stripInternalMetadataPrefix,
-    useMemo,
-} from "../../common/utils";
+import { getStoragePathFromUXFileInfo, useMemo } from "../../common/utils";
 import {
    LOG_LEVEL_VERBOSE,
-    type DocumentID,
-    type EntryHasPath,
-    type FilePath,
    type FilePathWithPrefix,
    type ObsidianLiveSyncSettings,
    type UXFileInfoStub,
 } from "../../lib/src/common/types";
-import { addPrefix, isAcceptedAll } from "../../lib/src/string_and_binary/path";
+import { isAcceptedAll } from "../../lib/src/string_and_binary/path";
 import { AbstractModule } from "../AbstractModule";
 import { EVENT_REQUEST_RELOAD_SETTING_TAB, EVENT_SETTING_SAVED, eventHub } from "../../common/events";
 import { isDirty } from "../../lib/src/common/utils";
@@ -36,23 +26,6 @@ export class ModuleTargetFilter extends AbstractModule {
        return Promise.resolve(true);
    }

-    _id2path(id: DocumentID, entry?: EntryHasPath, stripPrefix?: boolean): FilePathWithPrefix {
-        const tempId = id2path(id, entry);
-        if (stripPrefix && isInternalMetadata(tempId)) {
-            const out = stripInternalMetadataPrefix(tempId);
-            return out;
-        }
-        return tempId;
-    }
-    async _path2id(filename: FilePathWithPrefix | FilePath, prefix?: string): Promise<DocumentID> {
-        const destPath = addPrefix(filename, prefix ?? "");
-        return await path2id(
-            destPath,
-            this.settings.usePathObfuscation ? this.settings.passphrase : "",
-            !this.settings.handleFilenameCaseSensitive
-        );
-    }
-
    _markFileListPossiblyChanged(): void {
        this.totalFileEventCount++;
    }
@@ -166,8 +139,6 @@ export class ModuleTargetFilter extends AbstractModule {

    onBindFunction(core: LiveSyncCore, services: typeof core.services): void {
        services.vault.markFileListPossiblyChanged.setHandler(this._markFileListPossiblyChanged.bind(this));
-        services.path.id2path.setHandler(this._id2path.bind(this));
-        services.path.path2id.setHandler(this._path2id.bind(this));
        services.appLifecycle.onLoaded.addHandler(this._everyOnload.bind(this));
        services.vault.isIgnoredByIgnoreFile.setHandler(this._isIgnoredByIgnoreFiles.bind(this));
        services.vault.isTargetFile.setHandler(this._isTargetFile.bind(this));
--- a/src/modules/core/ReplicateResultProcessor.ts
+++ b/src/modules/core/ReplicateResultProcessor.ts
@@ -8,7 +8,7 @@ import {
    type MetaEntry,
 } from "@/lib/src/common/types";
 import type { ModuleReplicator } from "./ModuleReplicator";
-import { getPath, isChunk, isValidPath } from "@/common/utils";
+import { isChunk, isValidPath } from "@/common/utils";
 import type { LiveSyncCore } from "@/main";
 import {
    LOG_LEVEL_DEBUG,
@@ -58,6 +58,10 @@ export class ReplicateResultProcessor {
        return this.replicator.core;
    }

+    getPath(entry: AnyEntry): string {
+        return this.services.path.getPath(entry);
+    }
+
    public suspend() {
        this._suspended = true;
    }
@@ -230,7 +234,7 @@ export class ReplicateResultProcessor {
     */
    protected enqueueChange(doc: PouchDB.Core.ExistingDocument<EntryDoc>) {
        const old = this._queuedChanges.find((e) => e._id == doc._id);
-        const path = "path" in doc ? getPath(doc) : "<unknown>";
+        const path = "path" in doc ? this.getPath(doc) : "<unknown>";
        const docNote = `${path} (${shortenId(doc._id)}, ${shortenRev(doc._rev)})`;
        if (old) {
            if (old._rev == doc._rev) {
@@ -322,7 +326,7 @@ export class ReplicateResultProcessor {
                const docMtime = change.mtime ?? 0;
                const maxMTime = this.replicator.settings.maxMTimeForReflectEvents;
                if (maxMTime > 0 && docMtime > maxMTime) {
-                    const docPath = getPath(change);
+                    const docPath = this.getPath(change);
                    this.log(
                        `Processing ${docPath} has been skipped due to modification time (${new Date(
                            docMtime * 1000
@@ -336,7 +340,7 @@ export class ReplicateResultProcessor {
            if (await this.services.replication.processVirtualDocument(change)) return;
            // If the document is version info, check compatibility and return.
            if (isAnyNote(change)) {
-                const docPath = getPath(change);
+                const docPath = this.getPath(change);
                if (!(await this.services.vault.isTargetFile(docPath))) {
                    this.log(`Skipped: ${docPath}`, LOG_LEVEL_VERBOSE);
                    return;
@@ -383,7 +387,7 @@ export class ReplicateResultProcessor {
    // This function is serialized per document to avoid race-condition for the same document.
    private _applyToDatabase(doc_: PouchDB.Core.ExistingDocument<AnyEntry>) {
        const dbDoc = doc_ as LoadedEntry; // It has no `data`
-        const path = getPath(dbDoc);
+        const path = this.getPath(dbDoc);
        return serialized(`replication-process:${dbDoc._id}`, async () => {
            const docNote = `${path} (${shortenId(dbDoc._id)}, ${shortenRev(dbDoc._rev)})`;
            const isRequired = await this.checkIsChangeRequiredForDatabaseProcessing(dbDoc);
@@ -409,7 +413,7 @@ export class ReplicateResultProcessor {
            if (await this.services.replication.processOptionalSynchroniseResult(dbDoc)) {
                // Already processed
                this.log(`Processed by other processor: ${docNote}`, LOG_LEVEL_DEBUG);
-            } else if (isValidPath(getPath(doc))) {
+            } else if (isValidPath(this.getPath(doc))) {
                // Apply to storage if the path is valid
                await this.applyToStorage(doc as MetaEntry);
                this.log(`Processed: ${docNote}`, LOG_LEVEL_DEBUG);
@@ -437,7 +441,7 @@ export class ReplicateResultProcessor {
     * @returns True if processing is required; false otherwise
     */
    protected async checkIsChangeRequiredForDatabaseProcessing(dbDoc: LoadedEntry): Promise<boolean> {
-        const path = getPath(dbDoc);
+        const path = this.getPath(dbDoc);
        try {
            const savedDoc = await this.localDatabase.getRaw<LoadedEntry>(dbDoc._id, {
                conflicts: true,
--- a/src/modules/essential/ModuleInitializerFile.ts
+++ b/src/modules/essential/ModuleInitializerFile.ts
@@ -1,7 +1,7 @@
 import { unique } from "octagonal-wheels/collection";
 import { throttle } from "octagonal-wheels/function";
 import { EVENT_ON_UNRESOLVED_ERROR, eventHub } from "../../common/events.ts";
-import { BASE_IS_NEW, compareFileFreshness, EVEN, getPath, isValidPath, TARGET_IS_NEW } from "../../common/utils.ts";
+import { BASE_IS_NEW, compareFileFreshness, EVEN, isValidPath, TARGET_IS_NEW } from "../../common/utils.ts";
 import {
    type FilePathWithPrefixLC,
    type FilePathWithPrefix,
@@ -120,7 +120,7 @@ export class ModuleInitializerFile extends AbstractModule {
                    showingNotice ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO,
                    "syncAll"
                );
-            const path = getPath(doc);
+            const path = this.getPath(doc);

            if (isValidPath(path) && (await this.services.vault.isTargetFile(path, true))) {
                if (!isMetaEntry(doc)) {
@@ -132,7 +132,7 @@ export class ModuleInitializerFile extends AbstractModule {
        }

        const databaseFileNameMap = Object.fromEntries(
-            _DBEntries.map((e) => [getPath(e), e] as [FilePathWithPrefix, MetaEntry])
+            _DBEntries.map((e) => [this.getPath(e), e] as [FilePathWithPrefix, MetaEntry])
        );
        const databaseFileNames = Object.keys(databaseFileNameMap) as FilePathWithPrefix[];
        const databaseFileNameCapsPair = databaseFileNames.map(
@@ -224,7 +224,7 @@ export class ModuleInitializerFile extends AbstractModule {
            runAll("UPDATE STORAGE", filesExistOnlyInDatabase, async (e) => {
                const w = databaseFileNameMap[databaseFileNameCI2CS[e]];
                // Exists in database but not in storage.
-                const path = getPath(w) ?? e;
+                const path = this.getPath(w) ?? e;
                if (w && !(w.deleted || w._deleted)) {
                    if (!this.services.vault.isFileSizeTooLarge(w.size)) {
                        // Prevent applying the conflicted state to the storage.
@@ -275,7 +275,7 @@ export class ModuleInitializerFile extends AbstractModule {
                    await this.syncFileBetweenDBandStorage(file, doc);
                } else {
                    this._log(
-                        `SYNC DATABASE AND STORAGE: ${getPath(doc)} has been skipped due to file size exceeding the limit`,
+                        `SYNC DATABASE AND STORAGE: ${this.getPath(doc)} has been skipped due to file size exceeding the limit`,
                        logLevel
                    );
                }
@@ -365,7 +365,7 @@ export class ModuleInitializerFile extends AbstractModule {
            if (isAnyNote(doc)) {
                if (doc.deleted && doc.mtime - limit < 0) {
                    notes.push({
-                        path: getPath(doc),
+                        path: this.getPath(doc),
                        mtime: doc.mtime,
                        ttl: (doc.mtime - limit) / 1000 / 86400,
                        doc: doc,
--- a/src/modules/essential/ModuleMigration.ts
+++ b/src/modules/essential/ModuleMigration.ts
@@ -10,7 +10,7 @@ import {
 import { AbstractModule } from "../AbstractModule.ts";
 import { $msg } from "src/lib/src/common/i18n.ts";
 import { performDoctorConsultation, RebuildOptions } from "../../lib/src/common/configForDoc.ts";
-import { getPath, isValidPath } from "../../common/utils.ts";
+import { isValidPath } from "../../common/utils.ts";
 import { isMetaEntry } from "../../lib/src/common/types.ts";
 import { isDeletedEntry, isDocContentSame, isLoadedEntry, readAsBlob } from "../../lib/src/common/utils.ts";
 import { countCompromisedChunks } from "../../lib/src/pouchdb/negotiation.ts";
@@ -128,7 +128,7 @@ export class ModuleMigration extends AbstractModule {

        const errorFiles = [] as ErrorInfo[];
        for await (const metaDoc of this.localDatabase.findAllNormalDocs({ conflicts: true })) {
-            const path = getPath(metaDoc);
+            const path = this.getPath(metaDoc);

            if (!isValidPath(path)) {
                continue;
--- a/src/modules/features/GlobalHistory/GlobalHistory.svelte
+++ b/src/modules/features/GlobalHistory/GlobalHistory.svelte
@@ -6,7 +6,6 @@
    import { diff_match_patch } from "../../../deps.ts";
    import { DocumentHistoryModal } from "../DocumentHistory/DocumentHistoryModal.ts";
    import { isPlainText, stripAllPrefixes } from "../../../lib/src/string_and_binary/path.ts";
-    import { getPath } from "../../../common/utils.ts";
    export let plugin: ObsidianLiveSyncPlugin;

    let showDiffInfo = false;
@@ -44,6 +43,9 @@
    };
    let history = [] as HistoryData[];
    let loading = false;
+    function getPath(entry: AnyEntry): FilePathWithPrefix {
+        return plugin.services.path.getPath(entry);
+    }

    async function fetchChanges(): Promise<HistoryData[]> {
        try {
@@ -219,69 +221,69 @@
    {/if}
    <table>
        <tbody>
-        <tr>
-            <th> Date </th>
-            <th> Path </th>
-            <th> Rev </th>
-            <th> Stat </th>
-            {#if showChunkCorrected}
-                <th> Chunks </th>
-            {/if}
-        </tr>
-        <tr>
-            <td colspan="5" class="more">
-                {#if loading}
-                        <div class=""></div>
-                {:else}
-                    <div><button on:click={() => nextWeek()}>+1 week</button></div>
-                {/if}
-            </td>
-        </tr>
-        {#each history as entry}
            <tr>
-                <td class="mtime">
-                    {entry.mtimeDisp}
+                <th> Date </th>
+                <th> Path </th>
+                <th> Rev </th>
+                <th> Stat </th>
+                {#if showChunkCorrected}
+                    <th> Chunks </th>
+                {/if}
+            </tr>
+            <tr>
+                <td colspan="5" class="more">
+                    {#if loading}
+                        <div class=""></div>
+                    {:else}
+                        <div><button on:click={() => nextWeek()}>+1 week</button></div>
+                    {/if}
                </td>
-                <td class="path">
-                    <div class="filenames">
-                        <span class="path">/{entry.dirname.split("/").join(`/`)}</span>
-                        <!-- svelte-ignore a11y-click-events-have-key-events -->
-                        <!-- svelte-ignore a11y-no-static-element-interactions -->
-                        <!-- svelte-ignore a11y-missing-attribute -->
-                        <span class="filename"><a on:click={() => openFile(entry.path)}>{entry.filename}</a></span>
-                    </div>
-                </td>
-                <td>
-                    <span class="rev">
-                        {#if entry.isPlain}
+            </tr>
+            {#each history as entry}
+                <tr>
+                    <td class="mtime">
+                        {entry.mtimeDisp}
+                    </td>
+                    <td class="path">
+                        <div class="filenames">
+                            <span class="path">/{entry.dirname.split("/").join(`/`)}</span>
                            <!-- svelte-ignore a11y-click-events-have-key-events -->
                            <!-- svelte-ignore a11y-no-static-element-interactions -->
                            <!-- svelte-ignore a11y-missing-attribute -->
-                            <a on:click={() => showHistory(entry.path, entry?.rev || "")}>{entry.rev}</a>
-                        {:else}
-                            {entry.rev}
-                        {/if}
-                    </span>
-                </td>
-                <td>
-                    {entry.changes}
-                </td>
-                {#if showChunkCorrected}
-                    <td>
-                        {entry.chunks}
+                            <span class="filename"><a on:click={() => openFile(entry.path)}>{entry.filename}</a></span>
+                        </div>
                    </td>
-                {/if}
-            </tr>
-        {/each}
-        <tr>
-            <td colspan="5" class="more">
-                {#if loading}
+                    <td>
+                        <span class="rev">
+                            {#if entry.isPlain}
+                                <!-- svelte-ignore a11y-click-events-have-key-events -->
+                                <!-- svelte-ignore a11y-no-static-element-interactions -->
+                                <!-- svelte-ignore a11y-missing-attribute -->
+                                <a on:click={() => showHistory(entry.path, entry?.rev || "")}>{entry.rev}</a>
+                            {:else}
+                                {entry.rev}
+                            {/if}
+                        </span>
+                    </td>
+                    <td>
+                        {entry.changes}
+                    </td>
+                    {#if showChunkCorrected}
+                        <td>
+                            {entry.chunks}
+                        </td>
+                    {/if}
+                </tr>
+            {/each}
+            <tr>
+                <td colspan="5" class="more">
+                    {#if loading}
                        <div class=""></div>
-                {:else}
-                    <div><button on:click={() => prevWeek()}>+1 week</button></div>
-                {/if}
-            </td>
-        </tr>
+                    {:else}
+                        <div><button on:click={() => prevWeek()}>+1 week</button></div>
+                    {/if}
+                </td>
+            </tr>
        </tbody>
    </table>
 </div>
--- a/src/modules/features/ModuleInteractiveConflictResolver.ts
+++ b/src/modules/features/ModuleInteractiveConflictResolver.ts
@@ -11,7 +11,7 @@ import {
 } from "../../lib/src/common/types.ts";
 import { ConflictResolveModal } from "./InteractiveConflictResolving/ConflictResolveModal.ts";
 import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
-import { displayRev, getPath, getPathWithoutPrefix } from "../../common/utils.ts";
+import { displayRev } from "../../common/utils.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
 import { serialized } from "octagonal-wheels/concurrency/lock";
 import type { LiveSyncCore } from "../../main.ts";
@@ -110,7 +110,12 @@ export class ModuleInteractiveConflictResolver extends AbstractObsidianModule {
        const notes: { id: DocumentID; path: FilePathWithPrefix; dispPath: string; mtime: number }[] = [];
        for await (const doc of this.localDatabase.findAllDocs({ conflicts: true })) {
            if (!("_conflicts" in doc)) continue;
-            notes.push({ id: doc._id, path: getPath(doc), dispPath: getPathWithoutPrefix(doc), mtime: doc.mtime });
+            notes.push({
+                id: doc._id,
+                path: this.getPath(doc),
+                dispPath: this.getPathWithoutPrefix(doc),
+                mtime: doc.mtime,
+            });
        }
        notes.sort((a, b) => b.mtime - a.mtime);
        const notesList = notes.map((e) => e.dispPath);
@@ -134,7 +139,7 @@ export class ModuleInteractiveConflictResolver extends AbstractObsidianModule {
        try {
            for await (const doc of this.localDatabase.findAllDocs({ conflicts: true })) {
                if (!("_conflicts" in doc)) continue;
-                notes.push({ path: getPath(doc), mtime: doc.mtime });
+                notes.push({ path: this.getPath(doc), mtime: doc.mtime });
            }
            if (notes.length > 0) {
                this.core.confirm.askInPopup(
--- a/src/modules/features/ModuleObsidianDocumentHistory.ts
+++ b/src/modules/features/ModuleObsidianDocumentHistory.ts
@@ -4,7 +4,6 @@ import { EVENT_REQUEST_SHOW_HISTORY } from "../../common/obsidianEvents.ts";
 import type { FilePathWithPrefix, LoadedEntry, DocumentID } from "../../lib/src/common/types.ts";
 import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
 import { DocumentHistoryModal } from "./DocumentHistory/DocumentHistoryModal.ts";
-import { getPath } from "../../common/utils.ts";
 import { fireAndForget } from "octagonal-wheels/promises";

 export class ModuleObsidianDocumentHistory extends AbstractObsidianModule {
@@ -41,7 +40,7 @@ export class ModuleObsidianDocumentHistory extends AbstractObsidianModule {
    async fileHistory() {
        const notes: { id: DocumentID; path: FilePathWithPrefix; dispPath: string; mtime: number }[] = [];
        for await (const doc of this.localDatabase.findAllDocs()) {
-            notes.push({ id: doc._id, path: getPath(doc), dispPath: getPath(doc), mtime: doc.mtime });
+            notes.push({ id: doc._id, path: this.getPath(doc), dispPath: this.getPath(doc), mtime: doc.mtime });
        }
        notes.sort((a, b) => b.mtime - a.mtime);
        const notesList = notes.map((e) => e.dispPath);
--- a/src/modules/features/SettingDialogue/PaneHatch.ts
+++ b/src/modules/features/SettingDialogue/PaneHatch.ts
@@ -21,7 +21,7 @@ import {
 } from "../../../lib/src/common/utils.ts";
 import { Logger } from "../../../lib/src/common/logger.ts";
 import { isCloudantURI } from "../../../lib/src/pouchdb/utils_couchdb.ts";
-import { getPath, requestToCouchDBWithCredentials } from "../../../common/utils.ts";
+import { requestToCouchDBWithCredentials } from "../../../common/utils.ts";
 import { addPrefix, shouldBeIgnored, stripAllPrefixes } from "../../../lib/src/string_and_binary/path.ts";
 import { $msg } from "../../../lib/src/common/i18n.ts";
 import { Semaphore } from "octagonal-wheels/concurrency/semaphore";
@@ -388,7 +388,7 @@ ${stringifyYaml({

                        const adn = this.plugin.localDatabase.findAllDocs();
                        for await (const i of adn) {
-                            const path = getPath(i);
+                            const path = this.services.path.getPath(i);
                            if (path.startsWith(ICXHeader)) continue;
                            if (path.startsWith(PSCHeader)) continue;
                            if (!this.plugin.settings.syncInternalFiles && path.startsWith(ICHeader)) continue;
--- a/src/modules/main/ModuleLiveSyncMain.ts
+++ b/src/modules/main/ModuleLiveSyncMain.ts
@@ -16,7 +16,7 @@ import { AbstractModule } from "../AbstractModule.ts";
 import { EVENT_PLATFORM_UNLOADED } from "@lib/events/coreEvents";
 import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub.ts";
 import type { LiveSyncCore } from "../../main.ts";
-import { initialiseWorkerModule } from "@/lib/src/worker/bgWorker.ts";
+import { initialiseWorkerModule } from "@lib/worker/bgWorker.ts";

 export class ModuleLiveSyncMain extends AbstractModule {
    async _onLiveSyncReady() {
--- a/src/modules/services/ObsidianPathService.ts
+++ b/src/modules/services/ObsidianPathService.ts
@@ -0,0 +1,8 @@
+import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
+import { normalizePath } from "@/deps";
+import { PathService } from "@/lib/src/services/base/PathService";
+export class ObsidianPathService extends PathService<ObsidianServiceContext> {
+    protected normalizePath(path: string): string {
+        return normalizePath(path);
+    }
+}
--- a/src/modules/services/ObsidianServiceHub.ts
+++ b/src/modules/services/ObsidianServiceHub.ts
@@ -15,9 +15,9 @@ import {
    ObsidianTweakValueService,
    ObsidianTestService,
    ObsidianDatabaseEventService,
-    ObsidianPathService,
    ObsidianConfigService,
 } from "./ObsidianServices";
+import { ObsidianPathService } from "./ObsidianPathService";
 import { ObsidianVaultService } from "./ObsidianVaultService";
 import { ObsidianUIService } from "./ObsidianUIService";

@@ -42,7 +42,9 @@ export class ObsidianServiceHub extends InjectableServiceHub<ObsidianServiceCont
        });
        const test = new ObsidianTestService(context);
        const databaseEvents = new ObsidianDatabaseEventService(context);
-        const path = new ObsidianPathService(context);
+        const path = new ObsidianPathService(context, {
+            settingService: setting,
+        });
        const config = new ObsidianConfigService(context, vault);
        const ui = new ObsidianUIService(context, {
            appLifecycle,
--- a/src/modules/services/ObsidianServices.ts
+++ b/src/modules/services/ObsidianServices.ts
@@ -4,7 +4,6 @@ import { InjectableConflictService } from "@lib/services/implements/injectable/I
 import { InjectableDatabaseEventService } from "@lib/services/implements/injectable/InjectableDatabaseEventService";
 import { InjectableDatabaseService } from "@lib/services/implements/injectable/InjectableDatabaseService";
 import { InjectableFileProcessingService } from "@lib/services/implements/injectable/InjectableFileProcessingService";
-import { InjectablePathService } from "@lib/services/implements/injectable/InjectablePathService";
 import { InjectableRemoteService } from "@lib/services/implements/injectable/InjectableRemoteService";
 import { InjectableReplicationService } from "@lib/services/implements/injectable/InjectableReplicationService";
 import { InjectableReplicatorService } from "@lib/services/implements/injectable/InjectableReplicatorService";
@@ -107,7 +106,6 @@ export class ObsidianAPIService extends InjectableAPIService<ObsidianServiceCont
        return this.context.plugin.registerObsidianProtocolHandler(action, handler);
    }
 }
-export class ObsidianPathService extends InjectablePathService<ObsidianServiceContext> {}
 export class ObsidianDatabaseService extends InjectableDatabaseService<ObsidianServiceContext> {
    openSimpleStore = handlers<IDatabaseService>().binder("openSimpleStore") as (<T>(
        kind: string
--- a/src/modules/services/ObsidianUIService.ts
+++ b/src/modules/services/ObsidianUIService.ts
@@ -5,7 +5,7 @@ import { UIService } from "@lib/services//implements/base/UIService";
 import { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/ObsidianServiceContext";
 import { ObsidianSvelteDialogManager } from "./SvelteDialogObsidian";
 import { ObsidianConfirm } from "./ObsidianConfirm";
-
+import DialogToCopy from "@/lib/src/UI/dialogues/DialogueToCopy.svelte";
 export type ObsidianUIServiceDependencies<T extends ObsidianServiceContext = ObsidianServiceContext> = {
    appLifecycle: AppLifecycleService<T>;
    config: ConfigService<T>;
@@ -13,6 +13,9 @@ export type ObsidianUIServiceDependencies<T extends ObsidianServiceContext = Obs
 };

 export class ObsidianUIService extends UIService<ObsidianServiceContext> {
+    override get dialogToCopy() {
+        return DialogToCopy;
+    }
    constructor(context: ObsidianServiceContext, dependents: ObsidianUIServiceDependencies<ObsidianServiceContext>) {
        const obsidianConfirm = new ObsidianConfirm(context);
        const obsidianSvelteDialogManager = new ObsidianSvelteDialogManager<ObsidianServiceContext>(context, {
--- a/src/modules/services/SvelteDialogObsidian.ts
+++ b/src/modules/services/SvelteDialogObsidian.ts
@@ -7,8 +7,8 @@ import {
    type SvelteDialogManagerDependencies,
 } from "@lib/services/implements/base/SvelteDialog";
 import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
-
-export const SvelteDialogBase = SvelteDialogMixIn(Modal);
+import DialogHost from "@/lib/src/UI/DialogHost.svelte";
+export const SvelteDialogBase = SvelteDialogMixIn(Modal, DialogHost);
 export class SvelteDialogObsidian<
    T,
    U,