chaos/musicutil
1
0
Fork 0
Code Issues Releases Activity

don't use a string error on ffprobe handler, pass the proper error

Browse source
This commit is contained in:
chaos 2023-11-08 15:25:13 +00:00
parent f10506be0b
commit abe16ae53b
No known key found for this signature in database
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ffprobe/src/errors.rs
View file

@ -7,6 +7,8 @@ pub enum AnalyzeError {
ParseError(serde_json::Error), ParseError(serde_json::Error),
} }
impl std::error::Error for AnalyzeError {}
impl fmt::Display for AnalyzeError { impl fmt::Display for AnalyzeError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {

4
src/utils/formats/handlers/ffprobe.rs
View file

@ -3,8 +3,6 @@ use std::{
process::Command, process::Command,
}; };
use string_error::into_err;
use crate::{ use crate::{
meta, meta,
types::{AudioFileInfo, Tags}, types::{AudioFileInfo, Tags},
@ -41,7 +39,7 @@ impl GenericFFMpegAudioFormat {
let output = ffprobe::analyze(&self.path, Some(meta::FFPROBE)); let output = ffprobe::analyze(&self.path, Some(meta::FFPROBE));
if let Err(err) = output { if let Err(err) = output {
return Err(into_err(format!("{}", err))); return Err(Box::from(err));
} }
let output = output.unwrap(); let output = output.unwrap();

2
src/utils/mod.rs
View file

@ -5,4 +5,4 @@ pub mod formats;
mod music_scanner; mod music_scanner;
pub use formats::is_supported_file; pub use formats::is_supported_file;
pub use music_scanner::scan_for_music; pub use music_scanner::scan_for_music;