Greatly simplify and hopefully improve WallpaperChangeScheduler code

Author: t1m0thyj

src/FormWrapper.cs

@@ -7,7 +7,6 @@
 using System.Net;
 using System.Threading;
 using System.Windows.Forms;
-using Microsoft.Win32;
 
 namespace WinDynamicDesktop
 {
@@ -25,8 +24,7 @@ public FormWrapper()
         {
             Application.ApplicationExit += new EventHandler(OnApplicationExit);
             EnforceSingleInstance();
-            SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(OnPowerModeChanged);
-
+            
             JsonConfig.LoadConfig();
             _wcsService = new WallpaperChangeScheduler();
 
@@ -43,7 +41,7 @@ public FormWrapper()
             }
             else
             {
-                _wcsService.StartScheduler();
+                _wcsService.RunScheduler();
             }
         }
 
@@ -97,7 +95,7 @@ private void OnLocationItemClick(object sender, EventArgs e)
 
         private void OnRefreshItemClick(object sender, EventArgs e)
         {
-            _wcsService.StartScheduler(true);
+            _wcsService.RunScheduler(true);
         }
 
         private void OnDarkItemClick(object sender, EventArgs e)
@@ -186,7 +184,7 @@ private void OnDownloadDialogClosed(object sender, EventArgs e)
             {
                 if (JsonConfig.settings.location != null)
                 {
-                    _wcsService.StartScheduler(true);
+                    _wcsService.RunScheduler();
                 }
 
                 if (JsonConfig.firstRun && locationDialog == null)
@@ -237,28 +235,6 @@ private void BackgroundNotify()
             JsonConfig.firstRun = false;    // Don't show this message again
         }
 
