Dreaded_X/automation_rs
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Added trait for devices that can turn off a given timeout

Browse Source
This commit is contained in:
Dreaded_X
2023-08-14 02:58:13 +02:00
parent e38c5eed31
commit 12ca577a65
4 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/devices/ikea_outlet.rs
View File

@@ -20,6 +20,7 @@ use crate::event::EventChannel;
use crate::event::OnMqtt;
use crate::event::OnPresence;
use crate::messages::OnOffMessage;
use crate::traits::Timeout;
#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Copy)]
pub enum OutletType {
@@ -50,7 +51,7 @@ pub struct IkeaOutlet {
info: InfoConfig,
mqtt: MqttDeviceConfig,
outlet_type: OutletType,
timeout: Option<u64>,
timeout: Option<Duration>,
client: AsyncClient,
last_known_state: bool,
@@ -81,7 +82,7 @@ impl CreateDevice for IkeaOutlet {
info: config.info,
mqtt: config.mqtt,
outlet_type: config.outlet_type,
timeout: config.timeout,
timeout: config.timeout.map(Duration::from_secs),
client: client.clone(),
last_known_state: false,
handle: None,
@@ -142,27 +143,8 @@ impl OnMqtt for IkeaOutlet {
self.last_known_state = state;
// If this is a kettle start a timeout for turning it of again
if state {
let timeout = match self.timeout {
Some(timeout) => Duration::from_secs(timeout),
None => return,
};
// Turn the kettle of after the specified timeout
// TODO: Impl Drop for IkeaOutlet that will abort the handle if the IkeaOutlet
// get dropped
let client = self.client.clone();
let topic = self.mqtt.topic.clone();
let id = self.identifier.clone();
self.handle = Some(tokio::spawn(async move {
debug!(id, "Starting timeout ({timeout:?})...");
tokio::time::sleep(timeout).await;
debug!(id, "Turning outlet off!");
// TODO: Idealy we would call self.set_on(false), however since we want to do
// it after a timeout we have to put it in a seperate task.
// I don't think we can really get around calling outside function
set_on(client, &topic, false).await;
}));
if state && let Some(timeout) = self.timeout {
self.start_timeout(timeout);
}
}
}
@@ -222,3 +204,28 @@ impl traits::OnOff for IkeaOutlet {
Ok(())
}
}
impl crate::traits::Timeout for IkeaOutlet {
fn start_timeout(&mut self, timeout: Duration) {
// Abort any timer that is currently running
if let Some(handle) = self.handle.take() {
handle.abort();
}
// Turn the kettle of after the specified timeout
// TODO: Impl Drop for IkeaOutlet that will abort the handle if the IkeaOutlet
// get dropped
let client = self.client.clone();
let topic = self.mqtt.topic.clone();
let id = self.identifier.clone();
self.handle = Some(tokio::spawn(async move {
debug!(id, "Starting timeout ({timeout:?})...");
tokio::time::sleep(timeout).await;
debug!(id, "Turning outlet off!");
// TODO: Idealy we would call self.set_on(false), however since we want to do
// it after a timeout we have to put it in a seperate task.
// I don't think we can really get around calling outside function
set_on(client, &topic, false).await;
}));
}
}

3
src/devices/mod.rs
View File

@@ -22,9 +22,10 @@ pub use self::wake_on_lan::WakeOnLAN;
use google_home::{device::AsGoogleHomeDevice, traits::OnOff};
use crate::traits::Timeout;
use crate::{event::OnDarkness, event::OnMqtt, event::OnNotification, event::OnPresence};
#[impl_cast::device(As: OnMqtt + OnPresence + OnDarkness + OnNotification + OnOff)]
#[impl_cast::device(As: OnMqtt + OnPresence + OnDarkness + OnNotification + OnOff + Timeout)]
pub trait Device: AsGoogleHomeDevice + std::fmt::Debug + Sync + Send {
fn get_id(&self) -> &str;
}