refactor: Remove utils module

Author: alixinne

src/api/flat.rs

@@ -4,12 +4,13 @@ use std::sync::Arc;
 
 use thiserror::Error;
 
+use super::types::i32_to_duration;
+
 use crate::{
     component::ComponentName,
     global::{Global, InputMessage, InputMessageData, InputSourceHandle, InputSourceName},
     image::{RawImage, RawImageError},
     models::Color,
-    utils::i32_to_duration,
 };
 
 /// Schema definitions as Serde serializable structures and enums

src/api/proto.rs

@@ -3,12 +3,13 @@ use std::sync::Arc;
 
 use thiserror::Error;
 
+use super::types::i32_to_duration;
+
 use crate::{
     component::ComponentName,
     global::{InputMessage, InputMessageData, InputSourceHandle},
     image::{RawImage, RawImageError},
     models::Color,
-    utils::i32_to_duration,
 };
 
 /// Schema definitions as Serde serializable structures and enums

src/api/types.rs

@@ -4,13 +4,21 @@ use crate::{
     component::ComponentName,
     global::{InputMessageData, Message},
     models::Color,
-    utils::color_to_hsl,
 };
 
 fn not_positive(x: &i64) -> bool {
     !(*x > 0)
 }
 
+fn color_to_hsl(color: Color) -> palette::Hsl {
+    let (r, g, b) = color.into_components();
+    palette::Hsl::from(palette::LinSrgb::new(
+        r as f32 / 255.0,
+        g as f32 / 255.0,
+        b as f32 / 255.0,
+    ))
+}
+
 #[derive(Debug, Serialize)]
 pub struct PriorityInfo {
     pub priority: i32,
@@ -90,3 +98,15 @@ impl From<&Color> for LedColor {
         }
     }
 }
+
+pub fn i32_to_duration(d: Option<i32>) -> Option<chrono::Duration> {
+    if let Some(d) = d {
+        if d <= 0 {
+            None
+        } else {
+            Some(chrono::Duration::milliseconds(d as _))
+        }
+    } else {
+        None
+    }
+}

src/color.rs

@@ -2,10 +2,7 @@ use std::{convert::TryFrom, num::ParseIntError};
 
 use slotmap::{DefaultKey, SlotMap};
 
-use crate::{
-    models::{Color, Color16},
-    utils::{color_to16, color_to8},
-};
+use crate::models::{Color, Color16};
 
 #[derive(Default, Debug, Clone, Copy)]
 struct RgbChannelAdjustment {
@@ -358,3 +355,13 @@ impl ChannelAdjustments {
         }
     }
 }
+
+pub fn color_to8(color: Color16) -> Color {
+    let (r, g, b) = color.into_components();
+    Color::from_components(((r >> 8) as u8, (g >> 8) as u8, (b >> 8) as u8))
+}
+
+pub fn color_to16(color: Color) -> Color16 {
+    let (r, g, b) = color.into_components();
+    Color16::from_components(((r as u16) << 8, (g as u16) << 8, (b as u16) << 8))
+}

src/instance.rs

@@ -65,7 +65,7 @@ impl Instance {
     }
 
     fn handle_color(&mut self, color: models::Color) {
-        let color = crate::utils::color_to16(color);
+        let color = crate::color::color_to16(color);
         self.color_data.iter_mut().map(|x| *x = color).count();
     }
 

src/instance/smoothing.rs

@@ -80,7 +80,7 @@ impl Smoothing {
 
         // Convert current data to led data
         for (src, dst) in self.current_data.iter().zip(self.led_data.iter_mut()) {
-            *dst = crate::utils::color_to8(*src);
+            *dst = crate::color::color_to8(*src);
         }
     }
 

src/lib.rs

@@ -11,4 +11,3 @@ pub mod instance;
 pub mod models;
 pub mod serde;
 pub mod servers;
-pub mod utils;