Refactor code to local function in rgb timer to cleanup main loop

Author: MoshiMoshi0

Source/TTController.Service/TTService.cs

@@ -301,40 +301,14 @@ private bool DeviceSpeedTimerCallback()
 
         public bool DeviceRgbTimerCallback()
         {
-            foreach (var profile in _configManager.CurrentConfig.Profiles)
+            void ApplyConfig(IDictionary<PortIdentifier, List<LedColor>> colorMap)
             {
-                var effects = _effectManager.GetEffects(profile.Guid);
-                var effect = effects?.FirstOrDefault(e => e.IsEnabled(_cache.AsReadOnly()));
-                if (effect == null)
-                    continue;
-
-                IDictionary<PortIdentifier, List<LedColor>> colorMap;
-                string effectType;
-
-                try
-                {
-                    colorMap = effect.GenerateColors(profile.Ports, _cache.AsReadOnly());
-                    effectType = effect.EffectType;
-                }
-                catch (Exception e)
-                {
-                    Logger.Fatal("{0} failed with {1}", effect.GetType().Name, e);
-                    colorMap = profile.Ports.ToDictionary(p => p, _ => new List<LedColor>() { new LedColor(255, 0, 0) } );
-                    effectType = "Full";
-                }
-
-                if (colorMap == null)
-                    continue;
-
-                foreach (var port in profile.Ports)
+                foreach (var port in colorMap.Keys.ToList())
                 {
                     var config = _cache.GetPortConfig(port);
                     if (config == null)
                         continue;
 
-                    if (!colorMap.ContainsKey(port))
-                        continue;
-
                     var colors = colorMap[port];
 
                     if (config.LedRotation > 0)
@@ -345,19 +319,19 @@ public bool DeviceRgbTimerCallback()
                     switch (config.LedCountHandling)
                     {
                         case LedCountHandling.Lerp:
-                        {
-                            if (config.LedCount == colors.Count)
-                                break;
+                            {
+                                if (config.LedCount == colors.Count)
+                                    break;
 
-                            var newColors = new List<LedColor>();
-                            var gradient = new LedColorGradient(colors, config.LedCount - 1);
+                                var newColors = new List<LedColor>();
+                                var gradient = new LedColorGradient(colors, config.LedCount - 1);
 
-                            for (var i = 0; i < config.LedCount; i++)
-                                newColors.Add(gradient.GetColor(i));
+                                for (var i = 0; i < config.LedCount; i++)
+                                    newColors.Add(gradient.GetColor(i));
 
-                            colors = newColors;
-                            break;
-                        }
+                                colors = newColors;
+                                break;
+                            }
                         case LedCountHandling.Trim:
                             if (config.LedCount < colors.Count)
                                 colors.RemoveRange(config.LedCount, colors.Count - config.LedCount);
@@ -373,6 +347,34 @@ public bool DeviceRgbTimerCallback()
 
                     colorMap[port] = colors;
                 }
+            }
+
+            foreach (var profile in _configManager.CurrentConfig.Profiles)
+            {
+                var effects = _effectManager.GetEffects(profile.Guid);
+                var effect = effects?.FirstOrDefault(e => e.IsEnabled(_cache.AsReadOnly()));
+                if (effect == null)
+                    continue;
+
+                IDictionary<PortIdentifier, List<LedColor>> colorMap;
+                string effectType;
+
+                try
+                {
+                    colorMap = effect.GenerateColors(profile.Ports, _cache.AsReadOnly());
+                    effectType = effect.EffectType;
+                }
+                catch (Exception e)
+                {
+                    Logger.Fatal("{0} failed with {1}", effect.GetType().Name, e);
+                    colorMap = profile.Ports.ToDictionary(p => p, _ => new List<LedColor>() { new LedColor(255, 0, 0) });
+                    effectType = "Full";
+                }
+
+                if (colorMap == null)
+                    continue;
+
+                ApplyConfig(colorMap);
 
                 lock (_deviceManager)
                 {