Added scenes with trigger/undo support, renamed Device NS to Models, …

…renamed Refresh to LoadAll
hagronnestad · Sep 14, 2023 · 42dd54a · 42dd54a
1 parent d624b5f
commit 42dd54a
Show file tree

Hide file tree

Showing 12 changed files with 120 additions and 13 deletions.
diff --git a/Dirigera.Lib/Dirigera.Lib/Api/ApiClient.cs b/Dirigera.Lib/Dirigera.Lib/Api/ApiClient.cs
@@ -81,6 +81,13 @@ public async Task<bool> CheckAuthToken()
             return res;
         }
 
+        public async Task<List<SceneDto>?> GetScenes()
+        {
+            string url = $"{_apiBaseUrl}/scenes";
+            var res = await _httpClient.GetFromJsonAsync<List<SceneDto>>(url);
+            return res;
+        }
+
         public async Task<T?> GetDevice<T>(string id)
         {
             string url = $"{_apiBaseUrl}/devices/{id}";
@@ -118,6 +125,21 @@ public async Task<HttpResponseMessage> PatchAttributesRoom(string roomId, Dictio
             return res;
         }
 
+        public async Task<HttpResponseMessage> TriggerScene(string sceneId)
+        {
+            string url = $"{_apiBaseUrl}/scenes/{sceneId}/trigger";
+            var res = await _httpClient.PostAsync(url, null);
+            return res;
+        }
+
+        public async Task<HttpResponseMessage> UndoScene(string sceneId)
+        {
+            string url = $"{_apiBaseUrl}/scenes/{sceneId}/undo";
+            var res = await _httpClient.PostAsync(url, null);
+            return res;
+        }
+
+
         public async Task<string?> SendChallenge(string codeVerifier)
         {
             string authUrl = $"{_apiBaseUrl}/oauth/authorize";

diff --git a/Dirigera.Lib/Dirigera.Lib/Api/Dto/SceneDto.cs b/Dirigera.Lib/Dirigera.Lib/Api/Dto/SceneDto.cs
@@ -0,0 +1,13 @@
+namespace Dirigera.Lib.Api.Dto
+{
+    internal class SceneDto
+    {
+        public string? Id { get; set; }
+        public SceneInfoDto? Info { get; set; }
+        public string? Type { get; set; }
+        public string? CreatedAt { get; set; }
+        public string? LastCompleted { get; set; }
+        public string? LastTriggered { get; set; }
+        public int UndoAllowedDuration { get; set; }
+    }
+}
diff --git a/Dirigera.Lib/Dirigera.Lib/Api/Dto/SceneInfoDto.cs b/Dirigera.Lib/Dirigera.Lib/Api/Dto/SceneInfoDto.cs
@@ -0,0 +1,8 @@
+namespace Dirigera.Lib.Api.Dto
+{
+    internal class SceneInfoDto
+    {
+        public string? Name { get; set; }
+        public string? Icon { get; set; }
+    }
+}
diff --git a/Dirigera.Lib/Dirigera.Lib/DirigeraManager.cs b/Dirigera.Lib/Dirigera.Lib/DirigeraManager.cs
@@ -1,8 +1,8 @@
 using Dirigera.Lib.Api;
 using Dirigera.Lib.Api.Dto.Base;
 using Dirigera.Lib.Constants;
-using Dirigera.Lib.Devices;
-using Dirigera.Lib.Devices.Base;
+using Dirigera.Lib.Models;
+using Dirigera.Lib.Models.Base;
 using Dirigera.Models;
 using System.Drawing;
 using Zeroconf;
@@ -20,6 +20,7 @@ public class DirigeraManager
 
         public Hub? Hub { get; set; }
         public List<Room> Rooms { get; set; } = new();
+        public List<Scene> Scenes { get; set; } = new();
         public List<Device> Devices { get; set; } = new();
         public List<Light> Lights { get; set; } = new();
         public List<Blind> Blinds { get; set; } = new();
@@ -40,11 +41,12 @@ public DirigeraManager(string ipAddress, string? authToken = null)
             _apiClient = new ApiClient(ipAddress, authToken);
         }
 
-        public async Task Refresh()
+        public async Task LoadAll()
         {
             await GetHubDetails();
             await GetDevices();
             await GetRooms();
+            await GetScenes();
         }
 
 
@@ -92,6 +94,27 @@ private async Task GetRooms()
                 .ToList();
         }
 
+        private async Task GetScenes()
+        {
+            var scenes = await _apiClient.GetScenes();
+            if (scenes is null) return;
+
+            Scenes = scenes
+                .Select(x => new Scene(this)
+                {
+                    Id = x.Id,
+                    Name = x.Info?.Name,
+                    Icon = x.Info?.Icon,
+                    Type = x.Type,
+                    CreatedAt = x.CreatedAt,
+                    LastCompleted = x.LastCompleted,
+                    LastTriggered = x.LastTriggered,
+                    UndoAllowedDuration = x.UndoAllowedDuration
+                })
+                .Where(x => x != null)
+                .ToList();
+        }
+
         public async Task SetLightState(Light light, bool state)
         {
             if (light is null || light.Id is null) return;
@@ -203,6 +226,18 @@ await _apiClient.PatchAttributes(outlet.Id, new Dictionary<string, object>()
             });
         }
 
