Merge pull request #13 from michielpost/feature/HueApiV2

HueApi v2 support
michielpost · Feb 20, 2023 · 166f2d9 · 166f2d9
2 parents 5a192b2 + c803c48
commit 166f2d9
Show file tree

Hide file tree

Showing 96 changed files with 1,162 additions and 746 deletions.
diff --git a/.github/workflows/docker-github.yml b/.github/workflows/docker-github.yml
@@ -0,0 +1,57 @@
+name: Docker - GitHub Registry
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+    paths-ignore:
+      - '**.md'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      # this is a little bit of "dark magick"...
+      # Github Registry seems to hate Usernames Containing UpperCase...
+      #
+      # this metadata action normalizes the image tags into something useable.
+      # I'm not sure it's the _best_ set of Docker Tags to use.
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ghcr.io/${{ github.repository_owner }}/${{ github.repository }}${{ env.TAG }}
+          tags: |
+            type=raw,value=1.0.${{ github.run_number }},priority=1000
+            type=ref,event=branch
+            type=sha
+            type=raw,value=latest
+
+      - name: Log in to ghcr
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - if: startsWith(github.ref, 'refs/heads/master')
+        run: echo "TAG=latest" >> $GITHUB_ENV
+
+      - if: startsWith(github.ref, 'refs/tags')
+        run: echo "TAG=$(git describe --tags)" >> $GITHUB_ENV
+
+      - name: Build & Push
+        uses: docker/build-push-action@v4
+        with:
+          context: ./
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -34,7 +34,7 @@ jobs:
           images: michielpost/huelightdj
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: true

diff --git a/HueLightDJ.Effects/Base/HueEffectAttribute.cs b/HueLightDJ.Effects/Base/HueEffectAttribute.cs
@@ -9,7 +9,7 @@ public class HueEffectAttribute : Attribute
 
     public int Order { get; set; } = 100;
 
-    public string Name { get; set; }
+    public required string Name { get; set; }
     public string Group { get; set; } = "Other";
 
     /// <summary>
@@ -19,6 +19,6 @@ public class HueEffectAttribute : Attribute
 
     public bool HasColorPicker { get; set; } = true;
 
-    public string DefaultColor { get; set; }
+    public string? DefaultColor { get; set; }
   }
 }
diff --git a/HueLightDJ.Effects/Base/IHueEffect.cs b/HueLightDJ.Effects/Base/IHueEffect.cs
@@ -1,5 +1,5 @@
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Models;
 using System;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/HueLightDJ.Effects/Base/IHueGroupEffect.cs b/HueLightDJ.Effects/Base/IHueGroupEffect.cs
@@ -1,6 +1,6 @@
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Threading;

diff --git a/HueLightDJ.Effects/Base/IHueTouchEffect.cs b/HueLightDJ.Effects/Base/IHueTouchEffect.cs
@@ -1,5 +1,5 @@
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Models;
 using System;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/HueLightDJ.Effects/EffectSettings.cs b/HueLightDJ.Effects/EffectSettings.cs
@@ -1,4 +1,4 @@
-using Q42.HueApi.Models.Groups;
+using HueApi.Models;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -7,7 +7,7 @@ namespace HueLightDJ.Effects
 {
   public static class EffectSettings
   {
-    public static LightLocation LocationCenter { get; set; } = new LightLocation() { 0, 0, 0 };
+    public static HuePosition LocationCenter { get; set; } = new HuePosition();
 
   }
 }
