Merge 39aee30 into 0c3ae8b

net-daemon · Aug 16, 2020 · 403bcc9 · 403bcc9
2 parents 0c3ae8b + 39aee30
commit 403bcc9
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 73 deletions.
diff --git a/exampleapps/apps/test2.cs b/exampleapps/apps/test2.cs
@@ -24,7 +24,7 @@ public override async Task InitializeAsync()
             // Log(Remote.Tvrummet.Area);
 
             // SetState("sensor.testing", "on", new { attributeobject = new { aobject = "hello" } });
-            // RunEvery(TimeSpan.FromSeconds(5), () => Log("Hello world!"));
+            RunEvery(TimeSpan.FromSeconds(5), () => Log("Hello world!"));
             // RunDaily("13:00:00", () => Log("Hello world!"));
             // RunIn(TimeSpan.FromSeconds(5), () => Entity("light.tomas_rum").TurnOn());
             // Entity("light.tomas_rum")

diff --git a/src/App/NetDaemon.App/Common/INetDaemon.cs b/src/App/NetDaemon.App/Common/INetDaemon.cs
@@ -349,6 +349,11 @@ public interface INetDaemonAppBase :
         /// </summary>
         public string? Id { get; set; }
 
+        /// <summary>
+        ///     Unique id of the application entity
+        /// </summary>
+        public string EntityId { get; }
+
         /// <summary>
         ///     Returns the description, is the decorating comment of app class
         /// </summary>

diff --git a/src/App/NetDaemon.App/Common/Messages.cs b/src/App/NetDaemon.App/Common/Messages.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Text.Json;
 using NetDaemon.Common.Fluent;
@@ -100,8 +101,37 @@ public class EntityState : IEntityProperties
         /// Context
         /// </summary>
         public Context? Context { get; set; }
+
+        /// <summary>
+        ///     returns a pretty print of EntityState
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            string attributes = "";
+            if (Attribute is IDictionary attr)
+            {
+                foreach (var key in attr.Keys)
+                {
+                    if (key is object)
+                    {
+                        attributes = attributes + string.Format("       {0}:{1}", key, attr[key]);
+                    }
+                }
+            }
+            return string.Format(@"
+                EntityId:       {0}
+                State:          {1}
+                Area:           {2}
+                LastChanged:    {3}
+                LastUpdated:    {4}
+                Attributes:
+                {5}
+            ", EntityId, State, Area, LastChanged, LastUpdated, attributes);
+        }
     }
 
+
     /// <summary>
     ///     Unit system parameters for Home Assistant
     /// </summary>

diff --git a/src/App/NetDaemon.App/Common/NetDaemonAppBase.cs b/src/App/NetDaemon.App/Common/NetDaemonAppBase.cs
@@ -157,7 +157,6 @@ public async Task RestoreAppStateAsync()
             }
 
             var appInfo = _daemon!.State.FirstOrDefault(s => s.EntityId == EntityId);
-
             var appState = appInfo?.State as string;
             if (appState == null || (appState != "on" && appState != "off"))
             {
@@ -169,7 +168,8 @@ public async Task RestoreAppStateAsync()
             IsEnabled = appState == "on";
         }
 
-        private string EntityId => $"switch.netdaemon_{Id?.ToSafeHomeAssistantEntityId()}";
+        /// <inheritdoc/>
+        public string EntityId => $"switch.netdaemon_{Id?.ToSafeHomeAssistantEntityId()}";
 
         AppRuntimeInfo _runtimeInfo = new AppRuntimeInfo { HasError = false };
 
@@ -202,6 +202,17 @@ public virtual Task StartUpAsync(INetDaemon daemon)
             Logger = daemon.Logger;
 
             Logger.LogInformation("Startup: {app}", GetUniqueIdForStorage());
+
+            var appInfo = _daemon!.State.FirstOrDefault(s => s.EntityId == EntityId);
+            var appState = appInfo?.State as string;
+            if (appState == null || (appState != "on" && appState != "off"))
+            {
+                IsEnabled = true;
+            }
+            else
+            {
+                IsEnabled = appState == "on";
+            }
             UpdateRuntimeInformation();
             return Task.CompletedTask;
         }
