Mirrors/bartib
2
0
Fork 0
mirror of https://github.com/nikolassv/bartib synced 2025-02-26 03:47:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix typo

Browse source
This commit is contained in:
Lukas Dietrich 2022-03-31 22:45:46 +02:00
parent 7c7f3b8883
commit 47d25ef9db
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/data/activity.rs
View file

@ -52,16 +52,16 @@ impl Activity {
}
}
pub fn parse_with_preceeding(
pub fn parse_with_preceding(
plaintext: &str,
preceeding: Option<&Activity>,
preceding: Option<&Activity>,
) -> Result<Activity, ActivityError> {
let activity = Activity::from_str(plaintext)?;
if let Some(preceeding) = preceeding {
match preceeding.end {
Some(preceeding_end) => {
if preceeding_end > activity.start {
if let Some(preceding) = preceding {
match preceding.end {
Some(preceding_end) => {
if preceding_end > activity.start {
return Err(ActivityError::InvalidOrderError);
}
}
@ -346,23 +346,23 @@ mod tests {
}
#[test]
fn parse_with_preceeding_errors() {
fn parse_with_preceding_errors() {
let p = Activity::from_str("2022-03-31 21:31 - 2022-03-31 21:35 | project").unwrap();
let t = Activity::parse_with_preceeding("2022-03-31 21:30 | project", Some(&p));
let t = Activity::parse_with_preceding("2022-03-31 21:30 | project", Some(&p));
assert!(matches!(t, Err(ActivityError::InvalidOrderError)));
let p = Activity::from_str("2022-03-31 21:31 | project").unwrap();
let t = Activity::parse_with_preceeding("2022-03-31 21:30 | project", Some(&p));
let t = Activity::parse_with_preceding("2022-03-31 21:30 | project", Some(&p));
assert!(matches!(t, Err(ActivityError::InvalidOrderError)));
}
#[test]
fn parse_with_preceeding_ok() {
let t = Activity::parse_with_preceeding("2022-03-31 21:30 | project", None);
fn parse_with_preceding_ok() {
let t = Activity::parse_with_preceding("2022-03-31 21:30 | project", None);
assert!(t.is_ok());
let p = Activity::from_str("2022-03-31 21:31 - 2022-03-31 21:35 | project").unwrap();
let t = Activity::parse_with_preceeding("2022-03-31 21:35 | project", Some(&p));
let t = Activity::parse_with_preceding("2022-03-31 21:35 | project", Some(&p));
assert!(t.is_ok());
}
}

6
src/data/bartib_file.rs
View file

@ -27,13 +27,13 @@ pub struct Line {
impl Line {
// creates a new line struct from plaintext
pub fn new(plaintext: &str, line_number: usize, preceeding_line: Option<&Line>) -> Line {
let preceeding_activity = preceeding_line.and_then(|line| line.activity.as_ref().ok());
pub fn new(plaintext: &str, line_number: usize, preceding_line: Option<&Line>) -> Line {
let preceding_activity = preceding_line.and_then(|line| line.activity.as_ref().ok());
Line {
plaintext: Some(plaintext.trim().to_string()),
line_number: Some(line_number),
activity: activity::Activity::parse_with_preceeding(plaintext, preceeding_activity),
activity: activity::Activity::parse_with_preceding(plaintext, preceding_activity),
status: LineStatus::Unchanged,
}
}