+        public async Task TriggerScene(Scene scene)
+        {
+            if (scene is null || scene.Id is null) return;
+            await _apiClient.TriggerScene(scene.Id);
+        }
+
+        public async Task UndoScene(Scene scene)
+        {
+            if (scene is null || scene.Id is null) return;
+            await _apiClient.UndoScene(scene.Id);
+        }
+
 
         /// <summary>
         /// Create a <see cref="DirigeraManager"/> object by automatically discovering your IKEA DIRIGERA hub on your network.

diff --git a/...a.Lib/Dirigera.Lib/Devices/Base/Device.cs → ...ra.Lib/Dirigera.Lib/Models/Base/Device.cs b/...a.Lib/Dirigera.Lib/Devices/Base/Device.cs → ...ra.Lib/Dirigera.Lib/Models/Base/Device.cs
@@ -1,7 +1,7 @@
 using Dirigera.Lib.Api.Dto.Base;
 using System.Text.Json;
 
-namespace Dirigera.Lib.Devices.Base
+namespace Dirigera.Lib.Models.Base
 {
     public class Device
     {

diff --git a/Dirigera.Lib/Dirigera.Lib/Devices/Blind.cs → Dirigera.Lib/Dirigera.Lib/Models/Blind.cs b/Dirigera.Lib/Dirigera.Lib/Devices/Blind.cs → Dirigera.Lib/Dirigera.Lib/Models/Blind.cs
@@ -1,6 +1,6 @@
 using Dirigera.Lib;
 using Dirigera.Lib.Api.Dto.Base;
-using Dirigera.Lib.Devices.Base;
+using Dirigera.Lib.Models.Base;
 
 namespace Dirigera.Models
 {

diff --git a/...Dirigera.Lib/Devices/EnvironmentSensor.cs → .../Dirigera.Lib/Models/EnvironmentSensor.cs b/...Dirigera.Lib/Devices/EnvironmentSensor.cs → .../Dirigera.Lib/Models/EnvironmentSensor.cs
@@ -1,6 +1,6 @@
 using Dirigera.Lib;
 using Dirigera.Lib.Api.Dto.Base;
-using Dirigera.Lib.Devices.Base;
+using Dirigera.Lib.Models.Base;
 
 namespace Dirigera.Models
 {

diff --git a/Dirigera.Lib/Dirigera.Lib/Devices/Hub.cs → Dirigera.Lib/Dirigera.Lib/Models/Hub.cs b/Dirigera.Lib/Dirigera.Lib/Devices/Hub.cs → Dirigera.Lib/Dirigera.Lib/Models/Hub.cs
@@ -1,7 +1,7 @@
 using Dirigera.Lib.Api.Dto;
-using Dirigera.Lib.Devices.Base;
+using Dirigera.Lib.Models.Base;
 
-namespace Dirigera.Lib.Devices
+namespace Dirigera.Lib.Models
 {
     public class Hub : Device
     {

diff --git a/Dirigera.Lib/Dirigera.Lib/Devices/Light.cs → Dirigera.Lib/Dirigera.Lib/Models/Light.cs b/Dirigera.Lib/Dirigera.Lib/Devices/Light.cs → Dirigera.Lib/Dirigera.Lib/Models/Light.cs
@@ -1,7 +1,7 @@
 using Dirigera.Lib;
 using Dirigera.Lib.Api.Dto.Base;
 using Dirigera.Lib.Constants;
-using Dirigera.Lib.Devices.Base;
+using Dirigera.Lib.Models.Base;
 using System.Drawing;
 
 namespace Dirigera.Models

diff --git a/Dirigera.Lib/Dirigera.Lib/Devices/Outlet.cs → Dirigera.Lib/Dirigera.Lib/Models/Outlet.cs b/Dirigera.Lib/Dirigera.Lib/Devices/Outlet.cs → Dirigera.Lib/Dirigera.Lib/Models/Outlet.cs
@@ -1,6 +1,6 @@
 using Dirigera.Lib;
 using Dirigera.Lib.Api.Dto.Base;
-using Dirigera.Lib.Devices.Base;
+using Dirigera.Lib.Models.Base;
 
 namespace Dirigera.Models
 {

diff --git a/Dirigera.Lib/Dirigera.Lib/Devices/Room.cs → Dirigera.Lib/Dirigera.Lib/Models/Room.cs b/Dirigera.Lib/Dirigera.Lib/Devices/Room.cs → Dirigera.Lib/Dirigera.Lib/Models/Room.cs
@@ -1,6 +1,4 @@
-using Dirigera.Lib.Api.Dto;
-
-namespace Dirigera.Lib.Devices
+namespace Dirigera.Lib.Models
 {
     public class Room
     {

diff --git a/Dirigera.Lib/Dirigera.Lib/Models/Scene.cs b/Dirigera.Lib/Dirigera.Lib/Models/Scene.cs
@@ -0,0 +1,31 @@
+namespace Dirigera.Lib.Models
+{
+    public class Scene
+    {
+        private readonly DirigeraManager _dirigeraManager;
+
+        public string? Id { get; internal set; }
+        public string? Name { get; internal set; }
+        public string? Icon { get; internal set; }
+        public string? Type { get; set; }
+        public string? CreatedAt { get; set; }
+        public string? LastCompleted { get; set; }
+        public string? LastTriggered { get; set; }
+        public int UndoAllowedDuration { get; set; }
+
+        internal Scene(DirigeraManager dirigeraManager)
+        {
+            _dirigeraManager = dirigeraManager;
+        }
+
+        public async Task Trigger()
+        {
+            await _dirigeraManager.TriggerScene(this);
+        }
+
+        public async Task Undo()
+        {
+            await _dirigeraManager.UndoScene(this);
+        }
+    }
+}