diff --git a/src/database.rs b/src/database.rs index ed93941..dbb127b 100644 --- a/src/database.rs +++ b/src/database.rs @@ -40,6 +40,7 @@ impl Database { } } + #[cfg(test)] pub async fn init_from_pool(pool: Pool) -> Database { Database { conn_pool: pool } } @@ -197,7 +198,6 @@ impl Database { #[cfg(test)] mod tests { use super::*; - use dotenvy::dotenv; use sqlx::PgPool; #[sqlx::test] diff --git a/src/main.rs b/src/main.rs index 191db15..1440b65 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,11 +1,11 @@ -use std::{env, fs, path::PathBuf, process, str::FromStr}; +use std::{env, fs, path::PathBuf, process}; use crate::schemas::{TelemetryMessageFromDevice, ValueMessageFromDevice}; use actix_web::{get, post, put, web, App, HttpResponse, HttpServer, Responder}; use database::Database; use dotenvy::dotenv; use log::{debug, error, info, warn}; -use schemas::{BoardConfig, BoardType, Device, OTAConfiguration, OTAConfigurationList}; +use schemas::OTAConfigurationList; use sqlx::types::mac_address::MacAddress; use util::{get_files, parse_mac_address}; @@ -183,7 +183,7 @@ async fn serve_firmware(path: web::Path<(String, String, String)>, data: web::Da .content_type("application/octet-stream") .insert_header(( "Content-Disposition", - format!("attachment; filename=\"{}\"", format!("{product}_{config}_{version}.bin")), + format!("attachment; filename=\"{product}_{config}_{version}.bin\""), )) .body(std::fs::read(file_path).unwrap_or_else(|_| Vec::new())) } else { diff --git a/src/schemas.rs b/src/schemas.rs index 66f7775..1e15967 100644 --- a/src/schemas.rs +++ b/src/schemas.rs @@ -1,5 +1,3 @@ -use std::path::PathBuf; - use chrono::NaiveDateTime; use serde::{ser::SerializeStruct, Deserialize, Serialize}; use sqlx::types::mac_address::MacAddress; diff --git a/src/util.rs b/src/util.rs index a1c708b..705ab84 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,9 +1,7 @@ use std::{fs, path::PathBuf}; use log::info; -use strum::EnumString; use thiserror::Error; -use serde; use std::str::FromStr;