set by name, not by index #1
4 changed files with 18 additions and 11 deletions
|
|
@ -2,7 +2,7 @@ use clap::{Parser, Subcommand};
|
||||||
|
|
||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
pub struct PowerCommand {
|
pub struct PowerCommand {
|
||||||
index: usize,
|
name: String,
|
||||||
#[command(subcommand)]
|
#[command(subcommand)]
|
||||||
state: power::types::PowerState,
|
state: power::types::PowerState,
|
||||||
}
|
}
|
||||||
|
|
@ -23,9 +23,9 @@ impl Commands {
|
||||||
}),
|
}),
|
||||||
Self::Set(command) => {
|
Self::Set(command) => {
|
||||||
// let c = Controller::new_from_file(config_file).unwrap();
|
// let c = Controller::new_from_file(config_file).unwrap();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(
|
||||||
s.try_set_power(command.index, command.state).await.unwrap();
|
async move { s.try_set_power(&command.name, command.state).await.unwrap() },
|
||||||
})
|
)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
handle.await.unwrap();
|
handle.await.unwrap();
|
||||||
|
|
|
||||||
|
|
@ -50,9 +50,14 @@ impl System {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn try_set_power(&self, index: usize, state: types::PowerState) -> Result<(), Error> {
|
pub async fn try_set_power(&self, name: &str, state: types::PowerState) -> Result<(), Error> {
|
||||||
//TODO: check bounds
|
match self
|
||||||
self.components[index].set_power(state).await?;
|
.components
|
||||||
Ok(())
|
.iter()
|
||||||
|
.find(|&component| component.config.name == name)
|
||||||
|
{
|
||||||
|
Some(component) => component.set_power(state).await,
|
||||||
|
None => Err(Error::DeviceNameNotFound(String::from(name))),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,8 @@ pub struct StatusResponse {
|
||||||
|
|
||||||
#[derive(Deserialize, Clone)]
|
#[derive(Deserialize, Clone)]
|
||||||
pub struct TasmotaInterfaceConfig {
|
pub struct TasmotaInterfaceConfig {
|
||||||
name: String,
|
pub name: String,
|
||||||
target: String,
|
pub target: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TasmotaInterfaceConfig {
|
impl TasmotaInterfaceConfig {
|
||||||
|
|
@ -41,7 +41,7 @@ impl TasmotaInterfaceConfig {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct TasmotaInterface {
|
pub struct TasmotaInterface {
|
||||||
config: TasmotaInterfaceConfig,
|
pub config: TasmotaInterfaceConfig,
|
||||||
client: Client,
|
client: Client,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,8 @@ pub enum Error {
|
||||||
RequestError(#[from] reqwest::Error),
|
RequestError(#[from] reqwest::Error),
|
||||||
#[error("JSON Parse error")]
|
#[error("JSON Parse error")]
|
||||||
JsonParseError(#[from] serde_json::Error),
|
JsonParseError(#[from] serde_json::Error),
|
||||||
|
#[error("device {0} not found")]
|
||||||
|
DeviceNameNotFound(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Parser, Clone)]
|
#[derive(Serialize, Deserialize, Parser, Clone)]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue