From 62667ebbf91c7cd897f4575f8513efad6a2979de Mon Sep 17 00:00:00 2001 From: jliddev Date: Fri, 15 Jul 2022 08:25:04 -0500 Subject: [PATCH] Wago wrath toc wrath and wotlkc --- wowup-electron/app/wowup-folder-scanner.ts | 2 +- wowup-electron/src/app/addon-providers/wago-addon-provider.ts | 4 +++- wowup-electron/src/app/services/toc/toc.service.ts | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/wowup-electron/app/wowup-folder-scanner.ts b/wowup-electron/app/wowup-folder-scanner.ts index d0ab70e2..80656abf 100644 --- a/wowup-electron/app/wowup-folder-scanner.ts +++ b/wowup-electron/app/wowup-folder-scanner.ts @@ -60,7 +60,7 @@ export class WowUpFolderScanner { } private get tocFileRegex() { - return /^([^/]+)[\\/]\1([-|_](mainline|bcc|tbc|classic|vanilla))?\.toc$/i; + return /^([^/]+)[\\/]\1([-_](mainline|bcc|tbc|classic|vanilla|wrath|wotlkc))?\.toc$/i; } private get bindingsXmlRegex() { diff --git a/wowup-electron/src/app/addon-providers/wago-addon-provider.ts b/wowup-electron/src/app/addon-providers/wago-addon-provider.ts index 1d406f5d..094c0ef3 100644 --- a/wowup-electron/src/app/addon-providers/wago-addon-provider.ts +++ b/wowup-electron/src/app/addon-providers/wago-addon-provider.ts @@ -28,7 +28,7 @@ import { getWowClientGroup } from "../../common/warcraft"; import { HttpErrorResponse } from "@angular/common/http"; import { UiMessageService } from "../services/ui-message/ui-message.service"; -declare type WagoGameVersion = "retail" | "classic" | "bc"; +declare type WagoGameVersion = "retail" | "classic" | "bc" | "wrath"; declare type WagoStability = "stable" | "beta" | "alpha"; interface WagoFingerprintAddon { @@ -677,6 +677,8 @@ export class WagoAddonProvider extends AddonProvider { return "classic"; case WowClientGroup.Retail: return "retail"; + case WowClientGroup.WOTLK: + return "wrath"; default: throw new Error(`[wago] Un-handled client type: ${clientType}`); } diff --git a/wowup-electron/src/app/services/toc/toc.service.ts b/wowup-electron/src/app/services/toc/toc.service.ts index 0c8bb05f..daeb40e2 100644 --- a/wowup-electron/src/app/services/toc/toc.service.ts +++ b/wowup-electron/src/app/services/toc/toc.service.ts @@ -119,7 +119,7 @@ export class TocService { matchedToc = tocFileNames.find((tfn) => /.*[-_](bcc|tbc)\.toc$/gi.test(tfn)) || ""; break; case WowClientType.ClassicBeta: - matchedToc = tocFileNames.find((tfn) => /.*[-_](wotlkc)\.toc$/gi.test(tfn)) || ""; + matchedToc = tocFileNames.find((tfn) => /.*[-_](wrath|wotlkc)\.toc$/gi.test(tfn)) || ""; break; default: break; @@ -127,7 +127,7 @@ export class TocService { return ( matchedToc || - tocFileNames.find((tfn) => /.*(? /.*(?