robin/taspromto
1
0
Fork 0
mirror of https://codeberg.org/icewind/taspromto.git synced 2026-06-03 08:34:21 +02:00
Code Issues Projects Releases Wiki Activity

bump dependencies

Browse source
This commit is contained in:
Robin Appelman 2024-01-14 18:01:32 +01:00
commit 94580d3558
6 changed files with 515 additions and 523 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/config.rs
View file

@ -21,17 +21,17 @@ pub struct Credentials {
impl Config {
pub fn from_env() -> Result<Self> {
let mqtt_host = dotenv::var("MQTT_HOSTNAME").wrap_err("MQTT_HOSTNAME not set")?;
let mqtt_port = dotenv::var("MQTT_PORT")
let mqtt_host = dotenvy::var("MQTT_HOSTNAME").wrap_err("MQTT_HOSTNAME not set")?;
let mqtt_port = dotenvy::var("MQTT_PORT")
.ok()
.and_then(|port| u16::from_str(&port).ok())
.unwrap_or(1883);
let host_port = dotenv::var("PORT")
let host_port = dotenvy::var("PORT")
.ok()
.and_then(|port| u16::from_str(&port).ok())
.unwrap_or(80);
let mi_temp_names = dotenv::var("MITEMP_NAMES").unwrap_or_default();
let mi_temp_names = dotenvy::var("MITEMP_NAMES").unwrap_or_default();
let mi_temp_names = mi_temp_names
.split(',')
.map(|pair| {
@ -48,9 +48,9 @@ impl Config {
})
.collect::<Result<BTreeMap<BDAddr, String>, Report>>()?;
let mqtt_credentials = match dotenv::var("MQTT_USERNAME") {
let mqtt_credentials = match dotenvy::var("MQTT_USERNAME") {
Ok(username) => {
let password = dotenv::var("MQTT_PASSWORD")
let password = dotenvy::var("MQTT_PASSWORD")
.wrap_err("MQTT_USERNAME set, but MQTT_PASSWORD not set")?;
Some(Credentials { username, password })
}

2
src/device.rs
View file

@ -1,5 +1,5 @@
use color_eyre::{eyre::WrapErr, Report, Result};
use json::JsonValue;
use jzon::JsonValue;
use rumqttc::{AsyncClient, QoS};
use std::collections::{BTreeMap, HashMap};
use std::convert::TryFrom;

2
src/main.rs
View file

@ -121,7 +121,7 @@ async fn mqtt_client<S: Stream<Item = Result<Publish>>>(
Topic::Power(_) => {}
Topic::Result(device) | Topic::Sensor(device) | Topic::Status(device) => {
let payload = std::str::from_utf8(message.payload.as_ref()).unwrap_or_default();
if let Ok(json) = json::parse(payload) {
if let Ok(json) = jzon::parse(payload) {
let mut device_states = device_states.lock().unwrap();
device_states.update(device, json);
}