From 25cce99b8038920b6f0ea1e640dba9c3b5a7907a Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Mon, 13 Feb 2023 01:59:15 +0200 Subject: [PATCH] Format the code --- src/arguments.rs | 4 +++- src/bin/main.rs | 2 +- src/lib.rs | 15 +++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/arguments.rs b/src/arguments.rs index e314bf1..8dbc836 100644 --- a/src/arguments.rs +++ b/src/arguments.rs @@ -202,7 +202,9 @@ impl Arguments { if args.show_track_cover == true { args.show_track_cover = cfg.show_track_cover; } - args.notification_static_icon = args.notification_static_icon.or(cfg.notification_static_icon); + args.notification_static_icon = args + .notification_static_icon + .or(cfg.notification_static_icon); args.cover_path = args.cover_path.or(cfg.cover_path); #[cfg(feature = "lyrics")] if args.lyrics_path == None { diff --git a/src/bin/main.rs b/src/bin/main.rs index da6ceac..ca50465 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -1,10 +1,10 @@ use clap::Parser; +use cmus_notify::arguments::Arguments; use cmus_notify::{ arguments, cmus::{self, query::CmusQueryResponse, CmusError}, }; -use cmus_notify::arguments::Arguments; macro_rules! sleep { ($time: expr) => { diff --git a/src/lib.rs b/src/lib.rs index 4483708..f2e00fe 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -108,7 +108,12 @@ pub enum TrackCover { /// If the track does not have an embedded cover, and `no_use_external_cover` is `false`, the function will search for an external cover. /// If the track has an embedded cover, and `force_use_external_cover` is `true`, the function will search for an external cover. #[inline] -pub fn track_cover(track_path: &str, max_depth: u8, force_use_external_cover: bool, no_use_external_cover: bool) -> TrackCover { +pub fn track_cover( + track_path: &str, + max_depth: u8, + force_use_external_cover: bool, + no_use_external_cover: bool, +) -> TrackCover { if !force_use_external_cover { if let Ok(Some(cover)) = get_embedded_art(track_path) { return TrackCover::Embedded(cover); @@ -116,8 +121,11 @@ pub fn track_cover(track_path: &str, max_depth: u8, force_use_external_cover: bo } if !no_use_external_cover { - if let Ok(Some(cover)) = search_for(track_path, max_depth, - ®ex::Regex::new(r".*\.(jpg|jpeg|png|gif)$").unwrap()) { + if let Ok(Some(cover)) = search_for( + track_path, + max_depth, + ®ex::Regex::new(r".*\.(jpg|jpeg|png|gif)$").unwrap(), + ) { return TrackCover::External(cover); } } @@ -125,7 +133,6 @@ pub fn track_cover(track_path: &str, max_depth: u8, force_use_external_cover: bo TrackCover::None } - #[inline] fn search(search_directory: &str, matcher: ®ex::Regex) -> std::io::Result> { for entry in std::fs::read_dir(search_directory)? {