Cleaned up dependencies

Author: Azarattum

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.6
+
+- Improved windows support
+- Refactors and optimizations
+
 ## 0.1.5
 
 - Added support for all OpenRGB SDK API requests

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ColorHoster"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2024"
 
 [dependencies]
@@ -9,13 +9,12 @@ async-hid = "0.2.0"
 chrono = "0.4.40"
 clap = { version = "4.5.32", features = ["derive"] }
 colored = "3.0.0"
-enumn = "0.1.14"
 evalexpr = "12.0.2"
 fern = { version = "0.7.1", features = ["colored"] }
 futures = "0.3.31"
-futures-lite = "2.6.0"
 itertools = "0.14.0"
 log = "0.4.26"
+num_enum = "0.7.3"
 palette = "0.7.6"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"

Cargo.toml

@@ -1,6 +1,6 @@
-use enumn::N;
+use num_enum::TryFromPrimitive;
 
-#[derive(PartialEq, Debug, N)]
+#[derive(PartialEq, Debug, TryFromPrimitive)]
 #[repr(u32)]
 pub enum Request {
     GetControllerCount = 0,

src/consts.rs

@@ -1,6 +1,6 @@
 use anyhow::{Result, anyhow};
 use async_hid::{AccessMode, Device, DeviceInfo};
-use futures_lite::StreamExt;
+use futures::{StreamExt, future::ready};
 use std::{
     pin::Pin,
     sync::{Arc, Mutex},
@@ -22,15 +22,16 @@ impl KeyboardDevice {
     pub async fn from_ids(vendor_id: u16, product_id: u16) -> Result<Self> {
         let hid = DeviceInfo::enumerate()
             .await?
-            .find(|info: &DeviceInfo| {
-                info.matches(QMK_USAGE_PAGE, QMK_USAGE_ID, vendor_id, product_id)
-            })
+            .filter(|info| ready(info.matches(QMK_USAGE_PAGE, QMK_USAGE_ID, vendor_id, product_id)))
+            .next()
             .await
-            .ok_or(anyhow!(
-                "A device cannot be detected (VID: {}, PID: {})!",
-                vendor_id,
-                product_id
-            ))?
+            .ok_or_else(|| {
+                anyhow!(
+                    "A device cannot be detected (VID: {}, PID: {})!",
+                    vendor_id,
+                    product_id
+                )
+            })?
             .open(AccessMode::ReadWrite)
             .await?;
 

src/device.rs

@@ -36,7 +36,7 @@ pub async fn handle(
         .lock()
         .await;
 
-    match Request::n(request) {
+    match Request::try_from(request).ok() {
         Some(Request::GetControllerCount) => {
             let count: u32 = ctx.keyboards.len() as u32;
             stream.write_response(request, &count.to_le_bytes()).await?;