v0.12.0-preety_code

This commit is contained in:
Mateusz Gruszczyński
2026-09-03 15:33:37 +02:00
parent be67932b47
commit 07be4b85d9
87 changed files with 11691 additions and 3172 deletions
+62 -22
View File
@@ -1,25 +1,53 @@
#[derive(Debug, Deserialize)]
struct HaTestRequest { entity_id: Option<String> }
async fn test_home_assistant(State(state): State<AppState>, Json(input): Json<HaTestRequest>) -> Result<Json<Value>, AppError> {
struct HaTestRequest {
entity_id: Option<String>,
}
async fn test_home_assistant(
State(state): State<AppState>,
Json(input): Json<HaTestRequest>,
) -> Result<Json<Value>, AppError> {
let settings = state.settings.read().await.clone();
let resolved_entity_id = home_assistant::resolve_entity_id(&settings.home_assistant, input.entity_id.as_deref());
let temperature = home_assistant::read_temperature(&state.http, &settings.home_assistant, resolved_entity_id.as_deref(), Some(settings.home_assistant.sensor_stale_after_seconds))
.await.map_err(|e| AppError::Device(e.to_string()))?;
Ok(Json(json!({"ok": true, "temperature_c": temperature, "entity_id": resolved_entity_id})))
let resolved_entity_id =
home_assistant::resolve_entity_id(&settings.home_assistant, input.entity_id.as_deref());
let temperature = home_assistant::read_temperature(
&state.http,
&settings.home_assistant,
resolved_entity_id.as_deref(),
Some(settings.home_assistant.sensor_stale_after_seconds),
)
.await
.map_err(|e| AppError::Device(e.to_string()))?;
Ok(Json(
json!({"ok": true, "temperature_c": temperature, "entity_id": resolved_entity_id}),
))
}
#[derive(Debug, Deserialize)]
struct HaEntityRequest { entity_id: String }
struct HaEntityRequest {
entity_id: String,
}
async fn inspect_home_assistant_entity(State(state): State<AppState>, Json(input): Json<HaEntityRequest>) -> Result<Json<Value>, AppError> {
async fn inspect_home_assistant_entity(
State(state): State<AppState>,
Json(input): Json<HaEntityRequest>,
) -> Result<Json<Value>, AppError> {
let settings = state.settings.read().await.clone();
let entity_id = home_assistant::resolve_entity_id(&settings.home_assistant, Some(input.entity_id.as_str()))
.filter(|value| !value.trim().is_empty())
.ok_or_else(|| AppError::BadRequest("Home Assistant entity_id is required".into()))?;
let payload = home_assistant::read_entity(&state.http, &settings.home_assistant, Some(entity_id.as_str()))
.await.map_err(|e| AppError::Device(e.to_string()))?;
let raw_state = payload.get("state").and_then(Value::as_str).unwrap_or_default().to_string();
let entity_id =
home_assistant::resolve_entity_id(&settings.home_assistant, Some(input.entity_id.as_str()))
.filter(|value| !value.trim().is_empty())
.ok_or_else(|| AppError::BadRequest("Home Assistant entity_id is required".into()))?;
let payload = home_assistant::read_entity(
&state.http,
&settings.home_assistant,
Some(entity_id.as_str()),
)
.await
.map_err(|e| AppError::Device(e.to_string()))?;
let raw_state = payload
.get("state")
.and_then(Value::as_str)
.unwrap_or_default()
.to_string();
let available = !matches!(raw_state.as_str(), "unknown" | "unavailable" | "");
Ok(Json(json!({
"ok": true,
@@ -32,13 +60,25 @@ async fn inspect_home_assistant_entity(State(state): State<AppState>, Json(input
})))
}
async fn test_notifications(State(state): State<AppState>, Json(mut input): Json<NotificationSettings>) -> Result<Json<Value>, AppError> {
async fn test_notifications(
State(state): State<AppState>,
Json(mut input): Json<NotificationSettings>,
) -> Result<Json<Value>, AppError> {
let old = state.settings.read().await.notifications.clone();
if input.pushover_app_token.trim().is_empty() { input.pushover_app_token = old.pushover_app_token; }
if input.pushover_user_key.trim().is_empty() { input.pushover_user_key = old.pushover_user_key; }
if input.slack_webhook_url.trim().is_empty() { input.slack_webhook_url = old.slack_webhook_url; }
if input.discord_webhook_url.trim().is_empty() { input.discord_webhook_url = old.discord_webhook_url; }
notifications::test(&state, input).await.map_err(AppError::Device)?;
if input.pushover_app_token.trim().is_empty() {
input.pushover_app_token = old.pushover_app_token;
}
if input.pushover_user_key.trim().is_empty() {
input.pushover_user_key = old.pushover_user_key;
}
if input.slack_webhook_url.trim().is_empty() {
input.slack_webhook_url = old.slack_webhook_url;
}
if input.discord_webhook_url.trim().is_empty() {
input.discord_webhook_url = old.discord_webhook_url;
}
notifications::test(&state, input)
.await
.map_err(AppError::Device)?;
Ok(Json(json!({"ok": true})))
}