pindrop
/
timetracker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactored doprocess

This commit is contained in:
Trey Blancher 2022-11-11 12:38:54 -05:00
parent d86822c40e
commit 914a57692f
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust/timetracking/Cargo.lock generated
View File

@ -130,7 +130,7 @@ dependencies = [
] ]
[[package]] [[package]]
name = "do_process" name = "doprocess"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"itertools", "itertools",

2
rust/timetracking/Cargo.toml
View File

@ -2,7 +2,7 @@
members = [ members = [
"timetracker", "timetracker",
"do_process", "doprocess",
"chug", "chug",
"timelogging" "timelogging"
] ]

2
rust/timetracking/do_process/Cargo.toml → rust/timetracking/doprocess/Cargo.toml
View File

@ -1,5 +1,5 @@
[package] [package]
name = "do_process" name = "doprocess"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"

9
rust/timetracking/do_process/src/main.rs → rust/timetracking/doprocess/src/main.rs
View File

@ -6,6 +6,9 @@ use itertools::Itertools;
use timelogging::timetracking::{nearest, process_input_file, generate_individual_timecards}; use timelogging::timetracking::{nearest, process_input_file, generate_individual_timecards};
fn main() { fn main() {
// set up a regex for escaping regex characters
let cat_esc = Regex::new(r"(?P<char>[-*^$+?])").unwrap();
// Process the file (stdin or file argument) // Process the file (stdin or file argument)
let input = env::args().nth(1); let input = env::args().nth(1);
let mut reader: Box<dyn BufRead> = match input { let mut reader: Box<dyn BufRead> = match input {
@ -24,7 +27,10 @@ fn main() {
let mut running_total: f64 = 0.0; let mut running_total: f64 = 0.0;
for cat in categories { for cat in categories {
let mut subtotal: f64 = 0.0; let mut subtotal: f64 = 0.0;
let catre = Regex::new(&format!(r"\[{}\]\s+.*\s*$", cat).to_string()).unwrap(); let catre = Regex::new(&format!(r"\[{}\]\s+.*\s*$",
cat_esc.replace_all(&cat, r"\$char".to_string()))
.to_string())
.unwrap();
for (act, duration) in ind.iter().sorted_by_key(|x| x.0) { for (act, duration) in ind.iter().sorted_by_key(|x| x.0) {
if ! catre.is_match(&act.to_string()) { if ! catre.is_match(&act.to_string()) {
continue continue
@ -49,3 +55,4 @@ fn main() {
println!("{}", format!("Grand total: {:.2}", gtoth)); println!("{}", format!("Grand total: {:.2}", gtoth));
} }