gogs
/
tsheet-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: gogs:main
Branches Tags
gogs:main
gogs:v0.0.3
gogs:v0.0.2
gogs:v0.0.1
..
compare: gogs:v0.0.3
Branches Tags
gogs:main
gogs:v0.0.3
gogs:v0.0.2
gogs:v0.0.1

No commits in common. "main" and "v0.0.3" have entirely different histories.
main ... v0.0.3

1 changed files with 293 additions and 394 deletions
Show Stats Expand all files Collapse all files

687
src/main.rs
View File

@ -1,495 +1,394 @@
use chrono::{Local, TimeZone, Timelike}; use serde::{Serialize, Deserialize};
use clap::Parser;
use regex::Regex;
use serde::{Deserialize, Serialize};
use serde_yaml::from_str;
use std::fs::File;
use std::io::{Read, Write}; use std::io::{Read, Write};
use std::fs::File;
use std::time::{SystemTime, UNIX_EPOCH, Duration};
use std::ops::{Add, Sub}; use std::ops::{Add, Sub};
use std::time::{Duration, SystemTime, UNIX_EPOCH}; use clap::Parser;
use chrono::{TimeZone, Local, Timelike};
use regex::Regex;
use serde_yaml::from_str;
#[derive(Debug, Parser)] #[derive(Debug, Parser)]
struct Flags { struct Flags {
#[arg(short = 'f', long = "file")] #[arg(short = 'f', long = "file")]
f: String, f: String,
#[arg(short = 'l', long = "log")] #[arg(short = 'l', long = "log")]
log: bool, log: bool,
#[arg(short = 's', long = "since")] #[arg(short = 's', long = "since")]
since: Option<String>, since: Option<String>,
#[arg(short = 'a', long = "add")] #[arg(short = 'a', long = "add")]
add: Option<String>, add: Option<String>,
#[arg(short = 't', long = "tag")] #[arg(short = 't', long = "tag")]
tag: Option<String>, tag: Option<String>,
#[arg(short = 'c', long = "clock")] #[arg(short = 'c', long = "clock")]
clock: bool, clock: bool,
#[arg(short = 'd', long = "duration")] #[arg(short = 'd', long = "duration")]
duration: Option<String>, duration: Option<String>,
#[arg(short = 'v', long = "verbose")] #[arg(short = 'v', long = "verbose")]
verbose: bool, verbose: bool,
#[arg(short = 'p', long = "precision")] #[arg(short = 'p', long = "precision")]
precision: Option<u32>, precision: Option<u32>,
} }
fn main() { fn main() {
let mut flags = Flags::parse(); let mut flags = Flags::parse();
flags.log = flags.log || flags.since.is_some(); flags.log = flags.log || flags.since.is_some();
let duration = parse_duration(&flags.duration).unwrap(); let duration = parse_duration(&flags.duration).unwrap();
clock( clock(&flags.f, &(flags.clock || flags.duration.is_some()), &duration).unwrap();
&flags.f, add(&flags.f, &flags.add, &flags.tag, &0).unwrap();
&(flags.clock || flags.duration.is_some()), log(&flags.f, &flags.log, &flags.since, &flags.verbose, &flags.precision.unwrap_or(0)).unwrap();
&duration,
)
.unwrap();
add(&flags.f, &flags.add, &flags.tag, &0).unwrap();
log(
&flags.f,
&flags.log,
&flags.since,
&flags.verbose,
&flags.precision.unwrap_or(0),
)
.unwrap();
} }
fn clock(f: &String, clock: &bool, duration: &u64) -> Result<(), String> { fn clock(f: &String, clock: &bool, duration: &u64) -> Result<(), String> {
match clock { match clock {
true => add(&f, &Some("".to_string()), &None, duration), true => add(&f, &Some("".to_string()), &None, duration),
false => Ok(()), false => Ok(()),
} }
} }
fn add(f: &String, x: &Option<String>, tag: &Option<String>, duration: &u64) -> Result<(), String> { fn add(f: &String, x: &Option<String>, tag: &Option<String>, duration: &u64) -> Result<(), String> {
match x { match x {
Some(x) => { Some(x) => {
let mut tsheet = load(&f)?; let mut tsheet = load(&f)?;
tsheet.add( tsheet.add(
x.to_string(), x.to_string(),
tag.clone().unwrap_or("".to_string()), tag.clone().unwrap_or("".to_string()),
*duration, *duration,
); );
save(&f, tsheet)?; save(&f, tsheet)?;
} },
None => {} None => {},
}; };
Ok(()) Ok(())
} }
#[derive(Debug, Serialize, Clone)] #[derive(Debug, Serialize, Clone)]
struct Log { struct Log {
t: String, t: String,
d: f32, d: f32,
xs: Vec<LogX>, xs: Vec<LogX>,
} }
#[derive(Debug, Serialize, Clone)] #[derive(Debug, Serialize, Clone)]
struct LogX { struct LogX {
d: f32, d: f32,
x: String, x: String,
} }
fn log( fn log(f: &String, enabled: &bool, since: &Option<String>, verbose: &bool, precision: &u32) -> Result<(), String> {
f: &String, if !enabled {
enabled: &bool, return Ok(());
since: &Option<String>, }
verbose: &bool, let since = parse_time(since)?;
precision: &u32, if *verbose {
) -> Result<(), String> { eprintln!("since = {} ({})", system_time_to_unix_seconds(&since), timestamp(&system_time_to_unix_seconds(&since)));
if !enabled { }
return Ok(());
}
let since = parse_time(since)?;
if *verbose {
eprintln!(
"since = {} ({})",
system_time_to_unix_seconds(&since),
timestamp(&system_time_to_unix_seconds(&since), &2)
);
}
let tsheet = load(&f)?; let tsheet = load(&f)?;
let tsheet = tsheet.since(since); let tsheet = tsheet.since(since);
if *verbose { let tsheet = tsheet.sorted();
eprintln!("tsheet = {:?}", &tsheet); if *verbose {
} eprintln!("tsheet = {:?}", &tsheet);
}
let mut result = vec![]; let mut result = vec![];
let mut curr = Log { let mut curr = Log{t: "".to_string(), d: 0.0, xs: vec![]};
t: "".to_string(), for i in 0..tsheet.xs.len() {
d: 0.0, let x = &tsheet.xs[i];
xs: vec![], if *verbose {
}; eprintln!("{} != {}?", &curr.t, x.timestamp());
let mut currt = "".to_string(); }
for i in 0..tsheet.xs.len() { if curr.t != x.timestamp() {
let x = &tsheet.xs[i]; if curr.xs.len() > 0 {
if *verbose { if *verbose {
eprintln!("{} != {}?", &curr.t, x.timestamp(&precision)); eprintln!("push {:?}", &curr.xs);
}
if currt != x.timestamp(&0) {
if curr.xs.len() > 0 {
if *verbose {
eprintln!("push {:?}", &curr.xs);
}
result.push(curr.clone());
} }
curr.xs.truncate(0); result.push(curr.clone());
curr.t = x.timestamp(&precision); }
currt = x.timestamp(&0); curr.xs.truncate(0);
curr.d = 0.0; curr.t = x.timestamp();
} curr.d = 0.0;
let mut d = 1.0; }
if x.x.len() == 0 { let mut d = 1.0;
// clock ins get duration zero if x.x.len() == 0 {
d = 0.0; d = 0.0;
} else if i > 0 && tsheet.xs[i].timestamp(&0) == tsheet.xs[i - 1].timestamp(&0) { } else if i > 0 {
// if same day as previous then use elapsed as duration d = ((tsheet.xs[i].t - tsheet.xs[i-1].t) as f32 / (60.0*60.0)) as f32;
d = ((tsheet.xs[i].t - tsheet.xs[i - 1].t) as f32 / (60.0 * 60.0)) as f32; }
} if *verbose {
if *verbose { eprintln!("d={} x='{}'", &x.x, &d);
eprintln!("d={} x='{}'", &x.x, &d); }
} match x.x.len() {
match x.x.len() { 0 => {},
0 => {} _ => {
_ => { curr.t = x.timestamp();
curr.t = x.timestamp(&precision); curr.xs.push(LogX{d: d, x: x.x.clone()});
currt = x.timestamp(&0); },
curr.xs.push(LogX { };
d: d, }
x: x.x.clone(), if curr.xs.len() > 0 {
}); if *verbose {
eprintln!("push {:?} (final)", &curr.xs);
}
result.push(curr.clone());
}
for i in result.iter_mut() {
i.d = i.xs.iter().map(|x| x.d).sum();
if *verbose {
eprintln!("{} = {:?}", &i.d, &i.xs.iter().map(|x| x.d).collect::<Vec<_>>());
}
}
for log in result {
for x in log.xs {
if x.x.len() > 0 {
match precision {
0 => println!("{} ({:.0}) {} ({:.1})", log.t, log.d, x.x, x.d),
1 => println!("{} ({:.1}) {} ({:.2})", log.t, log.d, x.x, x.d),
_ => println!("{} ({:.2}) {} ({:.3})", log.t, log.d, x.x, x.d),
} }
}; }
} }
if curr.xs.len() > 0 { }
if *verbose { Ok(())
eprintln!("push {:?} (final)", &curr.xs);
}
result.push(curr.clone());
}
let mut total_d = 0.0;
for i in result.iter_mut() {
i.d = i.xs.iter().map(|x| x.d).sum();
total_d += i.d;
if *verbose {
eprintln!(
"{} = {:?}",
&i.d,
&i.xs.iter().map(|x| x.d).collect::<Vec<_>>()
);
}
}
for log in &result {
for x in log.xs.clone() {
if x.x.len() > 0 {
match precision {
0 => println!("{} ({:.0}) {} ({:.1})", log.t, log.d, x.x, x.d),
1 => println!("{} ({:.1}) {} ({:.2})", log.t, log.d, x.x, x.d),
_ => println!("{} ({:.2}) {} ({:.3})", log.t, log.d, x.x, x.d),
}
}
}
}
if result.len() > 1 {
match precision {
0 => eprintln!(
"({:.0}h of {}h over {} dates)",
total_d,
8 * result.len(),
result.len()
),
1 => eprintln!(
"({:.1}h of {}h over {} dates)",
total_d,
8 * result.len(),
result.len()
),
_ => eprintln!(
"({:.2}h of {}h over {} dates)",
total_d,
8 * result.len(),
result.len()
),
}
}
Ok(())
} }
#[cfg(test)] #[cfg(test)]
mod test_parse { mod test_parse {
use super::*; use super::*;
#[test] #[test]
fn test_duration() { fn test_duration() {
assert_eq!(0, parse_duration(&None).unwrap()); assert_eq!(0, parse_duration(&None).unwrap());
assert_eq!(1, parse_duration(&Some("1s".to_string())).unwrap()); assert_eq!(1, parse_duration(&Some("1s".to_string())).unwrap());
assert_eq!(33, parse_duration(&Some("33s".to_string())).unwrap()); assert_eq!(33, parse_duration(&Some("33s".to_string())).unwrap());
assert_eq!(666, parse_duration(&Some("666s".to_string())).unwrap()); assert_eq!(666, parse_duration(&Some("666s".to_string())).unwrap());
assert_eq!(60, parse_duration(&Some("1m".to_string())).unwrap()); assert_eq!(60, parse_duration(&Some("1m".to_string())).unwrap());
assert_eq!(62, parse_duration(&Some("1m2s".to_string())).unwrap()); assert_eq!(62, parse_duration(&Some("1m2s".to_string())).unwrap());
assert_eq!(3600, parse_duration(&Some("1h".to_string())).unwrap()); assert_eq!(3600, parse_duration(&Some("1h".to_string())).unwrap());
assert_eq!(3723, parse_duration(&Some("1h2m3s".to_string())).unwrap()); assert_eq!(3723, parse_duration(&Some("1h2m3s".to_string())).unwrap());
} }
} }
fn parse_duration(d: &Option<String>) -> Result<u64, String> { fn parse_duration(d: &Option<String>) -> Result<u64, String> {
match d { match d {
Some(d) => { Some(d) => {
let mut sum: u64 = 0; let mut sum: u64 = 0;
let re = Regex::new(r"^(?<hours>[0-9]+h)?(?<minutes>[0-9]+m)?(?<seconds>[0-9]+s)?$") let re = Regex::new(r"^(?<hours>[0-9]+h)?(?<minutes>[0-9]+m)?(?<seconds>[0-9]+s)?$").unwrap();
.unwrap(); match re.captures(d) {
match re.captures(d) { Some(captures) => {
Some(captures) => { match captures.name("seconds") {
match captures.name("seconds") { Some(n) => {
Some(n) => { let n = n.as_str().to_string();
let n = n.as_str().to_string(); let n = n.trim_end_matches('s');
let n = n.trim_end_matches('s'); sum += from_str::<u64>(n).unwrap();
sum += from_str::<u64>(n).unwrap(); },
} None => {},
None => {} };
}; match captures.name("minutes") {
match captures.name("minutes") { Some(n) => {
Some(n) => { let n = n.as_str().to_string();
let n = n.as_str().to_string(); let n = n.trim_end_matches('m');
let n = n.trim_end_matches('m'); sum += 60 * from_str::<u64>(n).unwrap();
sum += 60 * from_str::<u64>(n).unwrap(); },
} None => {},
None => {} };
}; match captures.name("hours") {
match captures.name("hours") { Some(n) => {
Some(n) => { let n = n.as_str().to_string();
let n = n.as_str().to_string(); let n = n.trim_end_matches('h');
let n = n.trim_end_matches('h'); sum += 60 * 60 * from_str::<u64>(n).unwrap();
sum += 60 * 60 * from_str::<u64>(n).unwrap(); },
} None => {},
None => {} };
}; Ok(sum)
Ok(sum) },
} None => Ok(0),
None => Ok(0), }
} },
} None => Ok(0),
None => Ok(0), }
}
} }
fn parse_time(since: &Option<String>) -> Result<SystemTime, String> { fn parse_time(since: &Option<String>) -> Result<SystemTime, String> {
match since { match since {
Some(since) => match chrono::NaiveDate::parse_from_str(since, "%Y-%m-%d") { Some(since) => {
match chrono::NaiveDate::parse_from_str(since, "%Y-%m-%d") {
Ok(nd) => { Ok(nd) => {
let ndt = nd.and_hms_opt(1, 1, 1).unwrap(); let ndt = nd.and_hms_opt(1, 1, 1).unwrap();
let dt = Local.from_local_datetime(&ndt).unwrap(); let dt = Local.from_local_datetime(&ndt).unwrap();
Ok(UNIX_EPOCH.add(Duration::from_secs(dt.timestamp() as u64))) Ok(UNIX_EPOCH.add(
} Duration::from_secs(dt.timestamp() as u64)
))
},
Err(msg) => Err(format!("failed to parse {}: {}", since, msg)), Err(msg) => Err(format!("failed to parse {}: {}", since, msg)),
}, }
None => { },
Ok(SystemTime::now().sub(Duration::from_secs(Local::now().hour() as u64 * 60 * 60))) None => Ok(SystemTime::now().sub(Duration::from_secs(Local::now().hour() as u64*60*60))),
} }
}
} }
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
struct TSheet { struct TSheet {
xs: Vec<X>, xs: Vec<X>,
} }
#[derive(Debug, PartialEq, Serialize, Deserialize, Clone, Ord, Eq, PartialOrd)] #[derive(Debug, PartialEq, Serialize, Deserialize, Clone, Ord, Eq, PartialOrd)]
struct X { struct X {
t: i64, t: i64,
x: String, x: String,
tag: String, tag: String,
} }
fn save(path: &String, tsheet: TSheet) -> Result<(), String> { fn save(path: &String, tsheet: TSheet) -> Result<(), String> {
match File::create(path.clone()) { match File::create(path.clone()) {
Ok(mut writer) => _save(&mut writer, tsheet), Ok(mut writer) => _save(&mut writer, tsheet),
Err(reason) => Err(format!( Err(reason) => Err(format!("failed to open {} to save tsheet: {}", path, reason)),
"failed to open {} to save tsheet: {}", }
path, reason
)),
}
} }
fn _save(writer: &mut dyn Write, tsheet: TSheet) -> Result<(), String> { fn _save(writer: &mut dyn Write, tsheet: TSheet) -> Result<(), String> {
let mut w = serde_yaml::Serializer::new(writer); let mut w = serde_yaml::Serializer::new(writer);
match tsheet.serialize(&mut w) { match tsheet.serialize(&mut w) {
Ok(_) => Ok(()), Ok(_) => Ok(()),
Err(reason) => Err(format!("failed to serialize tsheet: {}", reason)), Err(reason) => Err(format!("failed to serialize tsheet: {}", reason)),
} }
} }
fn load(path: &String) -> Result<TSheet, String> { fn load(path: &String) -> Result<TSheet, String> {
match File::open(path.clone()) { match File::open(path.clone()) {
Ok(mut reader) => _load(&mut reader), Ok(mut reader) => _load(&mut reader),
Err(reason) => Err(format!("failed to read tsheet {}: {}", path, reason)), Err(reason) => Err(format!("failed to read tsheet {}: {}", path, reason)),
} }
} }
fn _load(reader: &mut dyn Read) -> Result<TSheet, String> { fn _load(reader: &mut dyn Read) -> Result<TSheet, String> {
match serde_yaml::from_reader::<&mut dyn Read, TSheet>(reader) { match serde_yaml::from_reader::<&mut dyn Read, TSheet>(reader) {
Ok(tsheet) => Ok(tsheet), Ok(tsheet) => Ok(tsheet),
Err(err) => Err(format!("failed to parse tsheet: {}", err)), Err(err) => Err(format!("failed to parse tsheet: {}", err)),
} }
} }
#[cfg(test)] #[cfg(test)]
mod test_save_load { mod test_save_load {
use super::*; use super::*;
#[test] #[test]
fn test_empty() { fn test_empty() {
let got = _load(&mut "xs: []".as_bytes()).expect("failed to parse 'xs: []' tsheet"); let got = _load(&mut "xs: []".as_bytes()).expect("failed to parse 'xs: []' tsheet");
assert_eq!(got, TSheet { xs: vec![] }); assert_eq!(got, TSheet{xs: vec![]});
let mut w = vec![]; let mut w = vec![];
_save(&mut w, got).expect("failed saving tsheet to writer"); _save(&mut w, got).expect("failed saving tsheet to writer");
assert_eq!(String::from_utf8(w).unwrap(), "xs: []\n".to_string()); assert_eq!(String::from_utf8(w).unwrap(), "xs: []\n".to_string());
} }
#[test] #[test]
fn test_testdata_standalone_yaml() { fn test_testdata_standalone_yaml() {
let want = TSheet { let want = TSheet{xs: vec![
xs: vec![ X{t: 1, x: "def".to_string(), tag: "abc".to_string()},
X { X{t: 2, x: "ghi".to_string(), tag: "".to_string()},
t: 1, ]};
x: "def".to_string(), assert_eq!(
tag: "abc".to_string(), load(&"./src/testdata/standalone.yaml".to_string()).expect("cant load standalone.yaml"),
}, want,
X { );
t: 2,
x: "ghi".to_string(),
tag: "".to_string(),
},
],
};
assert_eq!(
load(&"./src/testdata/standalone.yaml".to_string()).expect("cant load standalone.yaml"),
want,
);
let mut w = vec![]; let mut w = vec![];
_save(&mut w, want).expect("failed saving tsheet to writer"); _save(&mut w, want).expect("failed saving tsheet to writer");
assert_eq!( assert_eq!(String::from_utf8(w).unwrap(), "xs:\n- t: 1\n x: def\n tag: abc\n- t: 2\n x: ghi\n tag: ''\n".to_string());
String::from_utf8(w).unwrap(), }
"xs:\n- t: 1\n x: def\n tag: abc\n- t: 2\n x: ghi\n tag: ''\n".to_string()
);
}
} }
impl TSheet { impl TSheet {
fn since(&self, t: SystemTime) -> TSheet { fn since(&self, t: SystemTime) -> TSheet {
let mut result = TSheet { xs: vec![] }; let mut result = TSheet{xs: vec![]};
self.xs self.xs.iter()
.iter() .filter(|x| x.ts() >= t)
.filter(|x| x.ts() >= t) .for_each(|x| result.xs.push(x.clone()));
.for_each(|x| result.xs.push(x.clone())); result
result }
}
fn add(&mut self, x: String, tag: String, duration: u64) { fn add(&mut self, x: String, tag: String, duration: u64) {
let now = system_time_to_unix_seconds(&SystemTime::now()); let now = system_time_to_unix_seconds(&SystemTime::now());
self.xs.push(new_x(now - duration as i64, x, tag)); self.xs.push(new_x(
} now - duration as i64,
x,
tag,
));
}
fn sorted(&self) -> TSheet {
let mut result = TSheet{xs: self.xs.clone()};
result.xs.sort();
return result;
}
} }
impl X { impl X {
fn ts(&self) -> SystemTime { fn ts(&self) -> SystemTime {
UNIX_EPOCH.add(Duration::from_secs(self.t.try_into().unwrap())) UNIX_EPOCH.add(Duration::from_secs(self.t.try_into().unwrap()))
} }
fn timestamp(&self, precision: &u32) -> String { fn timestamp(&self) -> String {
timestamp(&self.t, &precision) timestamp(&self.t)
} }
} }
fn system_time_to_unix_seconds(st: &SystemTime) -> i64 { fn system_time_to_unix_seconds(st: &SystemTime) -> i64 {
st.duration_since(UNIX_EPOCH).unwrap().as_secs() as i64 st.duration_since(UNIX_EPOCH).unwrap().as_secs() as i64
} }
fn timestamp(t: &i64, precision: &u32) -> String { fn timestamp(t: &i64) -> String {
let dt = Local.timestamp_opt(*t, 0).unwrap(); let dt = Local.timestamp_opt(*t, 0).unwrap();
match precision { dt.format("%Y-%m-%d").to_string()
0 => dt.format("%Y-%m-%d").to_string(),
1 => dt.format("%Y-%m-%dT%H:%M").to_string(),
_ => dt.format("%Y-%m-%dT%H:%M:%S").to_string(),
}
} }
fn new_x(t: i64, x: String, tag: String) -> X { fn new_x(t: i64, x: String, tag: String) -> X {
X { X{
t: t, t: t,
x: x, x: x,
tag: tag, tag: tag,
} }
} }
#[cfg(test)] #[cfg(test)]
mod test_tsheet { mod test_tsheet {
use super::*; use super::*;
#[test] #[test]
fn test_add() { fn test_add() {
let mut given = TSheet { let mut given = TSheet{xs: vec![
xs: vec![X { X{t: 1, x: "def".to_string(), tag: "abc".to_string()},
t: 1, ]};
x: "def".to_string(), given.add("ghi".to_string(), "".to_string(), 0);
tag: "abc".to_string(), assert_eq!(given.xs.len(), 2);
}], assert!(given.xs[1].t != 1);
}; assert_eq!(given.xs[1].x, "ghi".to_string());
given.add("ghi".to_string(), "".to_string(), 0); assert_eq!(given.xs[1].tag, "".to_string());
assert_eq!(given.xs.len(), 2); }
assert!(given.xs[1].t != 1);
assert_eq!(given.xs[1].x, "ghi".to_string());
assert_eq!(given.xs[1].tag, "".to_string());
}
#[test] #[test]
fn test_since_date() { fn test_since_date() {
let given = TSheet { let given = TSheet{xs: vec![
xs: vec![ X{t: 1, x: "def".to_string(), tag: "abc".to_string()},
X { X{t: 2, x: "ghi".to_string(), tag: "".to_string()},
t: 1, X{t: 3, x: "jkl".to_string(), tag: "".to_string()},
x: "def".to_string(), ]};
tag: "abc".to_string(), let want = TSheet{xs: vec![
}, X{t: 2, x: "ghi".to_string(), tag: "".to_string()},
X { X{t: 3, x: "jkl".to_string(), tag: "".to_string()},
t: 2, ]};
x: "ghi".to_string(), let got = given.since(UNIX_EPOCH.add(Duration::from_secs(2)));
tag: "".to_string(), assert_eq!(got, want);
}, }
X {
t: 3,
x: "jkl".to_string(),
tag: "".to_string(),
},
],
};
let want = TSheet {
xs: vec![
X {
t: 2,
x: "ghi".to_string(),
tag: "".to_string(),
},
X {
t: 3,
x: "jkl".to_string(),
tag: "".to_string(),
},
],
};
let got = given.since(UNIX_EPOCH.add(Duration::from_secs(2)));
assert_eq!(got, want);
}
} }