Add aliases functionality
Add aliases functionality to acedia. Aliases allow to add "synonyms" to class names or other text values.
This commit is contained in:
parent
97569f9568
commit
c690572663
6 changed files with 810 additions and 2 deletions
140
sources/Core/Aliases/Aliases.uc
Normal file
140
sources/Core/Aliases/Aliases.uc
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
/**
|
||||
* Aliases allow users to define human-readable and easier to use
|
||||
* "synonyms" to some symbol sequences (mainly names of UnrealScript classes).
|
||||
* Due to how aliases are stored, there is a limitation on original
|
||||
* values to which aliases refer: it must be a valid object name to store via
|
||||
* `perObjectConfig`. For example it cannot contain `]` or a dot `.`
|
||||
* (use `:` as a delimiter for class names: `KFMod:M14EBRBattleRifle`).
|
||||
* Aliases can be grouped into categories: "weapons", "test", "maps", etc.
|
||||
* Aliases can be configured in `AcediaAliases` in form:
|
||||
* ________________________________________________________________________
|
||||
* | [<groupName>/<aliasesValue> Aliases]
|
||||
* | Alias="<alias1>"
|
||||
* | Alias="<alias2>"
|
||||
* | ...
|
||||
* |_______________________________________________________________________
|
||||
* where <groupName>, <aliasesValue>, <alias1>, ... can be replaced with
|
||||
* desired values.
|
||||
* Copyright 2020 Anton Tarasenko
|
||||
*------------------------------------------------------------------------------
|
||||
* This file is part of Acedia.
|
||||
*
|
||||
* Acedia is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Acedia is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Acedia. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
class Aliases extends AcediaObject
|
||||
perObjectConfig
|
||||
config(AcediaAliases);
|
||||
|
||||
/**
|
||||
* All data is stored in config as a bunch of named `Aliases` objects
|
||||
* (via `perObjectConfig`). Name of each object records both aliases group and
|
||||
* value (see class description for details).
|
||||
* Aliases themselves are recorded into the `alias` array.
|
||||
*/
|
||||
|
||||
// Stores name of the configuration file.
|
||||
var private const string configName;
|
||||
// Both value
|
||||
// Symbol (or symbol sequence) that separates value from the group in
|
||||
// `[<groupName>/<aliasesValue> Aliases]`.
|
||||
var private const string delimiter;
|
||||
|
||||
// Set once to prevent more than one object loading.
|
||||
var private bool initialized;
|
||||
|
||||
// All aliases objects, specified by the configuration file.
|
||||
var private array<Aliases> availableRecords;
|
||||
|
||||
// Data loaded from the configuration file into the `Aliases` object.
|
||||
// Value to which all aliases refer to.
|
||||
var private string originalValue;
|
||||
// Group to which this object's aliases belong to.
|
||||
var private string groupName;
|
||||
// Recorded aliases ("synonyms") for the `originalValue`.
|
||||
var public config array<string> alias;
|
||||
|
||||
// Initializes data that we can not directly read from the configuration file.
|
||||
private final function Initialize()
|
||||
{
|
||||
if (initialized) return;
|
||||
|
||||
availableRecords.length = 0;
|
||||
ParseObjectName(string(self.name));
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
private final function ParseObjectName(string configName)
|
||||
{
|
||||
local int i;
|
||||
local array<string> splitName;
|
||||
Split(configName, "/", splitName);
|
||||
groupName = splitName[0];
|
||||
originalValue = "";
|
||||
for (i = 1; i < splitName.length; i += 1)
|
||||
{
|
||||
originalValue $= splitName[i];
|
||||
}
|
||||
}
|
||||
|
||||
// This function loads all the defined aliases from the config file.
|
||||
// Need to only be called once, further calls do nothing.
|
||||
public static final function LoadAliases()
|
||||
{
|
||||
local int i;
|
||||
local array<string> recordNames;
|
||||
if (default.initialized) return;
|
||||
recordNames =
|
||||
GetPerObjectNames(default.configName, string(class'Aliases'.name));
|
||||
for (i = 0; i < recordNames.length; i += 1)
|
||||
{
|
||||
default.availableRecords[i] = new(none, recordNames[i]) class'Aliases';
|
||||
if (default.availableRecords[i] != none)
|
||||
{
|
||||
default.availableRecords[i].Initialize();
|
||||
}
|
||||
}
|
||||
default.initialized = true;
|
||||
}
|
||||
|
||||
// Tries to find original value for a given alias in a given group.
|
||||
public static final function bool ResolveAlias
|
||||
(
|
||||
string group,
|
||||
string alias,
|
||||
out string result
|
||||
)
|
||||
{
|
||||
local int i, j;
|
||||
if (!default.initialized) return false;
|
||||
for (i = 0; i < default.availableRecords.length; i += 1)
|
||||
{
|
||||
if (!(default.availableRecords[i].groupName ~= group)) continue;
|
||||
for (j = 0; j < default.availableRecords[i].alias.length; j += 1)
|
||||
{
|
||||
if (default.availableRecords[i].alias[j] ~= alias)
|
||||
{
|
||||
result = default.availableRecords[i].originalValue;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
defaultproperties
|
||||
{
|
||||
initialized = false
|
||||
configName = "AcediaAliases"
|
||||
delimiter = "/"
|
||||
}
|
||||
43
sources/Core/Aliases/AliasesAPI.uc
Normal file
43
sources/Core/Aliases/AliasesAPI.uc
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
/**
|
||||
* Provides convenient access to Aliases-related functions.
|
||||
* Copyright 2019 Anton Tarasenko
|
||||
*------------------------------------------------------------------------------
|
||||
* This file is part of Acedia.
|
||||
*
|
||||
* Acedia is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Acedia is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Acedia. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
class AliasesAPI extends Singleton;
|
||||
|
||||
// Resolves original value for given alias and it's group.
|
||||
// Returns `false` if there no such alias and `true` if there is.
|
||||
public function bool Resolve(string group, string alias, out string result)
|
||||
{
|
||||
return class'Aliases'.static.ResolveAlias(group, alias, result);
|
||||
}
|
||||
|
||||
// Tries to resolve given alias.
|
||||
// If fails - returns passed `alias` value back.
|
||||
public function string Try(string group, string alias)
|
||||
{
|
||||
local string result;
|
||||
if (class'Aliases'.static.ResolveAlias(group, alias, result))
|
||||
{
|
||||
return result;
|
||||
}
|
||||
return alias;
|
||||
}
|
||||
|
||||
defaultproperties
|
||||
{
|
||||
}
|
||||
53
sources/Core/Aliases/Tests/TEST_Aliases.uc
Normal file
53
sources/Core/Aliases/Tests/TEST_Aliases.uc
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
/**
|
||||
* Set of tests for Aliases system.
|
||||
* Copyright 2020 Anton Tarasenko
|
||||
*------------------------------------------------------------------------------
|
||||
* This file is part of Acedia.
|
||||
*
|
||||
* Acedia is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Acedia is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Acedia. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
class TEST_Aliases extends TestCase
|
||||
abstract;
|
||||
|
||||
protected static function TESTS()
|
||||
{
|
||||
local string result;
|
||||
Context("Testing Aliases loading.");
|
||||
Issue("`Try` cannot resolve correct alias");
|
||||
TEST_ExpectTrue(_().alias.Try("test", "Ford") == "car");
|
||||
TEST_ExpectTrue(_().alias.Try("test", "Delorean") == "car");
|
||||
TEST_ExpectTrue(_().alias.Try("test", "HardToBeAGod") == "scifi");
|
||||
|
||||
Issue("`Resolve` cannot resolve correct alias");
|
||||
_().alias.Resolve("test", "Ford", result);
|
||||
TEST_ExpectTrue(result == "car");
|
||||
_().alias.Resolve("test", "Audi", result);
|
||||
TEST_ExpectTrue(result == "car");
|
||||
_().alias.Resolve("test", "Spice", result);
|
||||
TEST_ExpectTrue(result == "scifi");
|
||||
|
||||
Issue("`Try` does not return original alias for non-existing alias record");
|
||||
TEST_ExpectTrue(_().alias.Try("test", "AllFiction") == "AllFiction");
|
||||
|
||||
Issue("`Resolve` reports success when it failed");
|
||||
TEST_ExpectFalse(_().alias.Resolve("test", "KarmicJustice", result));
|
||||
|
||||
Issue("`Resolve` reports failure when it succeeds");
|
||||
TEST_ExpectTrue(_().alias.Resolve("test", "Delorean", result));
|
||||
}
|
||||
|
||||
defaultproperties
|
||||
{
|
||||
caseName = "Aliases"
|
||||
}
|
||||
|
|
@ -21,12 +21,14 @@
|
|||
*/
|
||||
class Global extends Singleton;
|
||||
|
||||
var public Acedia acedia;
|
||||
var public JSONAPI json;
|
||||
var public Acedia acedia;
|
||||
var public JSONAPI json;
|
||||
var public AliasesAPI alias;
|
||||
|
||||
protected function OnCreated()
|
||||
{
|
||||
acedia = class'Acedia'.static.GetInstance();
|
||||
Spawn(class'JSONAPI');
|
||||
json = JSONAPI(class'JSONAPI'.static.GetInstance());
|
||||
alias = AliasesAPI(class'AliasesAPI'.static.GetInstance());
|
||||
}
|
||||
|
|
@ -46,4 +46,5 @@ defaultproperties
|
|||
requiredListeners(0) = class'MutatorListener_Connection'
|
||||
// Unit tests
|
||||
testCases(0) = class'TEST_JSON'
|
||||
testCases(1) = class'TEST_Aliases'
|
||||
}
|
||||
Reference in a new issue