Fix more clippy warnings

Signed-off-by: trivernis <trivernis@protonmail.com>
pull/25/head
trivernis 3 years ago
parent 8256751a6f
commit 99c224586a
Signed by: Trivernis
GPG Key ID: DFFFCC2C7A02DB45

@ -1,4 +1,4 @@
use std::path::PathBuf; use std::path::{Path, PathBuf};
use futures::future; use futures::future;
use tokio::fs::{self, OpenOptions}; use tokio::fs::{self, OpenOptions};
@ -16,7 +16,7 @@ pub fn parse_namespace_and_tag(norm_tag: String) -> (Option<String>, String) {
} }
/// Parses all tags from a file /// Parses all tags from a file
pub async fn parse_tags_file(path: PathBuf) -> RepoResult<Vec<(Option<String>, String)>> { pub async fn parse_tags_file(path: &Path) -> RepoResult<Vec<(Option<String>, String)>> {
let file = OpenOptions::new().read(true).open(path).await?; let file = OpenOptions::new().read(true).open(path).await?;
let mut lines = BufReader::new(file).lines(); let mut lines = BufReader::new(file).lines();
let mut tags = Vec::new(); let mut tags = Vec::new();

@ -176,7 +176,7 @@ fn adjust_for_dir(ordering: Ordering, direction: &SortDirection) -> Ordering {
} }
} }
fn compare_tag_lists(list_a: &Vec<String>, list_b: &Vec<String>) -> Ordering { fn compare_tag_lists(list_a: &[String], list_b: &[String]) -> Ordering {
let first_diff = list_a.iter().zip(list_b.iter()).find(|(a, b)| *a != *b); let first_diff = list_a.iter().zip(list_b.iter()).find(|(a, b)| *a != *b);
if let Some(diff) = first_diff { if let Some(diff) = first_diff {
if let (Some(num_a), Some(num_b)) = (diff.0.parse::<f32>().ok(), diff.1.parse::<f32>().ok()) if let (Some(num_a), Some(num_b)) = (diff.0.parse::<f32>().ok(), diff.1.parse::<f32>().ok())

@ -6,7 +6,7 @@ use mediarepo_core::mediarepo_api::types::repo::SizeType;
use mediarepo_core::settings::Settings; use mediarepo_core::settings::Settings;
use mediarepo_core::utils::get_folder_size; use mediarepo_core::utils::get_folder_size;
use mediarepo_logic::dao::repo::Repo; use mediarepo_logic::dao::repo::Repo;
use std::path::PathBuf; use std::path::{Path, PathBuf};
use std::sync::Arc; use std::sync::Arc;
use tokio::fs; use tokio::fs;
use tokio::sync::broadcast::{self, Sender}; use tokio::sync::broadcast::{self, Sender};
@ -72,11 +72,11 @@ impl Job for CalculateSizesJob {
async fn calculate_size( async fn calculate_size(
size_type: &SizeType, size_type: &SizeType,
repo: &Repo, repo: &Repo,
repo_path: &PathBuf, repo_path: &Path,
settings: &Settings, settings: &Settings,
) -> RepoResult<u64> { ) -> RepoResult<u64> {
let size = match &size_type { let size = match &size_type {
SizeType::Total => get_folder_size(repo_path.clone()).await?, SizeType::Total => get_folder_size(repo_path.to_path_buf()).await?,
SizeType::FileFolder => repo.get_main_store_size().await?, SizeType::FileFolder => repo.get_main_store_size().await?,
SizeType::ThumbFolder => repo.get_thumb_store_size().await?, SizeType::ThumbFolder => repo.get_thumb_store_size().await?,
SizeType::DatabaseFile => { SizeType::DatabaseFile => {

@ -1,5 +1,5 @@
use crate::job_dispatcher::JobDispatcher; use crate::job_dispatcher::JobDispatcher;
use crate::jobs::{CheckIntegrityJob, MigrateCDsJob, VacuumJob}; use crate::jobs::{CheckIntegrityJob, MigrateCDsJob};
use mediarepo_core::error::RepoError; use mediarepo_core::error::RepoError;
use mediarepo_core::tokio_graceful_shutdown::Toplevel; use mediarepo_core::tokio_graceful_shutdown::Toplevel;
use mediarepo_logic::dao::repo::Repo; use mediarepo_logic::dao::repo::Repo;

@ -1,14 +1,14 @@
use std::path::PathBuf; use std::path::Path;
use tokio::fs; use tokio::fs;
use mediarepo_core::error::RepoResult; use mediarepo_core::error::RepoResult;
use mediarepo_core::settings::{PathSettings, Settings};
use mediarepo_core::settings::v1::SettingsV1; use mediarepo_core::settings::v1::SettingsV1;
use mediarepo_core::settings::{PathSettings, Settings};
use mediarepo_logic::dao::repo::Repo; use mediarepo_logic::dao::repo::Repo;
/// Loads the settings from a toml path /// Loads the settings from a toml path
pub fn load_settings(root_path: &PathBuf) -> RepoResult<Settings> { pub fn load_settings(root_path: &Path) -> RepoResult<Settings> {
let contents = std::fs::read_to_string(root_path.join("repo.toml"))?; let contents = std::fs::read_to_string(root_path.join("repo.toml"))?;
if let Ok(settings_v1) = SettingsV1::from_toml_string(&contents) { if let Ok(settings_v1) = SettingsV1::from_toml_string(&contents) {
@ -21,7 +21,7 @@ pub fn load_settings(root_path: &PathBuf) -> RepoResult<Settings> {
} }
} }
pub async fn get_repo(root_path: &PathBuf, path_settings: &PathSettings) -> RepoResult<Repo> { pub async fn get_repo(root_path: &Path, path_settings: &PathSettings) -> RepoResult<Repo> {
Repo::connect( Repo::connect(
format!( format!(
"sqlite://{}", "sqlite://{}",
@ -33,7 +33,7 @@ pub async fn get_repo(root_path: &PathBuf, path_settings: &PathSettings) -> Repo
.await .await
} }
pub async fn create_paths_for_repo(root: &PathBuf, settings: &PathSettings) -> RepoResult<()> { pub async fn create_paths_for_repo(root: &Path, settings: &PathSettings) -> RepoResult<()> {
if !root.exists() { if !root.exists() {
fs::create_dir_all(&root).await?; fs::create_dir_all(&root).await?;
} }

Loading…
Cancel
Save