Massive config overhaul #6

Merged
Dreaded_X merged 23 commits from feature/improve_config into master 2025-10-22 02:17:46 +00:00
3 changed files with 6 additions and 4 deletions
Showing only changes of commit 02b87126e1 - Show all commits

View File

@@ -10,5 +10,5 @@ local FulfillmentConfig
---@class Config
---@field fulfillment FulfillmentConfig
---@field devices DeviceInterface[]?
---@field schedule table<string, function>?
---@field schedule table<string, fun() | fun()[]>?
local Config

View File

@@ -1,6 +1,7 @@
use std::collections::HashMap;
use std::net::{Ipv4Addr, SocketAddr};
use automation_lib::action_callback::ActionCallback;
use automation_lib::device::Device;
use automation_macro::LuaDeviceConfig;
use lua_typed::Typed;
@@ -39,7 +40,7 @@ pub struct Config {
pub devices: Vec<Box<dyn Device>>,
#[device_config(from_lua, default)]
#[typed(default)]
pub schedule: HashMap<String, mlua::Function>,
pub schedule: HashMap<String, ActionCallback<()>>,
}
impl From<FulfillmentConfig> for SocketAddr {

View File

@@ -1,10 +1,11 @@
use std::collections::HashMap;
use std::pin::Pin;
use automation_lib::action_callback::ActionCallback;
use tokio_cron_scheduler::{Job, JobScheduler, JobSchedulerError};
pub async fn start_scheduler(
schedule: HashMap<String, mlua::Function>,
schedule: HashMap<String, ActionCallback<()>>,
) -> Result<(), JobSchedulerError> {
let scheduler = JobScheduler::new().await?;
@@ -14,7 +15,7 @@ pub async fn start_scheduler(
let f = f.clone();
Box::pin(async move {
f.call_async::<()>(()).await.unwrap();
f.call(()).await;
})
}
};