robin/tasmota-mqtt-client
1
0
Fork 0
mirror of https://codeberg.org/icewind/tasmota-mqtt-client.git synced 2026-06-03 18:24:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleanup file download response handling

Browse source
This commit is contained in:
Robin Appelman 2024-01-26 21:08:27 +01:00
commit 82cb784ef3
2 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -4,3 +4,4 @@ target
result result
.direnv .direnv
*.snap.new *.snap.new
*.dmp

51
src/download.rs
View file

@ -4,7 +4,6 @@ use crate::Result;
use bytes::{Bytes, BytesMut}; use bytes::{Bytes, BytesMut};
use md5::{Digest, Md5}; use md5::{Digest, Md5};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value;
#[derive(Serialize)] #[derive(Serialize)]
struct SendDownloadPayload<'a> { struct SendDownloadPayload<'a> {
@ -30,6 +29,18 @@ pub struct DownloadedFile {
pub data: Bytes, pub data: Bytes,
} }
#[derive(Deserialize, Debug)]
#[serde(rename_all = "PascalCase")]
struct DownloadResponse<'a> {
file_download: Option<&'a str>,
file: Option<&'a str>,
size: Option<u32>,
id: Option<u32>,
#[serde(rename = "Type")]
ty: Option<u8>,
md5: Option<&'a str>,
}
pub async fn download_config( pub async fn download_config(
mqtt: &MqttHelper, mqtt: &MqttHelper,
client: &str, client: &str,
@ -55,44 +66,48 @@ pub async fn download_config(
loop { loop {
let msg = rx.recv().await.unwrap(); let msg = rx.recv().await.unwrap();
if let Ok(body) = serde_json::from_slice::<Value>(msg.payload.as_ref()) { if let Ok(response) = serde_json::from_slice::<DownloadResponse>(msg.payload.as_ref()) {
if let Some(status) = body.get("FileDownload") { if let Some(status) = response.file_download {
match status.as_str() { match status {
Some("Started") => { "Started" => {
// don't request another chunk, another response is on the way already
continue; continue;
} }
Some("Aborted") => { "Aborted" => {
return Err(DownloadError::DownloadAborted.into()); return Err(DownloadError::DownloadAborted.into());
} }
Some("Error 1") => { "Error 1" => {
return Err(DownloadError::InvalidPassword.into()); return Err(DownloadError::InvalidPassword.into());
} }
Some("Error 2") => { "Error 2" => {
return Err(DownloadError::BadChunkSize.into()); return Err(DownloadError::BadChunkSize.into());
} }
Some("Error 3") => { "Error 3" => {
return Err(DownloadError::InvalidFileType.into()); return Err(DownloadError::InvalidFileType.into());
} }
Some("Done") => { "Done" => {
break; break;
} }
_ => {} _ => {}
} }
} }
if let Some(name) = body.get("File").and_then(|v| v.as_str()) { if let Some(name) = response.file {
state.name = name.to_string(); state.name = name.to_string();
} }
if let Some(size) = body.get("Size").and_then(|v| v.as_u64()) { if let Some(size) = response.size {
state.size = size as u32; state.size = size;
} }
if let Some(id) = body.get("Size").and_then(|v| v.as_u64()) { if let Some(id) = response.id {
state.id = id as u32; state.id = id;
} }
if let Some(ty) = body.get("Type").and_then(|v| v.as_u64()) { if let Some(ty) = response.ty {
state.ty = ty as u8; state.ty = ty;
} }
if let Some(md5) = body.get("Md5").and_then(|v| v.as_str()) { if let Some(md5) = response.md5 {
hex::decode_to_slice(md5, &mut state.md5[..]).map_err(DownloadError::from)?; hex::decode_to_slice(md5, &mut state.md5[..]).map_err(DownloadError::from)?;
// don't request another chunk
continue;
} }
} else { } else {
state.data.extend(msg.payload); state.data.extend(msg.payload);