@@ -300,9 +311,6 @@ public void Log(LogLevel level, Exception exception, string message, params obje
             }
         }
 
-
-
-
         /// <inheritdoc/>
         public void Log(Exception exception, string message, params object[] param) => LogInformation(exception, message, param);
 

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs b/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs
@@ -547,6 +547,7 @@ public void SetState(string entityId, dynamic state, dynamic? attributes = null)
                 if (result != null)
                 {
                     EntityState entityState = result.Map();
+                    entityState.State = state;
                     entityState.Area = GetAreaForEntityId(entityState.EntityId);
                     InternalState[entityState.EntityId] = entityState;
                     return entityState;
@@ -604,7 +605,7 @@ public async Task UnloadAllApps()
             if (_runningAppInstances is null || _runningAppInstances.Count() == 0)
                 return;
 
-            foreach (var app in _runningAppInstances)
+            foreach (var app in _allAppInstances)
             {
                 await app.Value.DisposeAsync().ConfigureAwait(false);
             }
@@ -682,22 +683,6 @@ internal static bool FixStateTypes(HassStateChangedEventData stateData)
             return true;
         }
 
-        // public void StopDaemonActivities()
-        // {
-        //     // Do some stuff to clear memory
-        //     // this is not nescessary now when
-        //     // we do not do hot-reload for recompile
-        //     // I keep this in-case we go that route
-        //     _hassAreas.Clear();
-        //     _hassDevices.Clear();
-        //     _hassEntities.Clear();
-        //     _runningAppInstances.Clear();
-        //     _daemonServiceCallFunctions.Clear();
-        //     _eventHandlerTasks.Clear();
-        //     _dataCache.Clear();
-        //     GC.Collect();
-        //     GC.WaitForPendingFinalizers();
-        // }
         internal string? GetAreaForEntityId(string entityId)
         {
             HassEntity? entity;
@@ -1293,20 +1278,64 @@ async Task SetStateOnDaemonAppSwitch(string state, dynamic? data)
                 if (!entityId.StartsWith("switch.netdaemon_"))
                     return; // We only want app switches
 
-                List<(string, object)>? attributes = null;
 
-                var entityAttributes = GetState(entityId)?.Attribute as IDictionary<string, object>;
+                SetDependentState(entityId, state);
 
-                if (entityAttributes is object)
-                    attributes = entityAttributes.Keys.Select(n => (n, entityAttributes[n])).ToList();
 
-                if (attributes is object)
-                    await SetStateAsync(entityId, state, attributes.ToArray()).ConfigureAwait(false);
-                else
-                    await SetStateAsync(entityId, state).ConfigureAwait(false);
+
+                await ReloadAllApps();
+
             }
         }
 
