From 4c761eebff1d6842b9812553da2d03044a47f6f0 Mon Sep 17 00:00:00 2001 From: vorotamoroz Date: Tue, 18 Nov 2025 08:51:32 +0000 Subject: [PATCH] ### Fixed - Now fetching configuration from server can handle the empty remote correctly (reported on #756) by common-lib. - No longer asking to switch adapters during rebuilding. --- src/lib | 2 +- src/modules/core/ModuleRebuilder.ts | 43 +++++++++++++++-------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/lib b/src/lib index 86b0a95..9393ff1 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit 86b0a95d56e0410514264ab9d0b60d04c9165eb1 +Subproject commit 9393ff1e08baee4610f96e76f3f8658168d42bb3 diff --git a/src/modules/core/ModuleRebuilder.ts b/src/modules/core/ModuleRebuilder.ts index 5e59694..ffc998c 100644 --- a/src/modules/core/ModuleRebuilder.ts +++ b/src/modules/core/ModuleRebuilder.ts @@ -77,7 +77,7 @@ Please enable them from the settings screen after setup is complete.`, async rebuildEverything() { await this.services.setting.suspendExtraSync(); - await this.askUseNewAdapter(); + // await this.askUseNewAdapter(); this.core.settings.isConfigured = true; await this.services.setting.realiseSetting(); await this.resetLocalDatabase(); @@ -167,28 +167,29 @@ Please enable them from the settings screen after setup is complete.`, await this.services.replication.onBeforeReplicate(false); //TODO: Check actual need of this. await this.core.saveSettings(); } - async askUseNewAdapter() { - if (!this.core.settings.useIndexedDBAdapter) { - const message = `Now this core has been configured to use the old database adapter for keeping compatibility. Do you want to deactivate it?`; - const CHOICE_YES = "Yes, disable and use latest"; - const CHOICE_NO = "No, keep compatibility"; - const choices = [CHOICE_YES, CHOICE_NO]; - - const ret = await this.core.confirm.confirmWithMessage( - "Database adapter", - message, - choices, - CHOICE_YES, - 10 - ); - if (ret == CHOICE_YES) { - this.core.settings.useIndexedDBAdapter = true; - } - } - } + // No longer needed, both adapters have each advantages and disadvantages. + // async askUseNewAdapter() { + // if (!this.core.settings.useIndexedDBAdapter) { + // const message = `Now this core has been configured to use the old database adapter for keeping compatibility. Do you want to deactivate it?`; + // const CHOICE_YES = "Yes, disable and use latest"; + // const CHOICE_NO = "No, keep compatibility"; + // const choices = [CHOICE_YES, CHOICE_NO]; + // + // const ret = await this.core.confirm.confirmWithMessage( + // "Database adapter", + // message, + // choices, + // CHOICE_YES, + // 10 + // ); + // if (ret == CHOICE_YES) { + // this.core.settings.useIndexedDBAdapter = true; + // } + // } + // } async fetchLocal(makeLocalChunkBeforeSync?: boolean, preventMakeLocalFilesBeforeSync?: boolean) { await this.services.setting.suspendExtraSync(); - await this.askUseNewAdapter(); + // await this.askUseNewAdapter(); this.core.settings.isConfigured = true; await this.suspendReflectingDatabase(); await this.services.setting.realiseSetting();