0.24.0.dev-rc5

vrtmrz · Oct 21, 2024 · 6d244a6 · 6d244a6
1 parent e0e0ab0
commit 6d244a6
Show file tree

Hide file tree

Showing 9 changed files with 350 additions and 257 deletions.
diff --git a/manifest-beta.json b/manifest-beta.json
@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.24.0.dev-rc4",
+    "version": "0.24.0.dev-rc5",
     "minAppVersion": "0.9.12",
     "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "author": "vorotamoroz",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.24.0.dev-rc4",
+    "version": "0.24.0.dev-rc5",
     "description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "main": "main.js",
     "type": "module",

diff --git a/src/features/ConfigSync/CmdConfigSync.ts b/src/features/ConfigSync/CmdConfigSync.ts
diff --git a/src/features/HiddenFileSync/CmdHiddenFileSync.ts b/src/features/HiddenFileSync/CmdHiddenFileSync.ts
diff --git a/src/features/LiveSyncCommands.ts b/src/features/LiveSyncCommands.ts
@@ -1,5 +1,6 @@
+import { Logger } from "octagonal-wheels/common/logger";
 import { getPath } from "../common/utils.ts";
-import { type AnyEntry, type DocumentID, type EntryHasPath, type FilePath, type FilePathWithPrefix } from "../lib/src/common/types.ts";
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, type AnyEntry, type DocumentID, type EntryHasPath, type FilePath, type FilePathWithPrefix, type LOG_LEVEL } from "../lib/src/common/types.ts";
 import type ObsidianLiveSyncPlugin from "../main.ts";
 
 
@@ -40,4 +41,12 @@ export abstract class LiveSyncCommands {
     _isDatabaseReady() {
         return this.plugin._isDatabaseReady();
     }
+
+    _log = (msg: any, level: LOG_LEVEL = LOG_LEVEL_INFO, key?: string) => {
+        if (typeof msg === "string" && level !== LOG_LEVEL_NOTICE) {
+            msg = `[${this.constructor.name}]\u{200A} ${msg}`;
+        }
+        // console.log(msg);
+        Logger(msg, level, key);
+    };
 }
diff --git a/src/modules/features/ModuleObsidianSettingAsMarkdown.ts b/src/modules/features/ModuleObsidianSettingAsMarkdown.ts
@@ -162,6 +162,7 @@ export class ModuleObsidianSettingsAsMarkdown extends AbstractObsidianModule imp
         const saveData = { ...(settings ? settings : this.settings) } as Partial<ObsidianLiveSyncSettings>;
         delete saveData.encryptedCouchDBConnection;
         delete saveData.encryptedPassphrase;
+        delete saveData.additionalSuffixOfDatabaseName;
         if (!saveData.writeCredentialsForSettingSync && !keepCredential) {
             delete saveData.couchDB_USER;
             delete saveData.couchDB_PASSWORD;

diff --git a/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts b/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts
@@ -1727,6 +1727,17 @@ However, your report is needed to stabilise this. I appreciate you for your grea
                 const enableOnlyOnPluginSyncIsNotEnabled = enableOnly(() => this.isConfiguredAs("usePluginSync", false));
                 const visibleOnlyOnPluginSyncEnabled = visibleOnly(() => this.isConfiguredAs("usePluginSync", true));
 
+                this.createEl(paneEl, "div", {
+                    text: "Please set device name to identify this device. This name should be unique among your devices. While not configured, we cannot enable this feature.",
+                    cls: "op-warn"
+                }, c => {
+                }, visibleOnly(() => this.isConfiguredAs("deviceAndVaultName", "")));
+                this.createEl(paneEl, "div", {
+                    text: "We cannot change the device name while this feature is enabled. Please disable this feature to change the device name.",
+                    cls: "op-warn-info"
+                }, c => {
+                }, visibleOnly(() => this.isConfiguredAs("usePluginSync", true)));
+
                 new Setting(paneEl)
                     .autoWireText("deviceAndVaultName", {
                         placeHolder: "desktop", onUpdate: enableOnlyOnPluginSyncIsNotEnabled

diff --git a/updates.md b/updates.md
@@ -23,6 +23,19 @@ Thank you, and I hope your troubles will be resolved!
 
 ---
 
+## 0.24.0.dev-rc5
+
+### Improved
+
+-   A note relating to device names has been added to Customisation Sync on the setting dialogue.
+-   Logs of Hidden File Sync and Customisation Sync have been prefixed with the respective feature names.
+
+### Fixed
+
+-   Hidden file sync is now working correctly.
+-   Customisation Sync is now working correctly together with hidden file sync
+-   No longer database suffix is stored in the setting sharing markdown.
+
 ## 0.24.0.dev-rc4
 
 ### Improved