From 75f523f1164c0096ed2ffc6fd6c6c72fa45fe6d3 Mon Sep 17 00:00:00 2001 From: MedzikUser Date: Tue, 20 Sep 2022 20:02:45 +0200 Subject: [PATCH] chore: cleanup --- src/database/sqlite.rs | 2 +- src/database/user.rs | 4 ++-- src/server/error.rs | 9 +++++---- src/types/config.rs | 12 +++++------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/database/sqlite.rs b/src/database/sqlite.rs index 029f277..5150c3a 100644 --- a/src/database/sqlite.rs +++ b/src/database/sqlite.rs @@ -13,7 +13,7 @@ use super::{ }; /// SQLite database -#[derive(Clone)] +#[derive(Debug, Clone)] pub struct Database { /// Sqlite connection pool pub pool: SqlitePool, diff --git a/src/database/user.rs b/src/database/user.rs index acc3a46..b09eaef 100644 --- a/src/database/user.rs +++ b/src/database/user.rs @@ -1,9 +1,9 @@ use crypto_utils::sha::{Algorithm, CryptographicHash}; -use serde::{Deserialize, Serialize}; +use serde::Serialize; use uuid::Uuid; /// SQL user entry -#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)] +#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Serialize)] pub struct User { pub id: String, pub username: String, diff --git a/src/server/error.rs b/src/server/error.rs index 45b1225..128131e 100644 --- a/src/server/error.rs +++ b/src/server/error.rs @@ -2,9 +2,9 @@ use serde::Serialize; use thiserror::Error; use tracing::error; -#[derive(Debug, Clone, Error)] +#[derive(Debug, Error)] pub enum Error { - // auth error + // `/auth` error #[error("Too many request, please slow down.")] RateLimit, #[error("User not found")] @@ -27,7 +27,8 @@ pub enum Error { MissingHeader(&'static str), #[error("`Authorization` header must be a bearer token")] MissingBearer, - // fs error + + // `/fs` error #[error("Invalid `path` query parameter")] InvalidPath, #[error("Failed to read files from directory")] @@ -46,7 +47,7 @@ pub enum Error { DeleteFile, #[error("Multipart error")] Multipart, - #[error("Write to file failed")] + #[error("Failed write to file")] WriteFile, } diff --git a/src/types/config.rs b/src/types/config.rs index 33de56c..7acfd8c 100644 --- a/src/types/config.rs +++ b/src/types/config.rs @@ -1,17 +1,15 @@ -//! [Configuration file types](Config) - use std::fs; -use serde::{Deserialize, Serialize}; +use serde::Deserialize; -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Deserialize)] pub struct Config { pub http: ConfigHTTP, pub jwt: ConfigJWT, pub storage: ConfigStorage, } -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Deserialize)] #[serde(rename_all = "camelCase")] pub struct ConfigHTTP { pub host: String, @@ -22,13 +20,13 @@ pub struct ConfigHTTP { pub tls_key: String, } -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Deserialize)] pub struct ConfigJWT { pub secret: String, pub expires: i64, } -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Deserialize)] pub struct ConfigStorage { pub path: String, }