add support of modes

This commit is contained in:
Beu
2024-12-19 21:00:00 +01:00
parent d6f4413ea9
commit 4ecb26300f
3 changed files with 53 additions and 9 deletions

View File

@@ -2,7 +2,7 @@ class PackConfig {
string Name; string Name;
string Author; string Author;
string Version; string Version;
string ModePattern; array<string> Modes;
array<LayerConfig> Layers; array<LayerConfig> Layers;
array<string> UnloadModules; array<string> UnloadModules;
@@ -14,7 +14,12 @@ class PackConfig {
Name = Data['Name']; Name = Data['Name'];
Author = Data['Author']; Author = Data['Author'];
Version = Data['Version']; Version = Data['Version'];
ModePattern = Data['ModePattern'];
if (Data.HasKey('Modes') && Data['Modes'].GetType() == Json::Type::Array) {
for (uint i = 0; i < Data['Modes'].Length; i++) {
Modes.InsertLast(Data['Modes'][i]);
}
}
if (Data.HasKey('Layers') && Data['Layers'].GetType() == Json::Type::Array) { if (Data.HasKey('Layers') && Data['Layers'].GetType() == Json::Type::Array) {
for (uint i = 0; i < Data['Layers'].Length; i++) { for (uint i = 0; i < Data['Layers'].Length; i++) {
@@ -34,4 +39,43 @@ class PackConfig {
} }
} }
} }
string getPrettyModes() const {
if (Modes.Find('any') >= 0) return 'any';
const string Pattern = '(?:.*(?:/|\\\\|^))(.*)\\.Script\\.txt';
string Result;
for (uint i = 0; i < Modes.Length; i++) {
if (i > 0) Result += '\n';
const string Mode = Modes[i];
const array<string> Matches = Regex::Match(Mode, Pattern);
if (Matches.Length > 1) {
string Match = Matches[1];
if (Match.Contains('TM_')) {
array<string> Exploded = Match.Split('_');
Result += Exploded[1];
} else {
Result += Match;
}
}
}
return Result;
}
bool ModeMatch(const string &in _SearchedMode) const {
const string SearchedMode = _SearchedMode.ToLower();
for (uint i = 0; i < Modes.Length; i++) {
const string Mode = Modes[i].ToLower();
if (Mode == "any" || Mode == SearchedMode) return true;
}
return false;
}
} }

View File

@@ -79,9 +79,9 @@ namespace PacksManager {
const PackConfig@ Config = PacksManager::GetConfig(Id); const PackConfig@ Config = PacksManager::GetConfig(Id);
// TODO Check ModePattern
if (Regex::IsMatch(ServerInfo.CurScriptRelName, Config.ModePattern)) { if (!Config.ModeMatch(string(ServerInfo.CurScriptRelName))) {
print('match'); continue;
} }
for (uint j = 0; j < Config.UnloadModules.Length; j++) { for (uint j = 0; j < Config.UnloadModules.Length; j++) {

View File

@@ -15,12 +15,12 @@ namespace RenderManager {
PacksManager::LoadConfigs(); PacksManager::LoadConfigs();
} }
if (UI::BeginTable('configs', 5, UI::TableFlags(UI::TableFlags::Resizable | UI::TableFlags::Sortable | UI::TableFlags::NoSavedSettings | UI::TableFlags::BordersInnerV | UI::TableFlags::SizingStretchProp | UI::TableFlags::ScrollY))) { if (UI::BeginTable('configs', 5, UI::TableFlags(UI::TableFlags::Resizable | UI::TableFlags::Sortable | UI::TableFlags::NoSavedSettings))) {
UI::TableSetupColumn("Name", UI::TableColumnFlags::DefaultSort); UI::TableSetupColumn("Name", UI::TableColumnFlags::DefaultSort);
UI::TableSetupColumn("Author", UI::TableColumnFlags::None); UI::TableSetupColumn("Author", UI::TableColumnFlags::None);
UI::TableSetupColumn("Version", UI::TableColumnFlags::None); UI::TableSetupColumn("Version", UI::TableColumnFlags::None);
UI::TableSetupColumn("Mode Pattern", UI::TableColumnFlags::NoResize); UI::TableSetupColumn("Modes", UI::TableColumnFlags::NoResize);
UI::TableSetupColumn("Enable", UI::TableFlags(UI::TableColumnFlags::NoResize | UI::TableColumnFlags::WidthFixed), 60.); UI::TableSetupColumn("Enable", UI::TableFlags(UI::TableColumnFlags::NoResize | UI::TableColumnFlags::WidthFixed | UI::TableColumnFlags::NoSort), 60.);
UI::TableHeadersRow(); UI::TableHeadersRow();
const array<string> ConfigIds = PacksManager::G_Configs.GetKeys(); const array<string> ConfigIds = PacksManager::G_Configs.GetKeys();
@@ -37,7 +37,7 @@ namespace RenderManager {
UI::TableNextColumn(); UI::TableNextColumn();
UI::Text(Config.Version); UI::Text(Config.Version);
UI::TableNextColumn(); UI::TableNextColumn();
UI::Text(Config.ModePattern); UI::Text(Config.getPrettyModes());
UI::TableNextColumn(); UI::TableNextColumn();
const int index = PacksManager::G_EnabledConfigs.Find(Id); const int index = PacksManager::G_EnabledConfigs.Find(Id);