Warning changes

This commit is contained in:
2025-07-04 16:34:28 -04:00
parent 08b441a2ee
commit d652d8588d
3 changed files with 18 additions and 20 deletions

View File

@@ -34,10 +34,7 @@ pub mod test_util {
let src_path = std::path::Path::new(source_path); let src_path = std::path::Path::new(source_path);
let dest_path = std::path::Path::new(destination_path); let dest_path = std::path::Path::new(destination_path);
match std::fs::copy(src_path, dest_path) { std::fs::copy(src_path, dest_path)
Ok(bytes) => Ok(bytes),
Err(err) => Err(err),
}
} }
pub fn file_exists(directory: &String, filename: &String) -> Result<bool, std::io::Error> { pub fn file_exists(directory: &String, filename: &String) -> Result<bool, std::io::Error> {

View File

@@ -278,12 +278,11 @@ mod tests {
// use super::*; // use super::*;
mod get { mod get {
use super::super::metadata::get_meta; use super::super::metadata::get_meta;
use crate::types;
use crate::test_util::util; use crate::test_util::util;
use crate::test_util::util::{file_exists, get_full_path}; use crate::test_util::util::{file_exists, get_full_path};
use crate::types;
#[test] #[test]
fn test_get_title() { fn test_get_title() {
@@ -537,9 +536,9 @@ mod tests {
mod set { mod set {
use super::super::metadata::{get_meta, set_meta}; use super::super::metadata::{get_meta, set_meta};
use crate::types;
use crate::test_util::util; use crate::test_util::util;
use crate::test_util::util::{file_exists, get_full_path}; use crate::test_util::util::{file_exists, get_full_path};
use crate::types;
#[test] #[test]
fn test_set_title() { fn test_set_title() {

View File

@@ -2,23 +2,22 @@ use lofty::file::AudioFile;
#[derive(Debug, Default, Clone)] #[derive(Debug, Default, Clone)]
pub struct Duration { pub struct Duration {
pub val: i32 pub val: i32,
} }
pub fn get_duration(song_path: &String) -> Result<std::time::Duration,std::io::Error> { pub fn get_duration(song_path: &String) -> Result<std::time::Duration, std::io::Error> {
match std::fs::File::open(song_path) { match std::fs::File::open(song_path) {
Ok(mut content) => match lofty::flac::FlacFile::read_from(&mut content, lofty::config::ParseOptions::new(),) { Ok(mut content) => {
Ok(flac_file) => { match lofty::flac::FlacFile::read_from(&mut content, lofty::config::ParseOptions::new())
let properties = flac_file.properties(); {
Ok(properties.duration()) Ok(flac_file) => {
} let properties = flac_file.properties();
Err(err) => { Ok(properties.duration())
Err(std::io::Error::other(err.to_string())) }
Err(err) => Err(std::io::Error::other(err.to_string())),
} }
} }
Err(err) => { Err(err) => Err(err),
Err(err)
}
} }
} }
@@ -39,7 +38,10 @@ mod tests {
let song_duration: u64 = 41; let song_duration: u64 = 41;
let fetched_song_duration = duration.as_secs(); let fetched_song_duration = duration.as_secs();
assert_eq!(song_duration, fetched_song_duration, "Durations should match, but they don't {song_duration} {fetched_song_duration} ({duration:?})"); assert_eq!(
song_duration, fetched_song_duration,
"Durations should match, but they don't {song_duration} {fetched_song_duration} ({duration:?})"
);
} }
Err(err) => { Err(err) => {
assert!(false, "Error: {err:?}"); assert!(false, "Error: {err:?}");