diff options
Diffstat (limited to 'apps/cassiopeia/src/format/mod.rs')
-rw-r--r-- | apps/cassiopeia/src/format/mod.rs | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/apps/cassiopeia/src/format/mod.rs b/apps/cassiopeia/src/format/mod.rs index b5342d62da13..e55658d515ff 100644 --- a/apps/cassiopeia/src/format/mod.rs +++ b/apps/cassiopeia/src/format/mod.rs @@ -9,17 +9,21 @@ pub(crate) use parser::LineCfg; use crate::TimeFile; use std::{fs::File, io::Read}; -pub fn load_file(path: &str) -> TimeFile { - let mut f = File::open(path).unwrap(); +/// Load a file from disk and parse it into a +/// [`TimeFile`](crate::TimeFile) +pub fn load_file(path: &str) -> Option<TimeFile> { + let mut f = File::open(path).ok()?; let mut content = String::new(); - f.read_to_string(&mut content).unwrap(); + f.read_to_string(&mut content).ok()?; let mut lines: Vec<String> = content.split("\n").map(|l| l.to_owned()).collect(); - lines - .iter_mut() - .map(|line| lexer::lex(line)) - .map(|lex| parser::parse(lex)) - .filter(|line| line.valid()) - .fold(TimeFile::default(), |file, line| file.append(line)) + Some( + lines + .iter_mut() + .map(|line| lexer::lex(line)) + .map(|lex| parser::parse(lex)) + .filter(|line| line.valid()) + .fold(TimeFile::default(), |file, line| file.append(line)), + ) } |