diff --git a/src/lib b/src/lib index f21001f..6b6e87f 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit f21001fcb2b933016a298d41566f1f64f16ae85d +Subproject commit 6b6e87f3e5a07561ff72af703dce2059d4645c6b diff --git a/src/modules/essential/ModuleMigration.ts b/src/modules/essential/ModuleMigration.ts index e39cf58..1cd0655 100644 --- a/src/modules/essential/ModuleMigration.ts +++ b/src/modules/essential/ModuleMigration.ts @@ -209,8 +209,8 @@ export class ModuleMigration extends AbstractModule implements ICoreModule { const messageUnrecoverable = unrecoverable.length > 0 ? $msg("moduleMigration.fix0256.messageUnrecoverable", { - filesNotRecoverable: unrecoverable.map((e) => `- ${fileInfo(e)}`).join("\n"), - }) + filesNotRecoverable: unrecoverable.map((e) => `- ${fileInfo(e)}`).join("\n"), + }) : ""; const message = $msg("moduleMigration.fix0256.message", { diff --git a/src/modules/features/ModuleObsidianSetting.ts b/src/modules/features/ModuleObsidianSetting.ts index d9da466..bba7a8d 100644 --- a/src/modules/features/ModuleObsidianSetting.ts +++ b/src/modules/features/ModuleObsidianSetting.ts @@ -140,6 +140,7 @@ export class ModuleObsidianSettings extends AbstractObsidianModule implements IO jwtSub: settings.jwtSub, useRequestAPI: settings.useRequestAPI, bucketPrefix: settings.bucketPrefix, + forcePathStyle: settings.forcePathStyle, }; settings.encryptedCouchDBConnection = await this.encryptConfigurationItem( JSON.stringify(connectionSetting), diff --git a/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts b/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts index aaaa76b..6aed752 100644 --- a/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts +++ b/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts @@ -859,26 +859,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab { } getMinioJournalSyncClient() { - const id = this.plugin.settings.accessKey; - const key = this.plugin.settings.secretKey; - const bucket = this.plugin.settings.bucket; - const prefix = this.plugin.settings.bucketPrefix; - const region = this.plugin.settings.region; - const endpoint = this.plugin.settings.endpoint; - const useCustomRequestHandler = this.plugin.settings.useCustomRequestHandler; - const customHeaders = this.plugin.settings.bucketCustomHeaders; - return new JournalSyncMinio( - id, - key, - endpoint, - bucket, - prefix, - this.plugin.simpleStore, - this.plugin, - useCustomRequestHandler, - region, - customHeaders - ); + return new JournalSyncMinio(this.plugin.settings, this.plugin.simpleStore, this.plugin); } async resetRemoteBucket() { const minioJournal = this.getMinioJournalSyncClient(); diff --git a/src/modules/features/SettingDialogue/PaneRemoteConfig.ts b/src/modules/features/SettingDialogue/PaneRemoteConfig.ts index a4b2266..1332ad2 100644 --- a/src/modules/features/SettingDialogue/PaneRemoteConfig.ts +++ b/src/modules/features/SettingDialogue/PaneRemoteConfig.ts @@ -320,6 +320,7 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal syncWarnMinio.addClass("op-warn-info"); new Setting(paneEl).autoWireText("endpoint", { holdValue: true }); + new Setting(paneEl).autoWireToggle("forcePathStyle", { holdValue: true }); new Setting(paneEl).autoWireText("accessKey", { holdValue: true }); new Setting(paneEl).autoWireText("secretKey", {