Handle solar noon in scheduler and add tests to workflow

t1m0thyj · Jan 8, 2024 · fb65795 · fb65795
1 parent 06825b3
commit fb65795
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,3 +52,6 @@ jobs:
       with:
         name: msix-${{ matrix.platform }}
         path: uwp\AppPackages\**\*.msix
+
+    - run: dotnet test --verbosity normal
+      working-directory: test
diff --git a/src/SolarScheduler.cs b/src/SolarScheduler.cs
@@ -45,7 +45,7 @@ public static List<DateTime> GetAllImageTimes(ThemeConfig theme)
                 {
                     if (data.polarPeriod == PolarPeriod.PolarDay)
                     {
-                        times.Add(DateTime.Today + TimeSpan.FromTicks(TimeSpan.FromDays(1).Ticks * i / theme.dayImageList.Length));
+                        times.Add(data.solarNoon.AddHours(-12) + TimeSpan.FromTicks(TimeSpan.FromDays(1).Ticks * i / theme.dayImageList.Length));
                     }
                     else
                     {
@@ -63,7 +63,7 @@ public static List<DateTime> GetAllImageTimes(ThemeConfig theme)
                 {
                     if (data.polarPeriod == PolarPeriod.PolarNight)
                     {
-                        times.Add(DateTime.Today + TimeSpan.FromTicks(TimeSpan.FromDays(1).Ticks * i / theme.nightImageList.Length));
+                        times.Add(data.solarNoon.AddHours(-12) + TimeSpan.FromTicks(TimeSpan.FromDays(1).Ticks * i / theme.nightImageList.Length));
                     }
                     else
                     {
@@ -170,8 +170,8 @@ public static void CalcNextUpdateTime(SolarData data, DisplayEvent e)
                 {
                     imageList = e.currentTheme?.nightImageList;
                 }
-                segmentStart = dateNow.Date;
-                segmentEnd = dateNow.Date.AddDays(1);
+                segmentStart = data.solarNoon.AddHours(-12);
+                segmentEnd = data.solarNoon.AddHours(12).AddTicks(-1);
             }
             else if (!preferSegment2)
             {