warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Adds optimized formatter for clilocs (#1045)

Browse source 
Adds an optimized formatter for localization. Example:
```cs
string localizationText = Localization.Format(1050039, "enu", $"{m_Amount}\t{LabelNumber:#}");
```

Fixes #1044
This commit is contained in:
Kamron Batman 2022-06-04 11:53:32 -07:00 • committed by GitHub
parent ecbee17690
commit 5f00330a66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 248 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

210
Projects/Server/Localization/LocalizationEntry.cs
View file

@ -84,24 +84,6 @@ public class LocalizationEntry
builder.Dispose();
}
public string Format(params object[] args)
{
if (args == null || args.Length == 0 || StringFormatter == null)
{
return Text;
}
for (var i = 0; i < args.Length; i++)
{
if (args[i] is string s && s[0] == '#' && int.TryParse(s.AsSpan(1), out var number))
{
args[i] = Localization.GetText(number, Language);
}
}
return string.Format(StringFormatter, args);
}
/// <summary>
/// Creates a formatted string of the localization entry.
/// Uses string interpolation under the hood. This method is preferably relative to the object array method signature.
@ -256,13 +238,69 @@ public class LocalizationEntry
}
}
public void AppendFormatted<T>(T value, string? format)
// Each numeric needs its own override
public void AppendFormatted(int value, string? format)
{
if (!ReadyToAppend())
{
return;
}
if (!TryAppendCliloc(value, format))
{
AppendFormattedDirect(value, format);
}
}
public void AppendFormatted(uint value, string? format)
{
if (!ReadyToAppend())
{
return;
}
if (!TryAppendCliloc((int)value, format))
{
AppendFormattedDirect(value, format);
}
}
public void AppendFormatted(long value, string? format)
{
if (!ReadyToAppend())
{
return;
}
if (!TryAppendCliloc((int)value, format))
{
AppendFormattedDirect(value, format);
}
}
public void AppendFormatted(ulong value, string? format)
{
if (!ReadyToAppend())
{
return;
}
if (!TryAppendCliloc((int)value, format))
{
AppendFormattedDirect(value, format);
}
}
public void AppendFormatted<T>(T value, string? format)
{
if (ReadyToAppend())
{
AppendFormattedDirect(value, format);
}
}
private void AppendFormattedDirect<T>(T value, string? format)
{
string? s;
if (value is IFormattable)
{
@ -307,6 +345,95 @@ public class LocalizationEntry
}
}
// Each numeric needs its own override
public void AppendFormatted(int value, int alignment, string? format)
{
if (!ReadyToAppend())
{
return;
}
var startingPos = _pos;
if (TryAppendCliloc(value, format))
{
AppendFormatted(value, format);
if (alignment != 0)
{
AppendOrInsertAlignmentIfNeeded(startingPos, alignment);
}
}
else
{
AppendFormattedDirect(value, alignment, format);
}
}
public void AppendFormatted(uint value, int alignment, string? format)
{
if (!ReadyToAppend())
{
return;
}
var startingPos = _pos;
if (TryAppendCliloc((int)value, format))
{
AppendFormatted(value, format);
if (alignment != 0)
{
AppendOrInsertAlignmentIfNeeded(startingPos, alignment);
}
}
else
{
AppendFormattedDirect(value, alignment, format);
}
}
public void AppendFormatted(long value, int alignment, string? format)
{
if (!ReadyToAppend())
{
return;
}
var startingPos = _pos;
if (TryAppendCliloc((int)value, format))
{
AppendFormatted(value, format);
if (alignment != 0)
{
AppendOrInsertAlignmentIfNeeded(startingPos, alignment);
}
}
else
{
AppendFormattedDirect(value, alignment, format);
}
}
public void AppendFormatted(ulong value, int alignment, string? format)
{
if (!ReadyToAppend())
{
return;
}
var startingPos = _pos;
if (TryAppendCliloc((int)value, format))
{
AppendFormatted(value, format);
if (alignment != 0)
{
AppendOrInsertAlignmentIfNeeded(startingPos, alignment);
}
}
else
{
AppendFormattedDirect(value, alignment, format);
}
}
public void AppendFormatted<T>(T value, int alignment, string? format)
{
if (!ReadyToAppend())
@ -314,6 +441,11 @@ public class LocalizationEntry
return;
}
AppendFormattedDirect(value, alignment, format);
}
private void AppendFormattedDirect<T>(T value, int alignment, string? format)
{
var startingPos = _pos;
AppendFormatted(value, format);
if (alignment != 0)
@ -324,7 +456,7 @@ public class LocalizationEntry
public void AppendFormatted(ReadOnlySpan<char> value)
{
if (!ReadyToAppend() || TryAppendClilocNumber(value))
if (!ReadyToAppend() || TryAppendClilocByNumericString(value))
{
return;
}
@ -380,12 +512,33 @@ public class LocalizationEntry
}
}
public void AppendFormatted(object? value, int alignment = 0, string? format = null) =>
AppendFormatted<object?>(value, alignment, format);
public void AppendFormatted(object? value, int alignment = 0, string? format = null)
{
if (value is int i)
{
AppendFormatted(i, alignment, format);
}
else if (value is uint ui)
{
AppendFormatted(ui, alignment, format);
}
else if (value is long l)
{
AppendFormatted(l, alignment, format);
}
else if (value is ulong ul)
{
AppendFormatted(ul, alignment, format);
}
else
{
AppendFormatted<object?>(value, alignment, format);
}
}
public void AppendFormatted(string? value)
{
if (!ReadyToAppend() || TryAppendClilocNumber(value))
if (!ReadyToAppend() || TryAppendClilocByNumericString(value))
{
return;
}
@ -403,13 +556,9 @@ public class LocalizationEntry
public void AppendFormatted(string? value, int alignment, string? format = null) =>
AppendFormatted<string?>(value, alignment, format);
private bool TryAppendClilocNumber(ReadOnlySpan<char> value)
public bool TryAppendCliloc(int number, string? format)
{
if (
value[0] != '#' ||
!int.TryParse(value[1..], out var number) ||
!Localization.TryGetLocalization(_lang, number, out var entry)
)
if (format != "#" || !Localization.TryGetLocalization(_lang, number, out var entry))
{
return false;
}
@ -428,6 +577,9 @@ public class LocalizationEntry
return true;
}
private bool TryAppendClilocByNumericString(ReadOnlySpan<char> value) =>
value[0] == '#' && long.TryParse(value[1..], out var number) && TryAppendCliloc((int)number, "#");
private void AppendOrInsertAlignmentIfNeeded(int startingPos, int alignment)
{
var charsWritten = _pos - startingPos;