From ed97ea7633b308d19e3cfc9fcb245a6edd0dea17 Mon Sep 17 00:00:00 2001 From: Lynn Date: Sat, 7 Nov 2020 15:27:01 +0100 Subject: [PATCH 1/2] Ignored addons should not be counted as updates --- wowup-electron/src/app/services/wowup/wowup-addon.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wowup-electron/src/app/services/wowup/wowup-addon.service.ts b/wowup-electron/src/app/services/wowup/wowup-addon.service.ts index baffe0ac..9ca62b39 100644 --- a/wowup-electron/src/app/services/wowup/wowup-addon.service.ts +++ b/wowup-electron/src/app/services/wowup/wowup-addon.service.ts @@ -34,7 +34,9 @@ export class WowUpAddonService { const dataFile = this._addonService.getFullInstallPath(wowupAddon) + "/data.lua"; const wowUpAddonData: WowUpAddonData = { - updatesAvailableCount: addons.filter((addon: Addon) => addon.latestVersion !== addon.installedVersion).length, + updatesAvailableCount: addons.filter( + (addon: Addon) => addon.latestVersion !== addon.installedVersion && !addon.isIgnored + ).length, generatedAt: (new Date()).toString(), } From ef1363428bb96ef6c55d4994ab211c70fd7ddc5e Mon Sep 17 00:00:00 2001 From: jliddev Date: Sat, 7 Nov 2020 13:32:53 -0600 Subject: [PATCH 2/2] minor tweak --- .../src/app/services/wowup/wowup-addon.service.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wowup-electron/src/app/services/wowup/wowup-addon.service.ts b/wowup-electron/src/app/services/wowup/wowup-addon.service.ts index 9ca62b39..ba320239 100644 --- a/wowup-electron/src/app/services/wowup/wowup-addon.service.ts +++ b/wowup-electron/src/app/services/wowup/wowup-addon.service.ts @@ -35,10 +35,10 @@ export class WowUpAddonService { const wowUpAddonData: WowUpAddonData = { updatesAvailableCount: addons.filter( - (addon: Addon) => addon.latestVersion !== addon.installedVersion && !addon.isIgnored + (addon: Addon) => !addon.isIgnored && addon.latestVersion !== addon.installedVersion ).length, - generatedAt: (new Date()).toString(), - } + generatedAt: new Date().toString(), + }; if (!this.compiledTemplate) { this.compiledTemplate = Handlebars.compile(templateContents); @@ -50,4 +50,3 @@ export class WowUpAddonService { } } } -