yuanlin/Evergreen-Health
1
0
Fork 0
Code Pull Requests Actions Releases Activity

11111

Browse Source
This commit is contained in:
fuenmao
2026-11-13 14:03:25 +08:00
parent 718b138033
commit 9cfd9e24d7
6 changed files with 105 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Evergreen.Health.Application/Health/Devices/Discovery/HomeAssistantDeviceCatalog.cs
+31 -4
View File
@@ -12,8 +12,14 @@ public sealed class HomeAssistantDeviceCatalog
{
private readonly HomeAssistantOptions _options;
private readonly DeviceModuleRegistry _modules;
private readonly HashSet<string> _manualLightIds;
public HomeAssistantDeviceCatalog(IOptions<HomeAssistantOptions> options, DeviceModuleRegistry modules)
=> (_options, _modules) = (options.Value, modules);
{
(_options, _modules) = (options.Value, modules);
_manualLightIds = _options.ManualLightEntityIds
.Where(id => !string.IsNullOrWhiteSpace(id) && id.StartsWith("light.", StringComparison.Ordinal))
.ToHashSet(StringComparer.OrdinalIgnoreCase);
}
public List<HomeAssistantDiscoveredDeviceOutput> BuildDiscoveredDevices(
HomeAssistantRegistries? registries,
@@ -42,7 +48,8 @@ public sealed class HomeAssistantDeviceCatalog
var entityIds = regEntities.Select(entity => entity.EntityId).ToHashSet(StringComparer.OrdinalIgnoreCase);
var module = _modules.ForEntities(entityIds);
var displayOnly = _options.DisplayOnlyDevices.FirstOrDefault(item => entityIds.Contains(item.EntityId));
if (_options.OnlyConfiguredDevices && module is null && displayOnly is null) continue;
var manualLightId = regEntities.FirstOrDefault(entity => _manualLightIds.Contains(entity.EntityId))?.EntityId;
if (_options.OnlyConfiguredDevices && module is null && displayOnly is null && manualLightId is null) continue;
var entityOutputs = new List<HomeAssistantEntityOutput>();
foreach (var regEntity in regEntities)
@@ -80,9 +87,11 @@ public sealed class HomeAssistantDeviceCatalog
? an
: null;
var category = module?.Category ?? displayOnly?.Category ?? CategorizeDevice(displayName, device.Model ?? "", device.Manufacturer ?? "", entityOutputs);
var category = module?.Category ?? (manualLightId is not null ? nameof(HealthDeviceCategory.Lighting) :
displayOnly?.Category ?? CategorizeDevice(displayName, device.Model ?? "", device.Manufacturer ?? "", entityOutputs));
var metrics = ExtractDeviceMetrics(category, entityOutputs);
var primaryControlEntityId = module is null && displayOnly is not null ? null : FindPrimaryControlEntityId(category, entityOutputs);
var primaryControlEntityId = module is not null ? FindPrimaryControlEntityId(category, entityOutputs) :
manualLightId ?? (displayOnly is not null ? null : FindPrimaryControlEntityId(category, entityOutputs));
discovered.Add(new HomeAssistantDiscoveredDeviceOutput
{
@@ -137,9 +146,27 @@ public sealed class HomeAssistantDeviceCatalog
Entities = entityOutputs, Metrics = ExtractDeviceMetrics(module.Category, entityOutputs)
});
}
foreach (var id in _manualLightIds)
{
if (_modules.ForEntities([id]) is not null ||
_options.ExcludedDeviceEntityIds.Contains(id, StringComparer.OrdinalIgnoreCase) ||
!stateMap.TryGetValue(id, out var state)) continue;
var name = state.GetStringAttribute("friendly_name") ?? id;
var available = IsAvailable(state);
list.Add(new()
{
DeviceId = $"fallback_{id}", Name = name, Category = nameof(HealthDeviceCategory.Lighting), Online = available,
PrimaryControlEntityId = state.EntityId, Entities = [new()
{
EntityId = state.EntityId, Domain = "light", Name = name, State = state.State,
Available = available, Attributes = ExtractSafeAttributes(state)
}]
});
}
foreach (var device in _options.DisplayOnlyDevices)
{
if (string.IsNullOrWhiteSpace(device.EntityId) || _modules.ForEntities([device.EntityId]) is not null ||
_manualLightIds.Contains(device.EntityId) ||
_options.ExcludedDeviceEntityIds.Contains(device.EntityId, StringComparer.OrdinalIgnoreCase)) continue;
stateMap.TryGetValue(device.EntityId, out var state);
var available = state is not null && IsAvailable(state);
Evergreen.Health.Application/Health/Devices/Lighting/ConfiguredSleepLightModule.cs
+10 -1
View File
@@ -25,8 +25,17 @@ public sealed class ConfiguredSleepLightModule : HealthDeviceModule
}
public override async Task SetPowerAsync(bool turnOn, CancellationToken token)
{
if (turnOn) { await _transition.StartSleepAsync(2700, token); return; }
if (turnOn && _light.StartSleepOnManualPowerOn)
{
await _transition.StartSleepAsync(2700, token);
return;
}
await _transition.CancelAsync(token);
if (turnOn)
{
await base.SetPowerAsync(true, token);
return;
}
var command = GetShutdownCommands().Single();
await Runner.SendAsync(command, token);
await Runner.VerifyParameterAsync(command, token);