1
0
mirror of https://github.com/pcvolkmer/osc-variant.git synced 2025-04-19 19:56:50 +00:00

style: code cleanup in file extension check

This commit is contained in:
Paul-Christian Volkmer 2023-12-06 12:00:28 +01:00
parent dcfc50878e
commit 70562f99ca

View File

@ -85,9 +85,8 @@ impl Display for FileError {
fn read_inputfile(inputfile: String) -> Result<OnkostarEditor, FileError> { fn read_inputfile(inputfile: String) -> Result<OnkostarEditor, FileError> {
let filename = Path::new(&inputfile); let filename = Path::new(&inputfile);
match filename.extension() { if let Some(extension) = filename.extension() {
Some(extension) => match extension.to_ascii_lowercase().to_str() { if let Some("osc") = extension.to_ascii_lowercase().to_str() {
Some("osc") => {
return match fs::read_to_string(filename) { return match fs::read_to_string(filename) {
Ok(content) => match OnkostarEditor::from_str(content.as_str()) { Ok(content) => match OnkostarEditor::from_str(content.as_str()) {
Ok(data) => Ok(data), Ok(data) => Ok(data),
@ -96,12 +95,9 @@ fn read_inputfile(inputfile: String) -> Result<OnkostarEditor, FileError> {
Err(err) => Err(FileError::Reading(inputfile, err.to_string())), Err(err) => Err(FileError::Reading(inputfile, err.to_string())),
}; };
} }
_ => {}
},
None => {}
} }
return Err(FileError::Reading(inputfile, "Keine OSC-Datei".into())); Err(FileError::Reading(inputfile, "Keine OSC-Datei".into()))
} }
fn write_outputfile(filename: String, content: &String) -> Result<(), FileError> { fn write_outputfile(filename: String, content: &String) -> Result<(), FileError> {