From 351147cb649117b290175e76dc416e6245aebf1e Mon Sep 17 00:00:00 2001 From: KD Date: Sat, 22 Mar 2025 18:24:08 +0000 Subject: [PATCH] Fixed some warnings (#11) Reviewed-on: https://git.kundeng.us/phoenix/icarus-models/pulls/11 Co-authored-by: KD Co-committed-by: KD --- src/access_level.rs | 10 +++--- src/coverart.rs | 8 ++--- src/login_result.rs | 2 +- src/song.rs | 79 ++++++++++++++++++++++----------------------- src/token.rs | 8 ++--- src/types.rs | 12 +++---- src/user.rs | 4 +-- 7 files changed, 57 insertions(+), 66 deletions(-) diff --git a/src/access_level.rs b/src/access_level.rs index 2dc4f15..c41d81f 100644 --- a/src/access_level.rs +++ b/src/access_level.rs @@ -20,23 +20,23 @@ impl Default for AccessLevel { } pub fn default_level() -> AccessLevel { - return AccessLevel { + AccessLevel { id: -1, level: String::from("Public"), song_id: -1, - }; + } } pub fn private_level() -> AccessLevel { - return AccessLevel { + AccessLevel { id: -1, level: String::from("Private"), song_id: -1, - }; + } } impl AccessLevel { pub fn _to_json(&self) -> Result { - return serde_json::to_string_pretty(&self); + serde_json::to_string_pretty(&self) } } diff --git a/src/coverart.rs b/src/coverart.rs index 4703823..f8aaec5 100644 --- a/src/coverart.rs +++ b/src/coverart.rs @@ -16,12 +16,8 @@ impl CoverArt { let mut file = std::fs::File::open(path)?; let mut buffer = Vec::new(); match file.read_to_end(&mut buffer) { - Ok(_) => { - return Ok(buffer); - } - Err(err) => { - return Err(err); - } + Ok(_) => Ok(buffer), + Err(err) => Err(err), } } } diff --git a/src/login_result.rs b/src/login_result.rs index 9095fdb..782ca77 100644 --- a/src/login_result.rs +++ b/src/login_result.rs @@ -26,6 +26,6 @@ impl Default for LoginResult { impl LoginResult { pub fn _to_json(&self) -> Result { - return serde_json::to_string_pretty(&self); + serde_json::to_string_pretty(&self) } } diff --git a/src/song.rs b/src/song.rs index b024a62..ed62435 100644 --- a/src/song.rs +++ b/src/song.rs @@ -1,4 +1,4 @@ -use std::default::Default; +// use std::default::Default; use std::io::Read; use crate::constants; @@ -64,6 +64,7 @@ fn is_dur_not_set(num: &i32) -> bool { *num == 0 } +/* impl Default for Song { fn default() -> Self { Song { @@ -92,13 +93,14 @@ impl Default for Song { } } } +*/ impl Song { pub fn to_metadata_json(&self, pretty: bool) -> Result { if pretty { - return serde_json::to_string_pretty(&self); + serde_json::to_string_pretty(&self) } else { - return serde_json::to_string(&self); + serde_json::to_string(&self) } } @@ -111,7 +113,7 @@ impl Song { } let directory = &self.directory; - let mut buffer: String = String::from(directory.clone()); + let mut buffer: String = directory.clone(); let last_index = directory.len() - 1; if let Some(character) = directory.chars().nth(last_index) { @@ -121,12 +123,12 @@ impl Song { buffer += &self.filename.clone(); - return Ok(buffer); + Ok(buffer) } else { - return Err(std::io::Error::new( + Err(std::io::Error::new( std::io::ErrorKind::Other, "Could not access last character of directory", - )); + )) } } @@ -139,50 +141,45 @@ impl Song { let mut buffer: Vec = Vec::new(); file.read_to_end(&mut buffer)?; - if buffer.len() == 0 { - return Err(std::io::Error::new( + if buffer.is_empty() { + Err(std::io::Error::new( std::io::ErrorKind::Other, "File is empty", - )); + )) } else { - return Ok(buffer); + Ok(buffer) } } - Err(er) => { - return Err(er); - } + Err(er) => Err(er), } } - pub fn generate_filename(&self, typ: types::types::Types, randomize: bool) -> String { + pub fn generate_filename(&self, typ: types::MusicTypes, randomize: bool) -> String { let mut filename: String = String::new(); let filename_len = 10; let file_extension = match typ { - types::types::Types::DefaultMusicExtension => { + types::MusicTypes::DefaultMusicExtension => { String::from(constants::DEFAULTMUSICEXTENSION) } - types::types::Types::WavExtension => String::from(constants::WAVEXTENSION), - types::types::Types::FlacExtension => String::from(constants::FLACEXTENSION), - types::types::Types::MPThreeExtension => String::from(constants::MPTHREEEXTENSION), + types::MusicTypes::WavExtension => String::from(constants::WAVEXTENSION), + types::MusicTypes::FlacExtension => String::from(constants::FLACEXTENSION), + types::MusicTypes::MPThreeExtension => String::from(constants::MPTHREEEXTENSION), }; if randomize { let some_chars: String = String::from("abcdefghij0123456789"); - let mut rng = rand::thread_rng(); + let mut rng = rand::rng(); for _i in 0..filename_len { - let random_number: i32 = rng.gen_range(0..=19); + let random_number: i32 = rng.random_range(0..=19); let index = random_number as usize; let rando_char = some_chars.chars().nth(index); - match rando_char { - Some(c) => { - filename.push(c); - } - None => {} - }; + if let Some(c) = rando_char { + filename.push(c); + } } } else { filename += "track-output"; @@ -190,10 +187,11 @@ impl Song { filename += &file_extension; - return filename; + filename } } +/* mod embedded { use std::io::Read; @@ -202,9 +200,9 @@ mod embedded { impl Song { pub fn to_metadata_json(&self, pretty: bool) -> Result { if pretty { - return serde_json::to_string_pretty(&self); + serde_json::to_string_pretty(&self) } else { - return serde_json::to_string(&self); + serde_json::to_string(&self) } } @@ -217,7 +215,7 @@ mod embedded { } let directory = &self.directory; - let mut buffer: String = String::from(directory.clone()); + let mut buffer: String = directory.clone(); let last_index = directory.len() - 1; if let Some(character) = directory.chars().nth(last_index) { @@ -227,12 +225,12 @@ mod embedded { buffer += &self.filename.clone(); - return Ok(buffer); + Ok(buffer) } else { - return Err(std::io::Error::new( + Err(std::io::Error::new( std::io::ErrorKind::Other, "Could not access last character of directory", - )); + )) } } @@ -245,18 +243,16 @@ mod embedded { let mut buffer: Vec = Vec::new(); file.read_to_end(&mut buffer)?; - if buffer.len() == 0 { - return Err(std::io::Error::new( + if buffer.is_empty() { + Err(std::io::Error::new( std::io::ErrorKind::Other, "File is empty", - )); + )) } else { - return Ok(buffer); + Ok(buffer) } } - Err(er) => { - return Err(er); - } + Err(er) => Err(er), } } } @@ -348,3 +344,4 @@ mod embedded { } } } +*/ diff --git a/src/token.rs b/src/token.rs index 3934840..dc5a261 100644 --- a/src/token.rs +++ b/src/token.rs @@ -43,18 +43,18 @@ impl AccessToken { pub fn bearer_token(&self) -> String { let mut token: String = String::from("Bearer "); token += &self.token.clone(); - return token; + token } } impl Token { pub fn _to_json(&self) -> Result { - return serde_json::to_string_pretty(&self); + serde_json::to_string_pretty(&self) } // TODO: Implement pub fn token_expired(&self) -> bool { - return false; + false } // TODO: Implement @@ -65,6 +65,6 @@ impl Token { return true; } - return false; + false } } diff --git a/src/types.rs b/src/types.rs index 1cc0995..e518320 100644 --- a/src/types.rs +++ b/src/types.rs @@ -1,8 +1,6 @@ -pub mod types { - pub enum Types { - DefaultMusicExtension, - WavExtension, - FlacExtension, - MPThreeExtension, - } +pub enum MusicTypes { + DefaultMusicExtension, + WavExtension, + FlacExtension, + MPThreeExtension, } diff --git a/src/user.rs b/src/user.rs index 04fe442..07f2a59 100644 --- a/src/user.rs +++ b/src/user.rs @@ -52,9 +52,9 @@ impl Default for User { impl User { pub fn to_json(&self, output_pretty: bool) -> Result { if output_pretty { - return serde_json::to_string_pretty(&self); + serde_json::to_string_pretty(&self) } else { - return serde_json::to_string(&self); + serde_json::to_string(&self) } } }