+        private async Task SetDependentState(string entityId, string state)
+        {
+            var app = _allAppInstances.Values.Where(n => n.EntityId == entityId).FirstOrDefault();
+
+            if (app is object)
+            {
+                if (state == "off")
+                {
+                    // We need to turn off any dependent apps
+                    var depApps = _allAppInstances.Values.Where(n => n.Dependencies.Contains(app.Id));
+
+                    foreach (var depApp in depApps)
+                    {
+                        await SetDependentState(depApp.EntityId, state).ConfigureAwait(false);
+                    }
+                    app.IsEnabled = false;
+                    Logger.LogError("SET APP {app} state = disabled", app.Id);
+                }
+                else if (state == "on")
+                {
+                    app.IsEnabled = true;
+                    // Enable all apps that this app is dependent on
+                    foreach (var depOnId in app.Dependencies)
+                    {
+                        var depOnApp = _allAppInstances.Values.Where(n => n.Id == depOnId).FirstOrDefault();
+                        if (depOnApp is object)
+                        {
+                            await SetDependentState(depOnApp.EntityId, state).ConfigureAwait(false);
+
+                        }
+                    }
+                    Logger.LogError("SET APP {app} state = enabled", app.Id);
+                }
+            }
+
+            List<(string, object)>? attributes = null;
+
+            var entityAttributes = GetState(entityId)?.Attribute as IDictionary<string, object>;
+
+            if (entityAttributes is object && entityAttributes.Count > 0)
+                attributes = entityAttributes.Keys.Select(n => (n, entityAttributes[n])).ToList();
+
+            if (attributes is object && attributes.Count > 0)
+                await SetStateAsync(entityId, state, attributes.ToArray()).ConfigureAwait(false);
+            else
+                await SetStateAsync(entityId, state).ConfigureAwait(false);
+
+        }
         private async Task<bool> RestoreAppState(INetDaemonAppBase appInstance)
         {
             try

diff --git a/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj b/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj
@@ -1,41 +1,41 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <RootNamespace>NetDaemon</RootNamespace>
-    <PackageId>JoySoftware.NetDaemon.DaemonRunner</PackageId>
-    <Version>0.1.29-alpha</Version>
-    <Authors>helto4real</Authors>
-    <Company>JoySoftware</Company>
-    <description>A .net core appdaemon for Home Assistant</description>
-    <projectUrl>https://github.com/helto4real/net-hassclient</projectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageDescription>
-      A client for manage the free open source home automations software Home Assisstant written in .net core 3.
-      Please see https://github.com/helto4real/net-hassclient/blob/main/README.md for docs.
-    </PackageDescription>
-    <PackageReleaseNotes>First alpha version, expect things to change!</PackageReleaseNotes>
-    <tags>Home Assistant</tags>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="0.7.0-beta" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.7" />
-    <PackageReference Include="YamlDotNet" Version="8.1.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\App\NetDaemon.App\NetDaemon.App.csproj" />
-    <ProjectReference Include="..\..\Daemon\NetDaemon.Daemon\NetDaemon.Daemon.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
+    <Nullable>enable</Nullable>
+    <RootNamespace>NetDaemon</RootNamespace>
+    <PackageId>JoySoftware.NetDaemon.DaemonRunner</PackageId>
+    <Version>0.1.29-alpha</Version>
+    <Authors>helto4real</Authors>
+    <Company>JoySoftware</Company>
+    <description>A .net core appdaemon for Home Assistant</description>
+    <projectUrl>https://github.com/helto4real/net-hassclient</projectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageDescription>
+      A client for manage the free open source home automations software Home Assisstant written in .net core 3.
+      Please see https://github.com/helto4real/net-hassclient/blob/main/README.md for docs.
+    </PackageDescription>
+    <PackageReleaseNotes>First alpha version, expect things to change!</PackageReleaseNotes>
+    <tags>Home Assistant</tags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JoySoftware.HassClient" Version="0.7.0-beta" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.7" />
+    <PackageReference Include="YamlDotNet" Version="8.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\App\NetDaemon.App\NetDaemon.App.csproj" />
+    <ProjectReference Include="..\..\Daemon\NetDaemon.Daemon\NetDaemon.Daemon.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/DaemonRunner/DaemonRunner/Service/API/ApiController.cs b/src/DaemonRunner/DaemonRunner/Service/API/ApiController.cs
@@ -19,6 +19,7 @@ public class ApiController : ControllerBase
         private readonly ILogger<ApiController> _logger;
         private readonly NetDaemonSettings? _netdaemonSettings;
         private readonly HomeAssistantSettings? _homeassistantSettings;
+        private static string[] validStates = new string[] { "enable", "disable" };
 
         private readonly NetDaemonHost? _host;
         public ApiController(
@@ -67,7 +68,7 @@ public ApiController(
             });
         }
 
-        private static string[] validStates = new string[] { "enable", "disable" };
+
         [HttpPost]
         [Route("app/state/{id?}/{state?}")]
         public IActionResult SetState([FromRoute] string id, [FromRoute] string state)