emgauwa/controller
2
0
Fork 0
Code Issues Pull requests Projects Releases1 Packages Wiki Activity

Add app_state reload util and add handler for weekday change

Browse source
This commit is contained in:
Tobias Reisinger 2024-04-24 02:29:53 +02:00
parent 97d9222a39
commit 6414083af0
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
5 changed files with 51 additions and 38 deletions
emgauwa-controller/src/ws
mod.rs

27
emgauwa-controller/src/ws/mod.rs
View file

@ -11,9 +11,9 @@ use tokio::time;
use tokio_tungstenite::tungstenite::Message;
use tokio_tungstenite::{connect_async, tungstenite};
use crate::app_state;
use crate::app_state::AppState;
use crate::utils::app_state_get_this;
use crate::{app_state, utils};
pub async fn run_ws_loop(pool: Pool<Sqlite>, app_state: Addr<AppState>, url: String) {
log::debug!("Spawned ws loop");
@ -109,19 +109,18 @@ pub async fn handle_action(
match action {
ControllerWsAction::Controller(controller) => {
handle_controller(conn, app_state, &this, controller).await
handle_controller(conn, &this, controller).await?
}
ControllerWsAction::Relays(relays) => handle_relays(conn, app_state, &this, relays).await,
ControllerWsAction::Schedules(schedules) => {
handle_schedules(conn, app_state, schedules).await
}
_ => Ok(()),
}
ControllerWsAction::Relays(relays) => handle_relays(conn, &this, relays).await?,
ControllerWsAction::Schedules(schedules) => handle_schedules(conn, schedules).await?,
_ => return Ok(()),
};
utils::app_state_reload(app_state).await
}
async fn handle_controller(
conn: &mut PoolConnection<Sqlite>,
app_state: &Addr<AppState>,
this: &Controller,
controller: Controller,
) -> Result<(), EmgauwaError> {
@ -136,14 +135,11 @@ async fn handle_controller(
.update(conn, controller.c.name.as_str(), this.c.relay_count)
.await?;
app_state.send(app_state::Reload {}).await??;
Ok(())
}
async fn handle_schedules(
conn: &mut PoolConnection<Sqlite>,
app_state: &Addr<AppState>,
schedules: Vec<DbSchedule>,
) -> Result<(), EmgauwaError> {
let mut handled_uids = vec![
@ -175,14 +171,11 @@ async fn handle_schedules(
}
}
app_state.send(app_state::Reload {}).await??;
Ok(())
}
async fn handle_relays(
conn: &mut PoolConnection<Sqlite>,
app_state: &Addr<AppState>,
this: &Controller,
relays: Vec<Relay>,
) -> Result<(), EmgauwaError> {
@ -198,7 +191,7 @@ async fn handle_relays(
db_relay.update(conn, relay.r.name.as_str()).await?;
handle_schedules(conn, app_state, relay.schedules.clone()).await?;
handle_schedules(conn, relay.schedules.clone()).await?;
let mut schedules = Vec::new(); // We need to get the schedules from the database to have the right IDs
for schedule in relay.schedules {
@ -212,7 +205,5 @@ async fn handle_relays(
DbJunctionRelaySchedule::set_schedules(conn, &db_relay, schedules.iter().collect()).await?;
}
app_state.send(app_state::Reload {}).await??;
Ok(())
}