From 617eaae7554dc3ca7ac1d68d2e12ba1b26c6b5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E5=9D=97=E5=90=9B?= Date: Fri, 7 Feb 2025 15:24:30 +0800 Subject: [PATCH 1/2] Fix #77 --- src/src/tabs/main.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/src/tabs/main.js b/src/src/tabs/main.js index 864f58b..3336cbb 100644 --- a/src/src/tabs/main.js +++ b/src/src/tabs/main.js @@ -132,13 +132,16 @@ export default }, }; return Ext.apply(t, e), t; - }, _getRrConfig: function () { + }, _getRrConfig: async function () { const rrConfigJson = localStorage.getItem('rrConfig'); - return JSON.parse(rrConfigJson); + if (rrConfigJson) { + return JSON.parse(rrConfigJson); + } + return await self.getConf(); }, - __checkDownloadFolder: function (callback) { + __checkDownloadFolder: async function (callback) { var self = this; - const rrConfig = this._getRrConfig(); + const rrConfig = await this._getRrConfig(); const config = rrConfig.rr_manager_config; self.apiProvider.getSharesList().then(x => { var shareName = `/${config['SHARE_NAME']}`; @@ -285,7 +288,7 @@ export default var isModernDSM = systemInfo.version_string.includes("7.2.2"); self.apiProvider.setIsModernDSM(isModernDSM); - self.__checkDownloadFolder(self.__checkRequiredTasks.bind(self)); + await self.__checkDownloadFolder(self.__checkRequiredTasks.bind(self)); if (systemInfo && packages) { self.rrCheckVersion = rrCheckVersion; //TODO: implement localization From 7a98a3927e1768fb17690cd4512f6a60b0e741b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E5=9D=97=E5=90=9B?= Date: Fri, 7 Feb 2025 15:28:14 +0800 Subject: [PATCH 2/2] Fix build fail --- src/src/tabs/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/tabs/setting.js b/src/src/tabs/setting.js index ec5ef96..02cc0d3 100644 --- a/src/src/tabs/setting.js +++ b/src/src/tabs/setting.js @@ -132,7 +132,7 @@ export default var rrConfigJson = localStorage.getItem("rrConfig"); var rrConfigOrig = JSON.parse(rrConfigJson); var rrManagerConfigJson = localStorage.getItem("rrConfig"); - var rrManagerConfigOrig = JSON.parse(rrManagerConfigJson);\ + var rrManagerConfigOrig = JSON.parse(rrManagerConfigJson); rrConfigOrig.user_config = user_config; localStorage.setItem("rrConfig", JSON.stringify(rrConfigOrig));