diff --git a/src/manifest.rs b/src/gateway/manifest.rs similarity index 93% rename from src/manifest.rs rename to src/gateway/manifest.rs index 688ac9e..91d0f6e 100644 --- a/src/manifest.rs +++ b/src/gateway/manifest.rs @@ -1,6 +1,5 @@ -use std::collections::HashMap; - use serde::Deserialize; +use std::collections::HashMap; /// Manifest file format. /// @@ -68,7 +67,6 @@ impl Manifest { pub struct FirmwareBinary { file: String, min: String, - sha256: Option, } impl FirmwareBinary { @@ -81,9 +79,4 @@ impl FirmwareBinary { pub fn minimum_supported_version(&self) -> &str { &self.min } - - /// SHA256 checksum (if included). - pub fn sha256(&self) -> Option<&str> { - self.sha256.as_deref() - } } diff --git a/src/gateway/mod.rs b/src/gateway/mod.rs index 9250bf2..08603f5 100644 --- a/src/gateway/mod.rs +++ b/src/gateway/mod.rs @@ -1,3 +1,4 @@ +mod manifest; mod restart; mod status; mod update; diff --git a/src/gateway/update.rs b/src/gateway/update.rs index 1041fa3..b3c16eb 100644 --- a/src/gateway/update.rs +++ b/src/gateway/update.rs @@ -1,5 +1,5 @@ +use super::manifest::Manifest; use super::UpdateOptions; -use crate::manifest::Manifest; use crate::write_with_header; use anyhow::Error; use colored::Colorize; diff --git a/src/main.rs b/src/main.rs index 0cc8258..ea44df5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,4 @@ mod gateway; -mod manifest; use clap::{Parser, Subcommand}; use colored::ColoredString;