forked from PeachCloud/peach-workspace
Cleanup with cargo fix
This commit is contained in:
parent
6ceb016cdc
commit
727a06cbba
|
@ -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::*;
|
||||
|
|
|
@ -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};
|
||||
|
|
|
@ -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};
|
||||
|
|
|
@ -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("/<file..>", rank = 2)]
|
||||
pub fn files(file: PathBuf) -> Option<NamedFile> {
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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")]
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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};
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
////////////////////////////////////
|
||||
|
|
|
@ -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<T>(path: &str, file: T, status: Status)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
pub mod monitor;
|
||||
|
||||
use rocket_contrib::json::{Json, JsonValue};
|
||||
use rocket_contrib::json::{JsonValue};
|
||||
use serde::Serialize;
|
||||
|
||||
// HELPER FUNCTIONS
|
||||
|
|
Loading…
Reference in New Issue