From ae7e0cbca981db6a4b790954d4c4720d05d79450 Mon Sep 17 00:00:00 2001 From: UKDTOM Date: Sat, 3 Oct 2020 12:31:50 +0200 Subject: [PATCH] HotFix for AutoUpdate --- src/components/modules/General/wtutils.js | 30 ------------------- .../modules/Main/GlobalSettings.vue | 8 ++--- src/components/modules/Main/Home.vue | 5 ++-- 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/src/components/modules/General/wtutils.js b/src/components/modules/General/wtutils.js index bf1c76e..a19581a 100644 --- a/src/components/modules/General/wtutils.js +++ b/src/components/modules/General/wtutils.js @@ -315,36 +315,6 @@ const github = new class GitHub { const releases = await response.json(); return releases; } - - // Is an update present? - async UpdatePresentDEAD(){ - // Get release page from GitHub - const releases = await this.Releases(); - // Walk releases - // eslint-disable-next-line no-unused-vars - let release = {} - for(var i = 0; i < releases.length; i++) - { - // Check for current release on GitHub - if (wtconfig.get('Update.Beta') == releases[i].prerelease){ - release = releases[i]; - if ('v' + wtutils.AppVersion != release.tag_name){ - console.log('Ged Update Present'); - - //Store.commit("UPDATE_GIT_PRESENT", true); - /* - store.commit("UPDATE_GIT_NAME", releases[i].name); - store.commit("UPDATE_GIT_VERSION", releases[i].tag_name); - store.commit("UPDATE_GIT_DESCRIPTION", releases[i].body); - store.commit("UPDATE_GIT_DOWNLOADURL", releases[i].url); - store.commit("UPDATE_GIT_PUBLISHEDAT", releases[i].published_at); - */ - } - - break; - } - } - } } diff --git a/src/components/modules/Main/GlobalSettings.vue b/src/components/modules/Main/GlobalSettings.vue index 4d8863e..52a493c 100644 --- a/src/components/modules/Main/GlobalSettings.vue +++ b/src/components/modules/Main/GlobalSettings.vue @@ -72,12 +72,12 @@ wtconfig.set('Log.fileLevel', value) }, setBeta: function(value){ - log.info(`Beta level set to ${value}`) - wtconfig.set('Update.Beta', value) + log.info(`Beta level set to ${value}`); + wtconfig.set('Update.Beta', value == 'true'); }, setLogLevelConsole: function(value){ - log.info(`Log Console level set to ${value}`) - wtconfig.set('Log.consoleLevel', value) + log.info(`Log Console level set to ${value}`); + wtconfig.set('Log.consoleLevel', value); }, getLogFileSize: function(){ const logSizeBytes = wtconfig.get('Log.maxSize'); diff --git a/src/components/modules/Main/Home.vue b/src/components/modules/Main/Home.vue index e61b411..aaa9805 100644 --- a/src/components/modules/Main/Home.vue +++ b/src/components/modules/Main/Home.vue @@ -54,12 +54,11 @@ export default { // Is an update present? async UpdatePresent(){ // Get release page from GitHub - const releases = await github.Releases(); + const releases = await github.Releases(); for(var i = 0; i < releases.length; i++) { // Check for current release on GitHub - if (wtconfig.get('Update.Beta') == releases[i].prerelease){ - //release = releases[i]; + if ( Boolean(wtconfig.get('Update.Beta')) == releases[i].prerelease){ if ('v' + wtutils.AppVersion != releases[i].tag_name){ log.info('Update detected'); this.body = this.$t('Common.Update.Body', [releases[i].name, releases[i].published_at.substring(0, 10)]),