phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-06 17:13:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(editor): slugify mapName for module dir + conf keys

Browse source 
A zone named with spaces or punctuation (e.g. "My Zone!") used to
produce a module directory path "mod_wowee_My Zone!/" and conf
keys like "Wowee.My Zone!.Enabled" which AzerothCore's config
parser rejects. The slug is now stripped to [A-Za-z0-9_-], with
spaces/slashes mapped to underscores. SQL VALUES still use the
raw display text via SQLExporter::escape.
This commit is contained in:
Kelsi 2026-05-06 06:47:43 -07:00
parent a8464fc367
commit 4a98dd7a2c
1 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tools/editor/server_module_gen.cpp
View file

@ -15,7 +15,21 @@ bool ServerModuleGenerator::generate(const ZoneManifest& manifest,
const std::vector<Quest>& quests,
const std::string& outputDir) {
namespace fs = std::filesystem;
std::string dir = outputDir + "/mod_wowee_" + manifest.mapName;
// Sanitize mapName for filesystem and conf-key use. The original may
// contain spaces, slashes, or punctuation (we let the user pick); we
// need a strict identifier here for paths and conf keys.
std::string slug;
slug.reserve(manifest.mapName.size());
for (char c : manifest.mapName) {
if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
(c >= '0' && c <= '9') || c == '_' || c == '-') {
slug += c;
} else if (c == ' ' || c == '/' || c == '\\') {
slug += '_';
}
}
if (slug.empty()) slug = "zone";
std::string dir = outputDir + "/mod_wowee_" + slug;
fs::create_directories(dir + "/sql");
fs::create_directories(dir + "/conf");
@ -26,6 +40,8 @@ bool ServerModuleGenerator::generate(const ZoneManifest& manifest,
Config cfg;
cfg.mapId = manifest.mapId;
// SQL VALUES use cfg.mapName via SQLExporter::escape — keep raw display
// text. Conf keys (Wowee.<key>.*) must be the slug, so use it there.
cfg.mapName = manifest.mapName;
cfg.displayName = manifest.displayName.empty() ? manifest.mapName : manifest.displayName;
@ -99,13 +115,13 @@ bool ServerModuleGenerator::generate(const ZoneManifest& manifest,
f << "#\n# Wowee Custom Zone: " << cfg.displayName << "\n";
f << "# Add this to your worldserver.conf\n#\n\n";
f << "# Enable custom zone " << cfg.displayName << "\n";
f << "Wowee." << cfg.mapName << ".Enabled = 1\n";
f << "Wowee." << cfg.mapName << ".MapId = " << cfg.mapId << "\n";
f << "Wowee." << cfg.mapName << ".ZoneId = " << cfg.zoneId << "\n\n";
f << "Wowee." << slug << ".Enabled = 1\n";
f << "Wowee." << slug << ".MapId = " << cfg.mapId << "\n";
f << "Wowee." << slug << ".ZoneId = " << cfg.zoneId << "\n\n";
f << "# Zone settings\n";
f << "Wowee." << cfg.mapName << ".AllowFlying = "
f << "Wowee." << slug << ".AllowFlying = "
<< (manifest.allowFlying ? 1 : 0) << "\n";
f << "Wowee." << cfg.mapName << ".PvP = "
f << "Wowee." << slug << ".PvP = "
<< (manifest.pvpEnabled ? 1 : 0) << "\n";
}