Skip to content
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

Fix: Home Assistant 2023.8 MQTT #20

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Fix: Home Assistant 2023.8 MQTT #20

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d248eaf
added object_id support
amadeo-alex Aug 4, 2023
c4035c1
removed all explicit device name additions to sensor name; cleanup
amadeo-alex Aug 4, 2023
be0f095
fixed to return proper value when screen is primary
amadeo-alex Aug 4, 2023
2872417
added basic check for device name in sensor/command name
amadeo-alex Aug 9, 2023
822d972
cleanup
amadeo-alex Aug 9, 2023
adaa3bf
changed _haVersion to be public property
amadeo-alex Aug 9, 2023
161173a
added CompatHelper class and check for HA version
amadeo-alex Aug 9, 2023
059a717
cleanup
amadeo-alex Aug 9, 2023
022ec44
added compatibility task poc
amadeo-alex Aug 10, 2023
a4c46ea
moved to shared
amadeo-alex Aug 10, 2023
7c4ddde
undo move
amadeo-alex Aug 10, 2023
8285e26
removed
amadeo-alex Aug 10, 2023
6861e03
working poc of name change compatibility task
amadeo-alex Aug 11, 2023
1d45d5a
added error checks
amadeo-alex Aug 11, 2023
e20f10f
added commands manager pause after init
amadeo-alex Aug 11, 2023
7f90675
added translations
amadeo-alex Aug 11, 2023
b784dba
cleanup - launch parameters are now program constants
amadeo-alex Aug 11, 2023
1956c86
modified command edit UI to default to name without device name
amadeo-alex Aug 15, 2023
008a998
added missing string translations
amadeo-alex Sep 4, 2023
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
Prev Previous commit
Next Next commit
added error checks
  • Loading branch information
