Refactor (write notes later)

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>

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(

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);

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;