Merge pull request #118 from ReneeVandervelde/scene-delete

Add delete-scene command/api
InkApplications · May 21, 2023 · a051922 · a051922
2 parents e224f18 + ee02493
commit a051922
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 8 deletions.
diff --git a/cli/src/main/kotlin/inkapplications/shade/cli/Main.kt b/cli/src/main/kotlin/inkapplications/shade/cli/Main.kt
@@ -14,10 +14,7 @@ import inkapplications.shade.cli.lights.ListLightsCommand
 import inkapplications.shade.cli.lights.UpdateLightCommand
 import inkapplications.shade.cli.resources.ListResourcesCommand
 import inkapplications.shade.cli.rooms.*
-import inkapplications.shade.cli.scenes.CreateSceneCommand
-import inkapplications.shade.cli.scenes.GetSceneCommand
-import inkapplications.shade.cli.scenes.ListScenesCommand
-import inkapplications.shade.cli.scenes.UpdateSceneCommand
+import inkapplications.shade.cli.scenes.*
 import inkapplications.shade.cli.zones.*
 import kotlin.system.exitProcess
 
@@ -30,6 +27,7 @@ class Main: NoOpCliktCommand() {
             CreateZoneCommand,
             DeleteDeviceCommand,
             DeleteRoomCommand,
+            DeleteSceneCommand,
             DeleteZoneCommand,
             DiscoverCommand,
             EventsCommand,

diff --git a/cli/src/main/kotlin/inkapplications/shade/cli/scenes/DeleteSceneCommand.kt b/cli/src/main/kotlin/inkapplications/shade/cli/scenes/DeleteSceneCommand.kt
@@ -0,0 +1,21 @@
+package inkapplications.shade.cli.scenes
+
+import com.github.ajalt.clikt.parameters.arguments.argument
+import inkapplications.shade.cli.AuthorizedShadeCommand
+import inkapplications.shade.cli.resourceId
+
+object DeleteSceneCommand: AuthorizedShadeCommand(
+    help = "Delete a scene from the hue bridge"
+) {
+    private val sceneId by argument().resourceId()
+
+    override suspend fun runCommand(): Int {
+        val response = shade.scenes.deleteScene(sceneId)
+
+        logger.debug("Got response: $response")
+
+        echo(response)
+
+        return 0
+    }
+}
diff --git a/scenes/api/scenes.api b/scenes/api/scenes.api
@@ -1,5 +1,6 @@
 public abstract interface class inkapplications/shade/scenes/SceneControls {
 	public abstract fun createScene (Linkapplications/shade/scenes/parameters/SceneCreateParameters;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun deleteScene-klA6Vuc (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun getScene-klA6Vuc (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun listScenes (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun updateScene-bKh5c1I (Ljava/lang/String;Linkapplications/shade/scenes/parameters/SceneUpdateParameters;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

diff --git a/scenes/src/commonMain/kotlin/inkapplications/shade/scenes/SceneControls.kt b/scenes/src/commonMain/kotlin/inkapplications/shade/scenes/SceneControls.kt
@@ -41,4 +41,12 @@ interface SceneControls {
      * @return A reference to the updated scene.
      */
     suspend fun updateScene(id: ResourceId, parameters: SceneUpdateParameters): ResourceReference
+
+    /**
+     * Delete a scene from the Hue Bridge.
+     *
+     * @param id The v2 resource ID of the Scene to delete.
+     * @return A reference to the deleted scene.
+     */
+    suspend fun deleteScene(id: ResourceId): ResourceReference
 }
diff --git a/scenes/src/commonMain/kotlin/inkapplications/shade/scenes/ShadeScenes.kt b/scenes/src/commonMain/kotlin/inkapplications/shade/scenes/ShadeScenes.kt
@@ -1,9 +1,6 @@
 package inkapplications.shade.scenes
 
-import inkapplications.shade.internals.HueHttpClient
-import inkapplications.shade.internals.getData
-import inkapplications.shade.internals.postData
-import inkapplications.shade.internals.putData
+import inkapplications.shade.internals.*
 import inkapplications.shade.scenes.parameters.SceneCreateParameters
 import inkapplications.shade.scenes.parameters.SceneUpdateParameters
 import inkapplications.shade.scenes.structures.Scene
@@ -38,4 +35,10 @@ internal class ShadeScenes(
 
         return response.single()
     }
+
+    override suspend fun deleteScene(id: ResourceId): ResourceReference {
+        val response = hueClient.deleteData<List<ResourceReference>>("resource", "scene", id.value)
+
+        return response.single()
+    }
 }