-        private void OnPowerModeChanged(object sender, PowerModeChangedEventArgs e)
-        {
-            if (e.Mode == PowerModes.Suspend)
-            {
-                if (_wcsService.wallpaperTimer != null)
-                {
-                    _wcsService.wallpaperTimer.Stop();
-                }
-
-                _wcsService.enableTransitions = false;
-            }
-            else if (e.Mode == PowerModes.Resume)
-            {
-                if (JsonConfig.settings.location != null)
-                {
-                    _wcsService.StartScheduler();
-                }
-
-                _wcsService.enableTransitions = true;
-            }
-        }
-
         private void OnApplicationExit(object sender, EventArgs e)
         {
             if (downloadDialog != null)

src/InputDialog.cs

@@ -51,7 +51,7 @@ private void okButton_Click(object sender, EventArgs e)
 
                 if (Directory.Exists("images"))
                 {
-                    _wcsService.StartScheduler(true);
+                    _wcsService.RunScheduler(true);
                 }
 
                 MessageBox.Show("Location set successfully to: " + data.display_name +

src/WallpaperChangeScheduler.cs

@@ -13,17 +13,13 @@ class WallpaperChangeScheduler
     {
         private int[] dayImages;
         private int[] nightImages;
-
-        private bool isSunUp;
         private string lastDate = "yyyy-MM-dd";
         private int lastImageId = -1;
-        private int lastImageNumber = -1;
 
         private WeatherData yesterdaysData;
         private WeatherData todaysData;
         private WeatherData tomorrowsData;
 
-        public bool enableTransitions = true;
         public Timer wallpaperTimer = new Timer();
 
         public WallpaperChangeScheduler()
@@ -82,26 +78,23 @@ private void SetWallpaper(int imageId)
             string imageFilename = String.Format(JsonConfig.imageSettings.imageFilename, imageId);
             string imagePath = Path.Combine(Directory.GetCurrentDirectory(), "images", imageFilename);
 
-            if (enableTransitions)
-            {
-                WallpaperChanger.EnableTransitions();
-            }
-
+            WallpaperChanger.EnableTransitions();
             WallpaperChanger.SetWallpaper(imagePath);
 
             lastImageId = imageId;
         }
 
-        public void StartScheduler(bool forceRefresh = false)
+        public void RunScheduler(bool forceRefresh = false)
         {
             if (wallpaperTimer != null)
             {
                 wallpaperTimer.Stop();
             }
 
             string currentDate = GetDateString();
+            bool shouldRefresh = currentDate != lastDate || forceRefresh;
 
-            if (currentDate != lastDate || forceRefresh)
+            if (shouldRefresh)
             {
                 todaysData = GetWeatherData(currentDate);
                 lastDate = currentDate;
@@ -110,14 +103,22 @@ public void StartScheduler(bool forceRefresh = false)
             if (DateTime.Now < todaysData.SunriseTime)
             {
                 // Before sunrise
-                yesterdaysData = GetWeatherData(GetDateString(-1));
+                if (shouldRefresh || yesterdaysData == null)
+                {
+                    yesterdaysData = GetWeatherData(GetDateString(-1));
+                }
+
                 tomorrowsData = null;
             }
             else if (DateTime.Now > todaysData.SunsetTime)
             {
                 // After sunset
                 yesterdaysData = null;
-                tomorrowsData = GetWeatherData(GetDateString(1));
+
+                if (shouldRefresh || tomorrowsData == null)
+                {
+                    tomorrowsData = GetWeatherData(GetDateString(1));
+                }
             }
             else
             {
@@ -130,18 +131,16 @@ public void StartScheduler(bool forceRefresh = false)
 
             if (yesterdaysData == null && tomorrowsData == null)
             {
-                StartDaySchedule();
+                UpdateDayImage();
             }
             else
             {
-                StartNightSchedule();
+                UpdateNightImage();
             }
         }
 
-        private void StartDaySchedule()
+        private void UpdateDayImage()
         {
-            isSunUp = true;
-
             TimeSpan dayTime = todaysData.SunsetTime - todaysData.SunriseTime;
             TimeSpan timerLength = new TimeSpan(dayTime.Ticks / dayImages.Length);
             int imageNumber = GetImageNumber(todaysData.SunriseTime, timerLength);
@@ -152,37 +151,11 @@ private void StartDaySchedule()
             if (dayImages[imageNumber] != lastImageId)
             {
                 SetWallpaper(dayImages[imageNumber]);
-                lastImageNumber = imageNumber;
-            }
-        }
-
-        private void NextDayImage()
-        {
-            if (lastImageNumber == dayImages.Length - 1)
-            {
-                SwitchToNight();
-                return;
             }
-
-            TimeSpan dayTime = todaysData.SunsetTime - todaysData.SunriseTime;
-            StartTimer(dayTime.Ticks / dayImages.Length);
-
-            lastImageNumber++;
-            SetWallpaper(dayImages[lastImageNumber]);
         }
 
-        private void SwitchToNight()
+        private void UpdateNightImage()
         {
-            tomorrowsData = GetWeatherData(GetDateString(1));
-            lastImageNumber = -1;
-
-            StartNightSchedule();
-        }
-
-        private void StartNightSchedule()
-        {
-            isSunUp = false;
-
             WeatherData day1Data = (yesterdaysData == null) ? todaysData : yesterdaysData;
             WeatherData day2Data = (yesterdaysData == null) ? tomorrowsData : todaysData;
 
@@ -196,44 +169,9 @@ private void StartNightSchedule()
             if (nightImages[imageNumber] != lastImageId)
             {
                 SetWallpaper(nightImages[imageNumber]);
-                lastImageNumber = imageNumber;
-            }
-        }
-
-        private void NextNightImage()
-        {
-            if (lastImageNumber == nightImages.Length - 1)
-            {
-                SwitchToDay();
-                return;
-            }
-
-            WeatherData day1Data = (yesterdaysData == null) ? todaysData : yesterdaysData;
-            WeatherData day2Data = (yesterdaysData == null) ? tomorrowsData : todaysData;
-
-            TimeSpan nightTime = day2Data.SunriseTime - day1Data.SunsetTime;
-            StartTimer(nightTime.Ticks / nightImages.Length);
-
-            lastImageNumber++;
-            SetWallpaper(nightImages[lastImageNumber]);
-
-            if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour < 12 && tomorrowsData != null)
-            {
-                yesterdaysData = todaysData;
-                todaysData = tomorrowsData;
-                tomorrowsData = null;
-                lastDate = GetDateString();
             }
         }
 
-        private void SwitchToDay()
-        {
-            yesterdaysData = null;
-            lastImageNumber = -1;
-
-            StartDaySchedule();
-        }
-
         public void ToggleDarkMode()
         {
             if (!JsonConfig.settings.darkMode)
@@ -245,22 +183,15 @@ public void ToggleDarkMode()
                 dayImages = JsonConfig.imageSettings.dayImageList;
             }
 
-            StartScheduler();
+            RunScheduler();
             JsonConfig.settings.darkMode ^= true;
         }
 
         private void OnWallpaperTimerTick(object sender, EventArgs e)
         {
             wallpaperTimer.Stop();
 
-            if (isSunUp)
-            {
-                NextDayImage();
-            }
-            else
-            {
-                NextNightImage();
-            }
+            RunScheduler();
         }
     }
 }