Skip to content

Add snake casing to app input booleans #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 2, 2022
Merged

Add snake casing to app input booleans #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9a9453
fixed snake case naming of app input boolean
helto4real Feb 1, 2022
03599b6
fix
helto4real Feb 1, 2022
cbe8100
Make sure we do not have double underscore
helto4real Feb 2, 2022
86e80d2
Merge branch 'dev' into snake-casing-for-apps
FrankBakkerNl Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/Runtime/NetDaemon.Runtime.Tests/Internal/AppStateManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,4 +377,21 @@ public void TestAppOneStateIsNullShouldNotCallSetStateAsync()
// ASSERT
appMock.Verify(n => n.SetStateAsync(ApplicationState.Disabled), Times.Never);
}
}

[Theory]
[InlineData("lowercase", "lowercase")]
[InlineData("lower.namespace.lowercase", "lower_namespace_lowercase")]
[InlineData("Namespace.Class", "namespace_class")]
[InlineData("Namespace.ClassNameWithUpperAndLower", "namespace_class_name_with_upper_and_lower")]
[InlineData("ALLUPPERCASE", "alluppercase")]
[InlineData("DIClass", "diclass")]
[InlineData("DiClass", "di_class")]
[InlineData("Di_Class", "di_class")]
[InlineData("di_class", "di_class")]
[InlineData("di__class", "di_class")]
public void TestToSafeHomeAssistantEntityIdFromApplicationIdShouldGiveCorrectName(string fromId, string toId)
{
var expected = $"input_boolean.netdaemon_{toId}";
AppStateManager.ToSafeHomeAssistantEntityIdFromApplicationId(fromId).Should().Be(expected);
}
}
23 changes: 19 additions & 4 deletions src/Runtime/NetDaemon.Runtime/Internal/AppStateManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,21 +104,36 @@ public static string ToSafeHomeAssistantEntityIdFromApplicationId(string applica
var normalizedString = applicationId.Normalize(NormalizationForm.FormD);
StringBuilder stringBuilder = new(applicationId.Length);

char lastChar = '\0';

foreach (var c in normalizedString)
{
switch (CharUnicodeInfo.GetUnicodeCategory(c))
{
case UnicodeCategory.LowercaseLetter:
stringBuilder.Append(c);
break;
case UnicodeCategory.UppercaseLetter:
if (CharUnicodeInfo.GetUnicodeCategory(lastChar) == UnicodeCategory.LowercaseLetter)
{
if (lastChar != '_')
stringBuilder.Append('_');
}
stringBuilder.Append(char.ToLowerInvariant(c));
break;
case UnicodeCategory.DecimalDigitNumber:
stringBuilder.Append(c);
break;

case UnicodeCategory.SpaceSeparator:
case UnicodeCategory.ConnectorPunctuation:
case UnicodeCategory.DashPunctuation:
stringBuilder.Append('_');
case UnicodeCategory.OtherPunctuation:
if (lastChar != '_')
stringBuilder.Append('_');
break;
}
lastChar = c;
}

return $"input_boolean.netdaemon_{stringBuilder.ToString().ToLowerInvariant()}";
}
Expand All @@ -130,8 +145,8 @@ private void ClearExistingCacheOnNewConnection()

private async Task<HassState?> GetOrCreateStateForApp(string entityId)
{
var haConnection = _provider.GetRequiredService<IHomeAssistantConnection>() ??
throw new InvalidOperationException();
var haConnection = _provider.GetRequiredService<IHomeAssistantConnection>();

try
{
var state = await haConnection.GetEntityStateAsync(entityId, _cancelTokenSource.Token)
Expand Down