kageru/tracc
2
1
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

Merge pull request 'Group pause time' (#9) from FichteFoll/tracc:feature/group-pause-time into master 

Reviewed-on: #9
This commit is contained in:
kageru 2020-12-19 17:06:46 +01:00
parent 17f683e0d3 0c38ac447e
commit 27d19d91d0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/timesheet.rs
View File

@ -11,7 +11,9 @@ pub struct TimeSheet {
pub register: Option<TimePoint>, pub register: Option<TimePoint>,
} }
const PAUSE_TEXTS: [&str; 3] = ["lunch", "mittag", "pause"]; const MAIN_PAUSE_TEXT: &str = "pause";
const PAUSE_TEXTS: [&str; 4] = [MAIN_PAUSE_TEXT, "lunch", "mittag", "break"];
lazy_static! { lazy_static! {
static ref OVERRIDE_REGEX: regex::Regex = regex::Regex::new("\\[(.*)\\]").unwrap(); static ref OVERRIDE_REGEX: regex::Regex = regex::Regex::new("\\[(.*)\\]").unwrap();
} }
@ -55,13 +57,17 @@ fn read_times(path: &str) -> Option<Vec<TimePoint>> {
* only use the message inside the brackets. * only use the message inside the brackets.
*/ */
fn effective_text(s: String) -> String { fn effective_text(s: String) -> String {
OVERRIDE_REGEX let text = OVERRIDE_REGEX
.captures(&s) .captures(&s)
// index 0 is the entire string // index 0 is the entire string
.and_then(|caps| caps.get(1)) .and_then(|caps| caps.get(1))
.map(|m| m.as_str()) .map(|m| m.as_str())
.unwrap_or(&s) .unwrap_or(&s);
.to_string() if PAUSE_TEXTS.contains(&text) {
MAIN_PAUSE_TEXT
} else {
text
}.to_string()
} }
impl TimeSheet { impl TimeSheet {
@ -106,7 +112,6 @@ impl TimeSheet {
map map
}) })
.into_iter() .into_iter()
.filter(|(text, _)| !PAUSE_TEXTS.contains(&text.as_str()))
} }
pub fn time_by_tasks(&self) -> String { pub fn time_by_tasks(&self) -> String {
@ -118,6 +123,7 @@ impl TimeSheet {
pub fn sum_as_str(&self) -> String { pub fn sum_as_str(&self) -> String {
let total = self let total = self
.grouped_times() .grouped_times()
.filter(|(text, _)| text != MAIN_PAUSE_TEXT)
.fold(Duration::zero(), |total, (_, d)| total + d); .fold(Duration::zero(), |total, (_, d)| total + d);
format_duration(&total) format_duration(&total)
} }