diff --git a/HueLightDJ.Effects/Group/FlashFadeEffect.cs b/HueLightDJ.Effects/Group/FlashFadeEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/HueLightDJ.Effects/Group/QuickFlashEffect.cs b/HueLightDJ.Effects/Group/QuickFlashEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/HueLightDJ.Effects/Group/RandomColorloopEffect.cs b/HueLightDJ.Effects/Group/RandomColorloopEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/HueLightDJ.Effects/Group/RandomColorsEffect.cs b/HueLightDJ.Effects/Group/RandomColorsEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/HueLightDJ.Effects/Group/TrailingLightEffect.cs b/HueLightDJ.Effects/Group/TrailingLightEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/HueLightDJ.Effects/HueLightDJ.Effects.csproj b/HueLightDJ.Effects/HueLightDJ.Effects.csproj
@@ -3,13 +3,13 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <WarningsAsErrors>CS8600;CS8601;CS8602;CS8603;CS8625;CS8613</WarningsAsErrors>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Q42.HueApi" Version="3.21.0" />
-    <PackageReference Include="Q42.HueApi.ColorConverters" Version="3.20.1" />
-    <PackageReference Include="Q42.HueApi.Entertainment" Version="3.20.1" />
+    <PackageReference Include="HueApi" Version="1.0.0" />
+    <PackageReference Include="HueApi.ColorConverters" Version="1.0.0" />
+    <PackageReference Include="HueApi.Entertainment" Version="1.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/HueLightDJ.Effects/Layers/DemoEffect.cs b/HueLightDJ.Effects/Layers/DemoEffect.cs
@@ -4,8 +4,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Models;
 
 namespace HueLightDJ.Effects.Layers
 {

diff --git a/HueLightDJ.Effects/Layers/Flashing/QuickFlashAllEffect.cs b/HueLightDJ.Effects/Layers/Flashing/QuickFlashAllEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/HueLightDJ.Effects/Layers/Flashing/QuickFlashEffect.cs b/HueLightDJ.Effects/Layers/Flashing/QuickFlashEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/HueLightDJ.Effects/Layers/Flashing/QuickFlashFrontBackEffect.cs b/HueLightDJ.Effects/Layers/Flashing/QuickFlashFrontBackEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/HueLightDJ.Effects/Layers/Flashing/QuickFlashRandomEffect.cs b/HueLightDJ.Effects/Layers/Flashing/QuickFlashRandomEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/HueLightDJ.Effects/Layers/Party/ColorloopWheelDoubleEffect.cs b/HueLightDJ.Effects/Layers/Party/ColorloopWheelDoubleEffect.cs
@@ -1,9 +1,9 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Effects.BasEffects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Effects.BasEffects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

diff --git a/HueLightDJ.Effects/Layers/Party/RainbowBottomTopEffect.cs b/HueLightDJ.Effects/Layers/Party/RainbowBottomTopEffect.cs
@@ -1,10 +1,10 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.ColorConverters.HSB;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Effects.BasEffects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.ColorConverters.HSB;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Effects.BasEffects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

diff --git a/HueLightDJ.Effects/Layers/Party/RandomBottomTopEffect.cs b/HueLightDJ.Effects/Layers/Party/RandomBottomTopEffect.cs
@@ -1,10 +1,10 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.ColorConverters.HSB;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Effects.BasEffects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.ColorConverters.HSB;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Effects.BasEffects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

diff --git a/HueLightDJ.Effects/Layers/Party/RandomColorsEffect.cs b/HueLightDJ.Effects/Layers/Party/RandomColorsEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/HueLightDJ.Effects/Layers/Party/RandomPulseEffect.cs b/HueLightDJ.Effects/Layers/Party/RandomPulseEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -19,7 +19,7 @@ public Task Start(EntertainmentLayer layer, Func<TimeSpan> waitTime, RGBColor? c
       Func<TimeSpan> customWaitTime = () => waitTime() / 10;
       var center = EffectSettings.LocationCenter;
 
-      var randomPulseEffect = new Q42.HueApi.Streaming.Effects.RandomPulseEffect(fadeToZero: false, waitTime: customWaitTime);
+      var randomPulseEffect = new HueApi.Entertainment.Effects.Examples.RandomPulseEffect(fadeToZero: false, waitTime: customWaitTime);
       randomPulseEffect.X = center.X;
       randomPulseEffect.Y = center.Y;
       layer.PlaceEffect(randomPulseEffect);

diff --git a/HueLightDJ.Effects/Layers/Party/RandomPulseRetraceEffect.cs b/HueLightDJ.Effects/Layers/Party/RandomPulseRetraceEffect.cs
@@ -1,8 +1,8 @@
 using HueLightDJ.Effects.Base;
-using Q42.HueApi.ColorConverters;
-using Q42.HueApi.Streaming.Effects;
-using Q42.HueApi.Streaming.Extensions;
-using Q42.HueApi.Streaming.Models;
+using HueApi.ColorConverters;
+using HueApi.Entertainment.Effects;
+using HueApi.Entertainment.Extensions;
+using HueApi.Entertainment.Models;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -19,7 +19,7 @@ public Task Start(EntertainmentLayer layer, Func<TimeSpan> waitTime, RGBColor? c
       Func<TimeSpan> customWaitTime = () => waitTime() / 10;
 
       var center = EffectSettings.LocationCenter;
-      var randomPulseEffect = new Q42.HueApi.Streaming.Effects.RandomPulseEffect(waitTime: customWaitTime);
+      var randomPulseEffect = new HueApi.Entertainment.Effects.Examples.RandomPulseEffect(waitTime: customWaitTime);
       randomPulseEffect.X = center.X;
       randomPulseEffect.Y = center.Y;
       layer.PlaceEffect(randomPulseEffect);