From fd636c81e9e90f4489a4bb040c0b9960954cdd40 Mon Sep 17 00:00:00 2001 From: jliddev Date: Mon, 22 Nov 2021 22:01:18 -0600 Subject: [PATCH 1/2] Fix #1056 Some extra random code cleanup --- wowup-electron/app/ipc-events.ts | 8 +- .../src/app/services/addons/addon.service.ts | 93 ++++++++++--------- 2 files changed, 56 insertions(+), 45 deletions(-) diff --git a/wowup-electron/app/ipc-events.ts b/wowup-electron/app/ipc-events.ts index 2a57d2d4..9b6bbca2 100644 --- a/wowup-electron/app/ipc-events.ts +++ b/wowup-electron/app/ipc-events.ts @@ -216,7 +216,13 @@ export function initializeIpcHandlers(window: BrowserWindow): void { }); handle(IPC_ADDONS_SAVE_ALL, (evt, addons: Addon[]) => { - _.forEach(addons, (addon) => addonStore.set(addon.id, addon)); + if (!Array.isArray(addons)) { + return; + } + + for (const addon of addons) { + addonStore.set(addon.id, addon); + } }); handle(IPC_GET_APP_VERSION, () => { diff --git a/wowup-electron/src/app/services/addons/addon.service.ts b/wowup-electron/src/app/services/addons/addon.service.ts index bfba2329..bc0ba246 100644 --- a/wowup-electron/src/app/services/addons/addon.service.ts +++ b/wowup-electron/src/app/services/addons/addon.service.ts @@ -240,6 +240,12 @@ export class AddonService { return addon1.externalId === addon2.externalId && addon1.providerName === addon2.providerName; } + public addonMatchesSearchResult(addon1: Addon, addon2: AddonSearchResult): boolean { + return ( + addon1?.externalId?.toString() === addon2?.externalId?.toString() && addon1.providerName === addon2.providerName + ); + } + public async getCategoryPage(category: AddonCategory, installation: WowInstallation): Promise { const providers = this.getEnabledAddonProviders(); @@ -1129,25 +1135,25 @@ export class AddonService { /** Iterate over all the installed WoW clients and attempt to check for addon updates */ public async syncAllClients(): Promise { + console.debug("syncAllClients"); const installations = this._warcraftInstallationService.getWowInstallations(); await this.syncBatchProviders(installations); - for (const installation of installations) { - try { - await this.syncStandardProviders(installation); - } catch (e) { - console.error(e); - } + try { + await this.syncStandardProviders(installations); + } catch (e) { + console.error(e); } } /** Check for updates for all addons installed for the give WoW client */ public async syncClient(installation: WowInstallation): Promise { + console.debug("syncClient", installation.label); await this.syncBatchProviders([installation]); try { - await this.syncStandardProviders(installation); + await this.syncStandardProviders([installation]); } catch (e) { console.error(e); } @@ -1162,6 +1168,7 @@ export class AddonService { * external addon IDs into a single request to each batch enabled provider * */ private async syncBatchProviders(installations: WowInstallation[]) { + console.debug(`syncBatchProviders`); const batchedAddonProviders = this.getBatchAddonProviders(); for (const provider of batchedAddonProviders) { @@ -1199,28 +1206,30 @@ export class AddonService { } } - public async syncStandardProviders(installation: WowInstallation): Promise { - console.info(`syncAddons ${installation.label}`); + public async syncStandardProviders(installations: WowInstallation[]): Promise { + console.info(`syncStandardProviders`); let didSync = true; - // fetch all the addons for this WoW client - const addons = this._addonStorage.getAllForInstallationId(installation.id); - const validAddons = _.filter(addons, (addon) => addon.isIgnored === false); - const addonProviders = this.getStandardAddonProviders(); for (const provider of addonProviders) { - try { - await this.syncProviderAddons(installation, validAddons, provider); - } catch (e) { - console.error(`Failed to sync from provider: ${provider.name}`, e); - this._syncErrorSrc.next( - new AddonSyncError({ - providerName: provider.name, - installationName: installation.label, - innerError: e, - }) - ); - didSync = false; + for (const installation of installations) { + // fetch all the addons for this WoW client + const addons = this._addonStorage.getAllForInstallationId(installation.id); + const validAddons = _.filter(addons, (addon) => addon.isIgnored === false); + + try { + await this.syncProviderAddons(installation, validAddons, provider); + } catch (e) { + console.error(`Failed to sync from provider: ${provider.name}`, e); + this._syncErrorSrc.next( + new AddonSyncError({ + providerName: provider.name, + installationName: installation.label, + innerError: e, + }) + ); + didSync = false; + } } } @@ -1230,27 +1239,28 @@ export class AddonService { } private updateAddons(existingAddons: Addon[], newAddons: Addon[]) { - _.forEach(newAddons, (newAddon) => { - const existingAddon = _.find( - existingAddons, + for (const newAddon of newAddons) { + const existingAddon = existingAddons.find( (ea) => ea.externalId?.toString() === newAddon.externalId?.toString() && ea.providerName == newAddon.providerName ); if (!existingAddon) { - return; + continue; } newAddon.autoUpdateEnabled = existingAddon.autoUpdateEnabled; newAddon.isIgnored = existingAddon.isIgnored; newAddon.installedAt = existingAddon.installedAt; newAddon.channelType = existingAddon.channelType; - }); + } return newAddons; } private async syncProviderAddons(installation: WowInstallation, addons: Addon[], addonProvider: AddonProvider) { + // console.debug(`syncProviderAddons`, installation.label, addonProvider.name); + const providerAddonIds = this.getExternalIdsForProvider(addonProvider, addons); if (!providerAddonIds.length) { return; @@ -1266,8 +1276,9 @@ export class AddonService { addons: Addon[], installation: WowInstallation ): Promise { + // console.debug(`handleSyncResults`, installation.label, addonSearchResults); for (const result of addonSearchResults) { - const addon = addons.find((addon) => addon.externalId?.toString() === result?.externalId?.toString()); + const addon = addons.find((addon) => this.addonMatchesSearchResult(addon, result)); if (!addon) { continue; } @@ -1347,7 +1358,7 @@ export class AddonService { const addonId = (error as any).addonId; let addon: Addon | undefined = undefined; if (addonId) { - addon = _.find(addons, (a) => a.externalId === addonId); + addon = _.find(addons, (a) => a.externalId === addonId && a.providerName === addonProvider.name); } if (error instanceof GenericProviderError && addon !== undefined) { @@ -1383,17 +1394,10 @@ export class AddonService { } private getExternalIdsForProvider(addonProvider: AddonProvider, addons: Addon[]): string[] { - const filtered = addons.filter((addon) => addon.providerName === addonProvider.name); - - const externalIds: string[] = []; - for (const addon of filtered) { - if (!addon.externalId) { - continue; - } - - externalIds.push(addon.externalId); - } - return externalIds; + return addons + .filter((addon) => addon.providerName === addonProvider.name) + .map((f) => f.externalId) + .filter((id) => !!id); } private async removeGitFolders(addonFolders: AddonFolder[]) { @@ -1545,7 +1549,8 @@ export class AddonService { totalCount: addonFolders.length, }); - for (const provider of this.getEnabledAddonProviders()) { + const enabledProviders = this.getEnabledAddonProviders(); + for (const provider of enabledProviders) { try { const validFolders = addonFolders.filter((af) => !af.ignoreReason && !af.matchingAddon && af.tocs.length > 0); await provider.scan(installation, defaultAddonChannel, validFolders); From 0253f84a8fc50e6b6128862253aa9e33c2fbcee2 Mon Sep 17 00:00:00 2001 From: jliddev Date: Mon, 22 Nov 2021 22:05:52 -0600 Subject: [PATCH 2/2] Version bump --- wowup-electron/package.json | 2 +- wowup-electron/src/app/services/wowup/patch-notes.service.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wowup-electron/package.json b/wowup-electron/package.json index 4c444722..e1af3b00 100644 --- a/wowup-electron/package.json +++ b/wowup-electron/package.json @@ -1,7 +1,7 @@ { "name": "wowup", "productName": "WowUp", - "version": "2.6.0-beta.2", + "version": "2.6.0-beta.3", "description": "World of Warcraft addon updater", "homepage": "https://wowup.io", "author": { diff --git a/wowup-electron/src/app/services/wowup/patch-notes.service.ts b/wowup-electron/src/app/services/wowup/patch-notes.service.ts index c8301f8f..ca26442b 100644 --- a/wowup-electron/src/app/services/wowup/patch-notes.service.ts +++ b/wowup-electron/src/app/services/wowup/patch-notes.service.ts @@ -25,6 +25,10 @@ const CHANGELOGS: ChangeLog[] = [

Changes

  • Modified the GitHub install by URL feature to be more flexible for multi-toc addons
    • +
+

Fixes

+
    +
  • Fixed an issue with some addon IDs colliding between addon providers
`, }, {