Fix clippy warnings (#175)
This commit is contained in:
parent
374d0ca56f
commit
41a4b21327
8 changed files with 21 additions and 21 deletions
|
@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::db::ddns_config;
|
use crate::db::ddns_config;
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Insertable, PartialEq, Queryable, Serialize)]
|
#[derive(Clone, Debug, Deserialize, Insertable, PartialEq, Eq, Queryable, Serialize)]
|
||||||
#[table_name = "ddns_config"]
|
#[table_name = "ddns_config"]
|
||||||
pub struct Config {
|
pub struct Config {
|
||||||
pub host: String,
|
pub host: String,
|
||||||
|
|
|
@ -9,7 +9,7 @@ use std::path::Path;
|
||||||
use crate::utils;
|
use crate::utils;
|
||||||
use crate::utils::AudioFormat;
|
use crate::utils::AudioFormat;
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct SongTags {
|
pub struct SongTags {
|
||||||
pub disc_number: Option<u32>,
|
pub disc_number: Option<u32>,
|
||||||
pub track_number: Option<u32>,
|
pub track_number: Option<u32>,
|
||||||
|
|
|
@ -4,13 +4,13 @@ use std::path::Path;
|
||||||
use crate::app::vfs::VFS;
|
use crate::app::vfs::VFS;
|
||||||
use crate::db::songs;
|
use crate::db::songs;
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub enum CollectionFile {
|
pub enum CollectionFile {
|
||||||
Directory(Directory),
|
Directory(Directory),
|
||||||
Song(Song),
|
Song(Song),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Queryable, QueryableByName, Serialize, Deserialize)]
|
#[derive(Debug, PartialEq, Eq, Queryable, QueryableByName, Serialize, Deserialize)]
|
||||||
#[table_name = "songs"]
|
#[table_name = "songs"]
|
||||||
pub struct Song {
|
pub struct Song {
|
||||||
#[serde(skip_serializing, skip_deserializing)]
|
#[serde(skip_serializing, skip_deserializing)]
|
||||||
|
@ -49,7 +49,7 @@ impl Song {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Queryable, Serialize, Deserialize)]
|
#[derive(Debug, PartialEq, Eq, Queryable, Serialize, Deserialize)]
|
||||||
pub struct Directory {
|
pub struct Directory {
|
||||||
#[serde(skip_serializing, skip_deserializing)]
|
#[serde(skip_serializing, skip_deserializing)]
|
||||||
id: i32,
|
id: i32,
|
||||||
|
|
|
@ -36,13 +36,13 @@ pub struct NewUser {
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct AuthToken(pub String);
|
pub struct AuthToken(pub String);
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub enum AuthorizationScope {
|
pub enum AuthorizationScope {
|
||||||
PolarisAuth,
|
PolarisAuth,
|
||||||
LastFMLink,
|
LastFMLink,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct Authorization {
|
pub struct Authorization {
|
||||||
pub username: String,
|
pub username: String,
|
||||||
pub scope: AuthorizationScope,
|
pub scope: AuthorizationScope,
|
||||||
|
|
|
@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct Preferences {
|
pub struct Preferences {
|
||||||
pub lastfm_username: Option<String>,
|
pub lastfm_username: Option<String>,
|
||||||
pub web_theme_base: Option<String>,
|
pub web_theme_base: Option<String>,
|
||||||
|
|
|
@ -12,14 +12,14 @@ mod test;
|
||||||
|
|
||||||
pub use manager::*;
|
pub use manager::*;
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Insertable, PartialEq, Queryable, Serialize)]
|
#[derive(Clone, Debug, Deserialize, Insertable, PartialEq, Eq, Queryable, Serialize)]
|
||||||
#[table_name = "mount_points"]
|
#[table_name = "mount_points"]
|
||||||
pub struct MountDir {
|
pub struct MountDir {
|
||||||
pub source: String,
|
pub source: String,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
|
#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
|
||||||
pub struct Mount {
|
pub struct Mount {
|
||||||
pub source: PathBuf,
|
pub source: PathBuf,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
|
|
|
@ -9,13 +9,13 @@ pub const COOKIE_SESSION: &str = "session";
|
||||||
pub const COOKIE_USERNAME: &str = "username";
|
pub const COOKIE_USERNAME: &str = "username";
|
||||||
pub const COOKIE_ADMIN: &str = "admin";
|
pub const COOKIE_ADMIN: &str = "admin";
|
||||||
|
|
||||||
#[derive(PartialEq, Debug, Serialize, Deserialize)]
|
#[derive(PartialEq, Eq, Debug, Serialize, Deserialize)]
|
||||||
pub struct Version {
|
pub struct Version {
|
||||||
pub major: i32,
|
pub major: i32,
|
||||||
pub minor: i32,
|
pub minor: i32,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(PartialEq, Debug, Serialize, Deserialize)]
|
#[derive(PartialEq, Eq, Debug, Serialize, Deserialize)]
|
||||||
pub struct InitialSetup {
|
pub struct InitialSetup {
|
||||||
pub has_any_users: bool,
|
pub has_any_users: bool,
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@ impl Into<Option<u32>> for ThumbnailSize {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct ListPlaylistsEntry {
|
pub struct ListPlaylistsEntry {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
}
|
}
|
||||||
|
@ -109,7 +109,7 @@ impl From<user::User> for User {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct NewUser {
|
pub struct NewUser {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub password: String,
|
pub password: String,
|
||||||
|
@ -126,13 +126,13 @@ impl From<NewUser> for user::NewUser {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct UserUpdate {
|
pub struct UserUpdate {
|
||||||
pub new_password: Option<String>,
|
pub new_password: Option<String>,
|
||||||
pub new_is_admin: Option<bool>,
|
pub new_is_admin: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
|
#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
|
||||||
pub struct DDNSConfig {
|
pub struct DDNSConfig {
|
||||||
pub host: String,
|
pub host: String,
|
||||||
pub username: String,
|
pub username: String,
|
||||||
|
@ -159,7 +159,7 @@ impl From<ddns::Config> for DDNSConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
|
#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
|
||||||
pub struct MountDir {
|
pub struct MountDir {
|
||||||
pub source: String,
|
pub source: String,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
|
@ -183,7 +183,7 @@ impl From<vfs::MountDir> for MountDir {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct Config {
|
pub struct Config {
|
||||||
pub settings: Option<NewSettings>,
|
pub settings: Option<NewSettings>,
|
||||||
pub users: Option<Vec<NewUser>>,
|
pub users: Option<Vec<NewUser>>,
|
||||||
|
@ -204,7 +204,7 @@ impl From<Config> for config::Config {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct NewSettings {
|
pub struct NewSettings {
|
||||||
pub album_art_pattern: Option<String>,
|
pub album_art_pattern: Option<String>,
|
||||||
pub reindex_every_n_seconds: Option<i32>,
|
pub reindex_every_n_seconds: Option<i32>,
|
||||||
|
@ -219,7 +219,7 @@ impl From<NewSettings> for settings::NewSettings {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct Settings {
|
pub struct Settings {
|
||||||
pub album_art_pattern: String,
|
pub album_art_pattern: String,
|
||||||
pub reindex_every_n_seconds: i32,
|
pub reindex_every_n_seconds: i32,
|
||||||
|
|
|
@ -13,7 +13,7 @@ macro_rules! match_ignore_case {
|
||||||
pub use crate::match_ignore_case;
|
pub use crate::match_ignore_case;
|
||||||
|
|
||||||
#[allow(clippy::upper_case_acronyms)]
|
#[allow(clippy::upper_case_acronyms)]
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
pub enum AudioFormat {
|
pub enum AudioFormat {
|
||||||
AIFF,
|
AIFF,
|
||||||
APE,
|
APE,
|
||||||
|
|
Loading…
Add table
Reference in a new issue