From 727a06cbba3d5266cc95e9cf8976f330726821ea Mon Sep 17 00:00:00 2001 From: mhfowler Date: Thu, 28 Oct 2021 14:09:56 +0200 Subject: [PATCH] Cleanup with cargo fix --- peach-web/src/lib.rs | 2 +- peach-web/src/routes/authentication.rs | 16 ++++++------- peach-web/src/routes/device.rs | 30 ++++++++++++------------ peach-web/src/routes/helpers.rs | 20 ++++++++-------- peach-web/src/routes/index.rs | 14 +++++------ peach-web/src/routes/ping.rs | 30 ++++++++++++------------ peach-web/src/routes/scuttlebutt.rs | 21 +++++++---------- peach-web/src/routes/settings/admin.rs | 14 +++++------ peach-web/src/routes/settings/dns.rs | 18 +++++++------- peach-web/src/routes/settings/network.rs | 18 +++++++------- peach-web/src/tests.rs | 1 - peach-web/src/utils.rs | 2 +- 12 files changed, 91 insertions(+), 95 deletions(-) diff --git a/peach-web/src/lib.rs b/peach-web/src/lib.rs index 47b6501..a6e4cf0 100644 --- a/peach-web/src/lib.rs +++ b/peach-web/src/lib.rs @@ -48,7 +48,7 @@ use crate::routes::helpers::*; use crate::routes::index::*; use crate::routes::ping::*; use crate::routes::scuttlebutt::*; -use crate::routes::device::*; + use crate::routes::settings::admin::*; use crate::routes::settings::dns::*; use crate::routes::settings::network::*; diff --git a/peach-web/src/routes/authentication.rs b/peach-web/src/routes/authentication.rs index c035928..c795d88 100644 --- a/peach-web/src/routes/authentication.rs +++ b/peach-web/src/routes/authentication.rs @@ -1,14 +1,14 @@ use serde::{Serialize, Deserialize}; -use rocket_contrib::json; -use rocket_contrib::json::{Json, JsonValue}; -use log::{debug, info, warn}; -use percent_encoding::percent_decode; -use rocket::http::RawStr; + +use rocket_contrib::json::{Json}; +use log::{debug, info}; + + use rocket::request::{FlashMessage, Form}; -use rocket::response::{Flash, NamedFile, Redirect}; -use rocket::{catch, get, post, uri}; +use rocket::response::{Flash, Redirect}; +use rocket::{get, post}; use rocket::request::FromForm; -use rocket::UriDisplayQuery; + use rocket_contrib::templates::Template; use crate::utils::{build_json_response, JsonResponse}; diff --git a/peach-web/src/routes/device.rs b/peach-web/src/routes/device.rs index a4e1bec..7379701 100644 --- a/peach-web/src/routes/device.rs +++ b/peach-web/src/routes/device.rs @@ -1,32 +1,32 @@ -use std::collections::HashMap; + use serde::Serialize; -use rocket_contrib::json; -use rocket_contrib::json::{Json, JsonValue}; + +use rocket_contrib::json::{Json}; use log::{debug, info, warn}; -use percent_encoding::percent_decode; -use rocket::http::RawStr; -use rocket::request::{FlashMessage, Form}; -use rocket::response::{Flash, NamedFile, Redirect}; -use rocket::{catch, get, post, uri}; -use rocket::request::FromForm; -use rocket::UriDisplayQuery; + + +use rocket::request::{FlashMessage}; +use rocket::response::{Flash, Redirect}; +use rocket::{get, post}; + + use rocket_contrib::templates::Template; use crate::utils::{build_json_response, JsonResponse}; use peach_lib::config_manager::load_peach_config; use peach_lib::dyndns_client; -use peach_lib::dyndns_client::{get_dyndns_subdomain, is_dns_updater_online}; + use peach_lib::network_client; -use peach_lib::network_client::{AccessPoint, Networks, Scan}; + use peach_lib::oled_client; use peach_lib::sbot_client; use peach_lib::stats_client; -use peach_lib::stats_client::{CpuStatPercentages, DiskUsage, LoadAverage, MemStat, Traffic}; +use peach_lib::stats_client::{CpuStatPercentages, DiskUsage, LoadAverage, MemStat}; + + -use crate::utils::monitor; -use crate::utils::monitor::{Alert, Data, Threshold}; use std::io; use std::process::{Command, Output}; diff --git a/peach-web/src/routes/helpers.rs b/peach-web/src/routes/helpers.rs index e62f4b0..ca9b99a 100644 --- a/peach-web/src/routes/helpers.rs +++ b/peach-web/src/routes/helpers.rs @@ -1,17 +1,17 @@ -use rocket_contrib::json::{Json, JsonValue}; + use std::path::{Path, PathBuf}; -use log::{debug, info, warn}; -use percent_encoding::percent_decode; -use rocket::http::RawStr; -use rocket::request::{FlashMessage, Form}; -use rocket::response::{Flash, NamedFile, Redirect}; -use rocket::{catch, get, post, uri}; -use rocket::request::FromForm; -use rocket::UriDisplayQuery; +use log::{debug}; + + + +use rocket::response::{NamedFile}; +use rocket::{catch, get}; + + use rocket_contrib::templates::Template; use serde::Serialize; -use crate::utils::{build_json_response, JsonResponse}; + #[get("/", rank = 2)] pub fn files(file: PathBuf) -> Option { diff --git a/peach-web/src/routes/index.rs b/peach-web/src/routes/index.rs index ef8a2c2..9f30df0 100644 --- a/peach-web/src/routes/index.rs +++ b/peach-web/src/routes/index.rs @@ -1,11 +1,11 @@ -use std::path::{Path, PathBuf}; -use log::{debug, info, warn}; -use percent_encoding::percent_decode; -use rocket::http::RawStr; -use rocket::request::{FlashMessage, Form}; -use rocket::response::{Flash, NamedFile, Redirect}; -use rocket::{catch, get, post, uri}; + + + + +use rocket::request::{FlashMessage}; + +use rocket::{get}; use rocket_contrib::templates::Template; use serde::Serialize; diff --git a/peach-web/src/routes/ping.rs b/peach-web/src/routes/ping.rs index f93d00e..739e120 100644 --- a/peach-web/src/routes/ping.rs +++ b/peach-web/src/routes/ping.rs @@ -1,26 +1,26 @@ //! Helper routes for pinging services to check that they are active -use rocket_contrib::json::{Json, JsonValue}; -use log::{debug, info, warn}; -use percent_encoding::percent_decode; -use rocket::http::RawStr; -use rocket::request::{FlashMessage, Form}; -use rocket::response::{Flash, NamedFile, Redirect}; -use rocket::{catch, get, post, uri}; -use rocket::request::FromForm; -use rocket::UriDisplayQuery; -use rocket_contrib::templates::Template; -use serde::Serialize; +use rocket_contrib::json::{Json}; +use log::{debug, warn}; + + + + +use rocket::{get}; + + + + use crate::utils::{build_json_response, JsonResponse}; -use peach_lib::dyndns_client::{get_dyndns_subdomain, is_dns_updater_online}; +use peach_lib::dyndns_client::{is_dns_updater_online}; use peach_lib::network_client; -use peach_lib::network_client::{AccessPoint, Networks, Scan}; + use peach_lib::oled_client; -use peach_lib::sbot_client; + use peach_lib::stats_client; -use peach_lib::stats_client::{CpuStatPercentages, DiskUsage, LoadAverage, MemStat, Traffic}; + // status route: useful for checking connectivity from web client #[get("/api/v1/ping")] diff --git a/peach-web/src/routes/scuttlebutt.rs b/peach-web/src/routes/scuttlebutt.rs index 60a75f9..b826df1 100644 --- a/peach-web/src/routes/scuttlebutt.rs +++ b/peach-web/src/routes/scuttlebutt.rs @@ -1,21 +1,18 @@ //! Routes for scuttlebutt related functionality. -/// # helpers and routes for /messages -///////////////////////////////// -use rocket_contrib::json::{Json, JsonValue}; -use log::{debug, info, warn}; -use percent_encoding::percent_decode; -use rocket::http::RawStr; -use rocket::request::{FlashMessage, Form}; -use rocket::response::{Flash, NamedFile, Redirect}; -use rocket::{catch, get, post, uri}; -use rocket::request::FromForm; -use rocket::UriDisplayQuery; + + + +use rocket::request::{FlashMessage}; + +use rocket::{get}; + + use rocket_contrib::templates::Template; use serde::Serialize; -use crate::utils::{build_json_response, JsonResponse}; + #[derive(Debug, Serialize)] pub struct MessageContext { diff --git a/peach-web/src/routes/settings/admin.rs b/peach-web/src/routes/settings/admin.rs index d3b7710..4868330 100644 --- a/peach-web/src/routes/settings/admin.rs +++ b/peach-web/src/routes/settings/admin.rs @@ -1,12 +1,12 @@ -use rocket_contrib::json::{Json, JsonValue}; -use log::{debug, info, warn}; -use percent_encoding::percent_decode; -use rocket::http::RawStr; + +use log::{info}; + + use rocket::request::{FlashMessage, Form}; -use rocket::response::{Flash, NamedFile, Redirect}; -use rocket::{catch, get, post, uri}; +use rocket::response::{Flash, Redirect}; +use rocket::{get, post, uri}; use rocket::request::FromForm; -use rocket::UriDisplayQuery; + use rocket_contrib::templates::Template; use serde::{Serialize, Deserialize}; diff --git a/peach-web/src/routes/settings/dns.rs b/peach-web/src/routes/settings/dns.rs index 23f9bcf..98ce9ca 100644 --- a/peach-web/src/routes/settings/dns.rs +++ b/peach-web/src/routes/settings/dns.rs @@ -1,13 +1,13 @@ -use rocket_contrib::json; -use rocket_contrib::json::{Json, JsonValue}; -use log::{debug, info, warn}; -use percent_encoding::percent_decode; -use rocket::http::RawStr; + +use rocket_contrib::json::{Json}; +use log::{info}; + + use rocket::request::{FlashMessage, Form}; -use rocket::response::{Flash, NamedFile, Redirect}; -use rocket::{catch, get, post, uri}; + +use rocket::{get, post}; use rocket::request::FromForm; -use rocket::UriDisplayQuery; + use rocket_contrib::templates::Template; use serde::{Serialize, Deserialize}; @@ -22,7 +22,7 @@ use peach_lib::dyndns_client::{get_dyndns_subdomain, is_dns_updater_online}; use peach_lib::error::PeachError; use peach_lib::jsonrpc_client_core::{Error, ErrorKind}; use peach_lib::jsonrpc_core::types::error::ErrorCode; -use peach_lib::password_utils; + #[derive(Debug, Deserialize, FromForm)] pub struct DnsForm { diff --git a/peach-web/src/routes/settings/network.rs b/peach-web/src/routes/settings/network.rs index bbff192..6f3fd7b 100644 --- a/peach-web/src/routes/settings/network.rs +++ b/peach-web/src/routes/settings/network.rs @@ -1,13 +1,13 @@ use std::collections::HashMap; use rocket_contrib::json; -use rocket_contrib::json::{Json, JsonValue}; -use log::{debug, info, warn}; +use rocket_contrib::json::{Json}; +use log::{debug, warn}; use percent_encoding::percent_decode; use rocket::http::RawStr; use rocket::request::{FlashMessage, Form}; -use rocket::response::{Flash, NamedFile, Redirect}; -use rocket::{catch, get, post, uri}; +use rocket::response::{Flash, Redirect}; +use rocket::{get, post, uri}; use rocket::request::FromForm; use rocket::UriDisplayQuery; use rocket_contrib::templates::Template; @@ -16,14 +16,14 @@ use serde::{Serialize, Deserialize}; use crate::utils::{build_json_response, JsonResponse}; use crate::utils::monitor; use crate::utils::monitor::{Threshold, Data, Alert}; -use peach_lib::config_manager::load_peach_config; + use peach_lib::network_client; use peach_lib::network_client::{AccessPoint, Networks, Scan}; -use peach_lib::oled_client; -use peach_lib::sbot_client; -use peach_lib::stats_client; -use peach_lib::stats_client::{CpuStatPercentages, DiskUsage, LoadAverage, MemStat, Traffic}; + + + +use peach_lib::stats_client::{Traffic}; /// # structs used by network routes //////////////////////////////////// diff --git a/peach-web/src/tests.rs b/peach-web/src/tests.rs index 42d3197..6773e15 100644 --- a/peach-web/src/tests.rs +++ b/peach-web/src/tests.rs @@ -6,7 +6,6 @@ use rocket::local::Client; use rocket_contrib::json; use super::rocket; -use crate::json_api::build_json_response; // helper function to test correct retrieval and content of a file fn test_query_file(path: &str, file: T, status: Status) diff --git a/peach-web/src/utils.rs b/peach-web/src/utils.rs index 7b6b69f..12cff38 100644 --- a/peach-web/src/utils.rs +++ b/peach-web/src/utils.rs @@ -1,6 +1,6 @@ pub mod monitor; -use rocket_contrib::json::{Json, JsonValue}; +use rocket_contrib::json::{JsonValue}; use serde::Serialize; // HELPER FUNCTIONS