From d7fef30ac3f539975ef9edbba8e0af4a4e9ff3de Mon Sep 17 00:00:00 2001 From: Ruben Beltran del Rio Date: Sun, 5 Jan 2025 00:38:55 +0100 Subject: Commit batch of lints to allow autofix --- src/command/status/blog_status.rs | 8 ++++---- src/command/status/configuration_status.rs | 19 ++++++++++++++----- src/command/status/mod.rs | 13 +++++-------- 3 files changed, 23 insertions(+), 17 deletions(-) (limited to 'src/command/status') diff --git a/src/command/status/blog_status.rs b/src/command/status/blog_status.rs index df5256e..48f608a 100644 --- a/src/command/status/blog_status.rs +++ b/src/command/status/blog_status.rs @@ -1,6 +1,6 @@ +use crate::configuration::Configuration; use std::fs::read_dir; use std::path::PathBuf; -use crate::configuration::Configuration; pub fn status(configuration: &Configuration) -> String { let mut status_message = String::new(); @@ -9,16 +9,16 @@ pub fn status(configuration: &Configuration) -> String { // Main Configuration Locations let blog_count = count_entries(&configuration.posts_directory); - status_message.push_str(&format!("Number of posts in blog: {}\n", blog_count)); + status_message.push_str(&format!("Number of posts in blog: {blog_count}\n")); let archive_count = count_entries(&configuration.archive_directory); - status_message.push_str(&format!("Number of posts in archive: {}\n", archive_count)); + status_message.push_str(&format!("Number of posts in archive: {archive_count}\n")); status_message } fn count_entries(path: &PathBuf) -> String { match read_dir(path) { Ok(entries) => entries.filter_map(Result::ok).count().to_string(), - Err(_) => "0".to_string() + Err(_) => "0".to_string(), } } diff --git a/src/command/status/configuration_status.rs b/src/command/status/configuration_status.rs index 6d4e56a..96555c6 100644 --- a/src/command/status/configuration_status.rs +++ b/src/command/status/configuration_status.rs @@ -1,6 +1,6 @@ +use crate::configuration::Configuration; use std::fs; use std::path::PathBuf; -use crate::configuration::Configuration; pub fn status(configuration: &Configuration) -> String { let mut status_message = String::new(); @@ -9,12 +9,21 @@ pub fn status(configuration: &Configuration) -> String { status_message.push_str("\n## Directories\n"); // Main Configuration Locations - status_message.push_str(&get_directory_stats("Configuration", &configuration.config_directory)); + status_message.push_str(&get_directory_stats( + "Configuration", + &configuration.config_directory, + )); status_message.push_str(&get_directory_stats("Data", &configuration.data_directory)); - status_message.push_str(&get_directory_stats("Output", &configuration.output_directory)); + status_message.push_str(&get_directory_stats( + "Output", + &configuration.output_directory, + )); status_message.push_str("\n## Blog Settings\n"); - status_message.push_str(&format!("Number of posts to keep: {}\n", configuration.max_posts)); + status_message.push_str(&format!( + "Number of posts to keep: {}\n", + configuration.max_posts + )); status_message } @@ -24,7 +33,7 @@ fn get_directory_stats(label: &str, directory: &PathBuf) -> String { status_message.push_str(&format!("{}: {}. ", label, directory.display())); if directory.exists() { status_message.push_str("Exists "); - if fs::read_dir(&directory).is_ok() { + if fs::read_dir(directory).is_ok() { status_message.push_str("and is readable.\n"); } else { status_message.push_str("but is not readable.\n"); diff --git a/src/command/status/mod.rs b/src/command/status/mod.rs index e620f78..b92ef5f 100644 --- a/src/command/status/mod.rs +++ b/src/command/status/mod.rs @@ -1,8 +1,8 @@ -mod configuration_status; mod blog_status; +mod configuration_status; -use std::io::Result; use crate::configuration::Configuration; +use std::io::Result; pub struct Status; @@ -17,12 +17,12 @@ impl super::Command for Status { vec![] } - fn execute(&self, _: Option<&String>, configuration: &Configuration, _: &String) -> Result<()> { + fn execute(&self, _: Option<&String>, configuration: &Configuration, _: &str) -> Result<()> { let status_providers = available_status_providers(); for status_provider in status_providers { println!("{}\n----\n", status_provider(configuration)); } - return Ok(()) + Ok(()) } fn after_dependencies(&self) -> Vec> { @@ -39,8 +39,5 @@ impl super::Command for Status { } fn available_status_providers() -> Vec String> { - vec![ - configuration_status::status, - blog_status::status, - ] + vec![configuration_status::status, blog_status::status] } -- cgit