From 223dc56c7d9e9d89a6c881c68a263ec2cd7e0c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Tue, 3 Nov 2026 11:50:29 +0500 Subject: [PATCH] fix(modules): show tbc-content and wotlk-content only when content-scaling is installed --- crates/coa-core/src/modules.rs | 14 ++++++++++++-- src/screens/ModulesPage.tsx | 11 ++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/crates/coa-core/src/modules.rs b/crates/coa-core/src/modules.rs index 44a1945..b8aeced 100644 --- a/crates/coa-core/src/modules.rs +++ b/crates/coa-core/src/modules.rs @@ -265,8 +265,18 @@ fn list_in(cat: &[Entry], root: &Path) -> Vec { || root.join("Data/enUS/patch-enUS-4.mpq").is_file(); (ComponentType::ClientPatch, has_patch, true) } else if matches!(e.id.as_str(), "tbc-content" | "wotlk-content") { - let has_content = (conf.is_file() || dist.is_file() || root.join("data").is_dir()) - && (!wildcard || root.join("data").is_dir()); + let scaling_entry = cat.iter().find(|entry| entry.id == "content-scaling"); + let is_scaling_installed = scaling_entry.map(|se| { + let sc_name = conf_name(root, se); + let sc_conf = dir(root).join(&sc_name); + let sc_dist = dir(root).join(format!("{sc_name}.dist")); + sc_conf.is_file() || sc_dist.is_file() || installed_commits.contains_key("scaling") + || root.join("plugins").join("mod-coa-content-scaling.dll").is_file() + || root.join(".manager/plugins").join("mod-coa-content-scaling.dll").is_file() + || plugin_reg.as_ref().map(|r| r.plugins.contains_key("content-scaling")).unwrap_or(false) + }).unwrap_or(false); + + let has_content = is_scaling_installed && (conf.is_file() || dist.is_file()); (ComponentType::ContentPack, has_content, false) } else if e.id == "client-compat" { (ComponentType::LogicalFeature, true, false) diff --git a/src/screens/ModulesPage.tsx b/src/screens/ModulesPage.tsx index 1318755..a7a70db 100644 --- a/src/screens/ModulesPage.tsx +++ b/src/screens/ModulesPage.tsx @@ -902,7 +902,16 @@ export function ModulesPage({ URL.revokeObjectURL(url); } - const installedModules = modules?.filter((m) => m.installed) ?? []; + const isScalingInstalled = Boolean( + modules?.some((m) => m.id === "content-scaling" && m.installed) + ); + + const installedModules = (modules?.filter((m) => m.installed) ?? []).filter((m) => { + if (m.id === "tbc-content" || m.id === "wotlk-content") { + return isScalingInstalled; + } + return true; + }); const selectedModule = modules?.find((m) => m.id === openSettings) ?? null; const selectedModuleIndex = installedModules.findIndex((m) => m.id === openSettings);