From 9dff40bd63efa5d8f5d67941973eec98dcea3af8 Mon Sep 17 00:00:00 2001 From: jliddev Date: Sun, 4 Apr 2021 23:52:34 -0500 Subject: [PATCH] Fix some issues with removing installedFolders usage --- wowup-electron/src/app/services/addons/addon.service.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wowup-electron/src/app/services/addons/addon.service.ts b/wowup-electron/src/app/services/addons/addon.service.ts index 46c602c7..efab877d 100644 --- a/wowup-electron/src/app/services/addons/addon.service.ts +++ b/wowup-electron/src/app/services/addons/addon.service.ts @@ -753,7 +753,7 @@ export class AddonService { } private async backupOriginalDirectories(addon: Addon) { - const installedFolders = addon.installedFolderList; + const installedFolders = addon.installedFolderList ?? []; const installation = this._warcraftInstallationService.getWowInstallation(addon.installationId); const addonFolderPath = this._warcraftService.getAddonFolderPath(installation); @@ -877,7 +877,7 @@ export class AddonService { console.log(`[RemoveAddon] ${addon.providerName} ${addon.externalId ?? "NO_EXT_ID"} ${addon.name}`); if (removeDirectories) { - const installedDirectories = addon.installedFolderList; + const installedDirectories = addon.installedFolderList ?? []; const installation = this._warcraftInstallationService.getWowInstallation(addon.installationId); const addonFolderPath = this._warcraftService.getAddonFolderPath(installation); @@ -932,7 +932,7 @@ export class AddonService { } // Only sync non-ignored addons - const notIgnored = _.filter(addons, (addon) => addon.isIgnored === false); + // const notIgnored = _.filter(addons, (addon) => addon.isIgnored === false); return addons; } @@ -1475,7 +1475,7 @@ export class AddonService { return; } - addon.installedFolderList = addon.installedFolderList; + addon.installedFolderList = addon.installedFolders?.split(",") ?? []; this.saveAddon(addon); } @@ -1570,6 +1570,7 @@ export class AddonService { latestChangelog: latestFile.changelog, latestChangelogVersion: latestFile.version, installationId: installation.id, + installedFolderList: [], }; }