@amadeo-alex
amadeo-alex committed Aug 11, 2023
commit 1d45d5ad9f553f7407d09fe00b0e29b216b17ebd
68 changes: 27 additions & 41 deletions src/HASS.Agent.Staging/HASS.Agent/Compatibility/NameCompatibilityTask.cs
View file
Original file line number Diff line number Diff line change
@@ -22,14 +22,16 @@ internal class NameCompatibilityTask : ICompatibilityTask
{
public string Name => Languages.Compat_NameTask_Name;

private (List<ConfiguredSensor>, List<ConfiguredSensor>) ConvertSingleValueSensors(List<AbstractSingleValueSensor> sensors)
private (List<ConfiguredSensor>, List<ConfiguredSensor>) ConvertSensors(IEnumerable<AbstractDiscoverable> sensors)
{
var configuredSensors = new List<ConfiguredSensor>();
var toBeDeletedSensors = new List<ConfiguredSensor>();

foreach (var sensor in sensors)
{
var currentConfiguredSensor = StoredSensors.ConvertAbstractSingleValueToConfigured(sensor);
var currentConfiguredSensor = sensor is AbstractSingleValueSensor
? StoredSensors.ConvertAbstractSingleValueToConfigured(sensor as AbstractSingleValueSensor)
: StoredSensors.ConvertAbstractMultiValueToConfigured(sensor as AbstractMultiValueSensor);

if (!sensor.Name.Contains(SharedHelperFunctions.GetSafeConfiguredDeviceName()))
{
@@ -41,41 +43,10 @@ internal class NameCompatibilityTask : ICompatibilityTask
var objectId = $"{SharedHelperFunctions.GetSafeConfiguredDeviceName()}_{newName}";
if (objectId == sensor.Name)
{
var newConfiguredSensor = StoredSensors.ConvertAbstractSingleValueToConfigured(sensor);
newConfiguredSensor.Name = newName;
configuredSensors.Add(newConfiguredSensor);

toBeDeletedSensors.Add(currentConfiguredSensor);
}
else
{
configuredSensors.Add(currentConfiguredSensor);
}
}

return (configuredSensors, toBeDeletedSensors);
}

private (List<ConfiguredSensor>, List<ConfiguredSensor>) ConvertMultiValueSensors(List<AbstractMultiValueSensor> sensors)
{
var configuredSensors = new List<ConfiguredSensor>();
var toBeDeletedSensors = new List<ConfiguredSensor>();

foreach (var sensor in sensors)
{
var currentConfiguredSensor = StoredSensors.ConvertAbstractMultiValueToConfigured(sensor);
var newConfiguredSensor = sensor is AbstractSingleValueSensor
? StoredSensors.ConvertAbstractSingleValueToConfigured(sensor as AbstractSingleValueSensor)
: StoredSensors.ConvertAbstractMultiValueToConfigured(sensor as AbstractMultiValueSensor);

if (!sensor.Name.Contains(SharedHelperFunctions.GetSafeConfiguredDeviceName()))
{
configuredSensors.Add(currentConfiguredSensor);
continue;
}

var newName = sensor.Name.Replace($"{SharedHelperFunctions.GetSafeConfiguredDeviceName()}_", "");
var objectId = $"{SharedHelperFunctions.GetSafeConfiguredDeviceName()}_{newName}";
if (objectId == sensor.Name)
{
var newConfiguredSensor = StoredSensors.ConvertAbstractMultiValueToConfigured(sensor);
newConfiguredSensor.Name = newName;
configuredSensors.Add(newConfiguredSensor);

@@ -145,19 +116,34 @@ internal class NameCompatibilityTask : ICompatibilityTask
CommandsManager.Initialize();

Log.Information("[COMPATTASK] Modifying stored single value sensors");
var (sensors, toBeDeletedSensors) = ConvertSingleValueSensors(Variables.SingleValueSensors);
await SensorsManager.StoreAsync(sensors, toBeDeletedSensors);
var (sensors, toBeDeletedSensors) = ConvertSensors(Variables.SingleValueSensors);
var result = await SensorsManager.StoreAsync(sensors, toBeDeletedSensors);
SensorsManager.Pause();
if (!result)
{
Log.Error("[COMPATTASK] Error modifying stored single value sensors");
errorMessage += Languages.Compat_NameTask_Error_SingleValueSensors;
}

Log.Information("[COMPATTASK] Modifying stored multi value sensors");
(sensors, toBeDeletedSensors) = ConvertMultiValueSensors(Variables.MultiValueSensors);
await SensorsManager.StoreAsync(sensors, toBeDeletedSensors);
(sensors, toBeDeletedSensors) = ConvertSensors(Variables.MultiValueSensors);
result = await SensorsManager.StoreAsync(sensors, toBeDeletedSensors);
SensorsManager.Pause();
if (!result)
{
Log.Error("[COMPATTASK] Error modifying stored multi value sensors");
errorMessage += Languages.Compat_NameTask_Error_MultiValueSensors;
}

Log.Information("[COMPATTASK] Modifying stored commands");
var (commands, toBeDeletedCommands) = ConvertCommands(Variables.Commands);
await CommandsManager.StoreAsync(commands, toBeDeletedCommands);
result = await CommandsManager.StoreAsync(commands, toBeDeletedCommands);
CommandsManager.Pause();
if (!result)
{
Log.Error("[COMPATTASK] Error modifying stored commands");
errorMessage += Languages.Compat_NameTask_Error_Commands;
}

Log.Information("[COMPATTASK] Sensor name compatibility task ended");

17 changes: 13 additions & 4 deletions src/HASS.Agent.Staging/HASS.Agent/Resources/Localization/Languages.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions src/HASS.Agent.Staging/HASS.Agent/Resources/Localization/Languages.en.resx
View file
Original file line number Diff line number Diff line change
@@ -3232,10 +3232,13 @@ to match Home Assistant 2023.8 requirements</value>
<data name="Compat_Error_CheckLogs" xml:space="preserve">
<value>Error, please check logs for more information.</value>
</data>
<data name="Compat_NameTask_Error_Sensors" xml:space="preserve">
<value>Error while storing modified sensors!</value>
<data name="Compat_NameTask_Error_SingleValueSensors" xml:space="preserve">
<value>Error converting single value sensors!</value>
</data>
<data name="Compat_NameTask_Error_Commands" xml:space="preserve">
<value>Error while storing modified commands!</value>
<value>Error converting commands!</value>
</data>
<data name="Compat_NameTask_Error_MultiValueSensors" xml:space="preserve">
<value>Error converting multi value sensors!</value>
</data>
</root>
9 changes: 6 additions & 3 deletions src/HASS.Agent.Staging/HASS.Agent/Resources/Localization/Languages.resx
View file
Original file line number Diff line number Diff line change
@@ -3241,10 +3241,13 @@ to match Home Assistant 2023.8 requirements</value>
<data name="Compat_Error_CheckLogs" xml:space="preserve">
<value>Error, please check logs for more information.</value>
</data>
<data name="Compat_NameTask_Error_Sensors" xml:space="preserve">
<value>Error while storing modified sensors!</value>
<data name="Compat_NameTask_Error_SingleValueSensors" xml:space="preserve">
<value>Error converting single value sensors!</value>
</data>
<data name="Compat_NameTask_Error_Commands" xml:space="preserve">
<value>Error while storing modified commands!</value>
<value>Error converting commands!</value>
</data>
<data name="Compat_NameTask_Error_MultiValueSensors" xml:space="preserve">
<value>Error converting multi value sensors!</value>
</data>
</root>