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

style: code cleanup in file extension check

Browse Source
This commit is contained in:
Paul-Christian Volkmer 2023-12-06 12:00:28 +01:00
parent dcfc50878e
commit 70562f99ca
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.rs
View File

@ -85,23 +85,19 @@ impl Display for FileError {
fn read_inputfile(inputfile: String) -> Result<OnkostarEditor, FileError> {
let filename = Path::new(&inputfile);
match filename.extension() {
Some(extension) => match extension.to_ascii_lowercase().to_str() {
Some("osc") => {
return match fs::read_to_string(filename) {
Ok(content) => match OnkostarEditor::from_str(content.as_str()) {
Ok(data) => Ok(data),
Err(err) => Err(FileError::Parsing(inputfile, err)),
},
Err(err) => Err(FileError::Reading(inputfile, err.to_string())),
};
}
_ => {}
},
None => {}
if let Some(extension) = filename.extension() {
if let Some("osc") = extension.to_ascii_lowercase().to_str() {
return match fs::read_to_string(filename) {
Ok(content) => match OnkostarEditor::from_str(content.as_str()) {
Ok(data) => Ok(data),
Err(err) => Err(FileError::Parsing(inputfile, err)),
},
Err(err) => Err(FileError::Reading(inputfile, err.to_string())),
};
}
}
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> {