{"header":{"message":"implement rudimentary input interface","description":null,"timestamp":"2021-10-11T22:38:03.319939711Z","authors":[{}]},"hash":"IFGIYSTX7BM42O6Q5U7G246MZ5SRIWK65IVHMEG3CN6RSK5FDOCQC","authors":[{"login":"fogti","key":"ZFnYYAXSF9fgPaXKyrt5a2oor75nLVcpU8T8fEnRqwm"}],"deps":{"hashes":[["IFGIYSTX7BM42O6Q5U7G246MZ5SRIWK65IVHMEG3CN6RSK5FDOCQC","implement rudimentary input interface"],["AA",null],["WU6CLCANMTMBB3BGGL4XYKPKI3JRPTDOJ3GTUEGZLA3WIWUPJJIQC","initial code"]],"deps":["WU6CLCANMTMBB3BGGL4XYKPKI3JRPTDOJ3GTUEGZLA3WIWUPJJIQC"],"known":[]},"hunks":[{"FileDel":{"deleted_names":[{"basename":"zs-utilinv-terminal","metadata":576}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":18},"to":{"change":2,"start":19,"end":49},"introduced_by":2},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":49},"to":{"change":2,"start":50,"end":50},"introduced_by":2}],"inode":{"change":2,"pos":50}}},"content_edges":null,"content":[]}},{"FileDel":{"deleted_names":[{"basename":"Cargo.toml","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":50},"to":{"change":2,"start":3322,"end":3356},"introduced_by":2},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":3356},"to":{"change":2,"start":3357,"end":3357},"introduced_by":2}],"inode":{"change":2,"pos":3357}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3357},"to":{"change":2,"start":3358,"end":3500},"introduced_by":2}],"inode":{"change":2,"pos":3357}},"content":[{"Del":"[package]\nname = \"zs-utilinv-terminal\"\nversion = \"0.1.0\"\nedition = \"2018\"\nlicense = \"Apache-2.0\"\n\n[dependencies]\nlibc = \"0.2\"\ntermion = \"1.5\"\n"}]}},{"FileDel":{"deleted_names":[{"basename":"src","metadata":576}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":50},"to":{"change":2,"start":51,"end":65},"introduced_by":2},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":65},"to":{"change":2,"start":66,"end":66},"introduced_by":2}],"inode":{"change":2,"pos":66}}},"content_edges":null,"content":[]}},{"FileDel":{"deleted_names":[{"basename":"lib.rs","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":66},"to":{"change":2,"start":67,"end":97},"introduced_by":2},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":97},"to":{"change":2,"start":98,"end":98},"introduced_by":2}],"inode":{"change":2,"pos":98}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":98},"to":{"change":2,"start":99,"end":3321},"introduced_by":2}],"inode":{"change":2,"pos":98}},"content":[{"Del":"use std::{cell::RefCell, fs::File, fs::OpenOptions, io::BufWriter, io::Write};\nuse termion::{input::MouseTerminal, raw::RawTerminal, screen::AlternateScreen};\n\npub struct Terminal {\n pub inpevs: termion::input::Events,\n pub outp: RefCell>>>>,\n}\n\n/// Set the given file to be read in non-blocking mode. That is, attempting a\n/// read on the given file may return 0 bytes.\n///\n/// Copied from private function at https://docs.rs/nonblock/0.1.0/nonblock/.\n///\n/// The MIT License (MIT)\n///\n/// Copyright (c) 2016 Anthony Nowell\n///\n/// Permission is hereby granted, free of charge, to any person obtaining a copy\n/// of this software and associated documentation files (the \"Software\"), to deal\n/// in the Software without restriction, including without limitation the rights\n/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n/// copies of the Software, and to permit persons to whom the Software is\n/// furnished to do so, subject to the following conditions:\n///\n/// The above copyright notice and this permission notice shall be included in all\n/// copies or substantial portions of the Software.\n///\n/// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n/// SOFTWARE.\n#[cfg(unix)]\nfn set_blocking(file: &File, blocking: bool) -> std::io::Result<()> {\n use libc::{fcntl, F_GETFL, F_SETFL, O_NONBLOCK};\n use std::os::unix::io::AsRawFd;\n\n let fd = file.as_raw_fd();\n let flags = unsafe { fcntl(fd, F_GETFL, 0) };\n if flags < 0 {\n return Err(std::io::Error::last_os_error());\n }\n\n let flags = if blocking {\n flags & !O_NONBLOCK\n } else {\n flags | O_NONBLOCK\n };\n let res = unsafe { fcntl(fd, F_SETFL, flags) };\n if res != 0 {\n return Err(std::io::Error::last_os_error());\n }\n\n Ok(())\n}\n\nimpl Terminal {\n pub fn try_new() -> std::io::Result {\n use termion::{input::TermRead, raw::IntoRawMode};\n let term_out = OpenOptions::new().write(true).open(\"/dev/tty\")?;\n let term_in = OpenOptions::new().read(true).open(\"/dev/tty\")?;\n set_blocking(&term_in, false)?;\n let inpevs = term_in.events();\n let outp = RefCell::new(AlternateScreen::from(MouseTerminal::from(\n BufWriter::with_capacity(8_388_608, term_out).into_raw_mode()?,\n )));\n Ok(Self { inpevs, outp })\n }\n\n pub fn rewrite_line(&self, s: &str) -> std::io::Result<()> {\n let mut x = self.outp.borrow_mut();\n write!(&mut x, \"\\r{}{}\", s, termion::clear::UntilNewline)?;\n x.flush()?;\n Ok(())\n }\n\n pub fn finish(self) -> std::io::Result<()> {\n let mut x = self.outp.borrow_mut();\n write!(self.outp.borrow_mut(), \"\\n\")?;\n x.flush()?;\n Ok(())\n }\n}\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":1,"ins":{"up_context":[{"change":2,"pos":3640}],"down_context":[{"change":2,"pos":3664}],"flag":"BLOCK","start":0,"end":27,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3640},"to":{"change":2,"start":3641,"end":3664},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":"pub use chrono::NaiveDate;"}],"del_contents":[{"Del":"use chrono::NaiveDate;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":3,"ins":{"up_context":[{"change":2,"pos":3701}],"down_context":[{"change":2,"pos":3733}],"flag":"BLOCK","start":28,"end":98,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3701},"to":{"change":2,"start":3701,"end":3733},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":"use std::collections::BTreeSet;"},{"Add":"use std::fmt;"},{"Add":"use std::path::PathBuf;"}],"del_contents":[{"Del":"use std::path::{Path, PathBuf};\n"}]}},{"Edit":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":9,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3776}],"down_context":[{"change":2,"pos":3776}],"flag":"BLOCK","start":99,"end":159,"inode":{"change":2,"pos":3640}}},"contents":[{"Add":"pub struct Handle {"},{"Add":" base: PathBuf,"},{"Add":" name: String,"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":26,"ins":{"up_context":[{"change":2,"pos":4128}],"down_context":[{"change":2,"pos":4180}],"flag":"BLOCK","start":160,"end":233,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4128},"to":{"change":2,"start":4128,"end":4180},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":"#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]"}],"del_contents":[{"Del":"#[derive(Debug, Deserialize, Serialize, PartialEq)]\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":40,"ins":{"up_context":[{"change":2,"pos":4437}],"down_context":[{"change":2,"pos":4493}],"flag":"BLOCK","start":234,"end":320,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4437},"to":{"change":2,"start":4437,"end":4493},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":"#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]"}],"del_contents":[{"Del":"#[derive(Debug, Deserialize, Serialize, PartialEq, Eq)]\n"}]}},{"Edit":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":55,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":4908}],"down_context":[{"change":2,"pos":4908}],"flag":"BLOCK","start":321,"end":424,"inode":{"change":2,"pos":3640}}},"contents":[{"Add":""},{"Add":"impl Handle {"},{"Add":" pub fn new(base: PathBuf, name: String) -> Self {"},{"Add":" Self { base, name }"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":61,"ins":{"up_context":[{"change":2,"pos":4909}],"down_context":[{"change":2,"pos":4946}],"flag":"BLOCK","start":425,"end":483,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4909},"to":{"change":2,"start":4909,"end":4946},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" pub fn name(&self) -> &str {"},{"Add":" &self.name"},{"Add":" }"}],"del_contents":[{"Del":"const METER_LEXT: &str = \"metercsv\";\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":65,"ins":{"up_context":[{"change":2,"pos":4947}],"down_context":[{"change":2,"pos":5084}],"flag":"BLOCK","start":484,"end":1504,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4947},"to":{"change":2,"start":4947,"end":5084},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" pub fn log_path(&self) -> PathBuf {"},{"Add":" let mut path = self.base.join(&self.name);"},{"Add":" path.set_extension(\"metercsv\");"},{"Add":" path"},{"Add":" }"},{"Add":""},{"Add":" pub fn read_logdata(&self) -> Result, Error> {"},{"Add":" csv::ReaderBuilder::new()"},{"Add":" .delimiter(0x1f)"},{"Add":" .from_path(self.log_path())?"},{"Add":" .deserialize()"},{"Add":" .map(|i| i.map_err(Into::into))"},{"Add":" .collect()"},{"Add":" }"},{"Add":""},{"Add":" pub fn write_logdata(&self, data: &BTreeSet) -> Result<(), Error> {"},{"Add":" use std::io::Write;"},{"Add":" let f = tempfile::NamedTempFile::new_in(&self.base).map_err(csv::Error::from)?;"},{"Add":" let mut f = csv::WriterBuilder::new().delimiter(0x1f).from_writer(f);"},{"Add":" for i in data {"},{"Add":" f.serialize(i)?;"},{"Add":" }"},{"Add":" // get the NamedTempFile back"},{"Add":" let mut f = f.into_inner()?;"},{"Add":" f.flush().map_err(csv::Error::from)?;"},{"Add":" f.persist(self.log_path())?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone, Copy)]"},{"Add":"pub enum ValidateErrorKind {"},{"Add":" InvalidValueDir,"}],"del_contents":[{"Del":"fn get_meter_path(base: &Path, name: &str) -> PathBuf {\n let mut path = base.join(name);\n path.set_extension(METER_LEXT);\n path\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":100,"ins":{"up_context":[{"change":2,"pos":5087}],"down_context":[{"change":2,"pos":5354}],"flag":"BLOCK","start":1505,"end":1607,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5087},"to":{"change":2,"start":5087,"end":5354},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":"pub struct ValidateError<'e> {"},{"Add":" a: &'e LogEntry,"},{"Add":" b: &'e LogEntry,"},{"Add":" kind: ValidateErrorKind,"}],"del_contents":[{"Del":"pub fn parse_logdata(bpath: &Path, name: &str) -> Result, Error> {\n csv::ReaderBuilder::new()\n .delimiter(0x1f)\n .from_path(get_meter_path(bpath, name))?\n .deserialize()\n .map(|i| i.map_err(Into::into))\n .collect()\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":106,"ins":{"up_context":[{"change":2,"pos":5357}],"down_context":[{"change":2,"pos":5712}],"flag":"BLOCK","start":1608,"end":1994,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5357},"to":{"change":2,"start":5357,"end":5712},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":"impl fmt::Display for ValidateError<'_> {"},{"Add":" fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {"},{"Add":" use ValidateErrorKind as K;"},{"Add":" writeln!("},{"Add":" f,"},{"Add":" \"log error: {}\\n a = {:?}\\n b = {:?}\","},{"Add":" match self.kind {"},{"Add":" K::InvalidValueDir => \"invalid value direction\","},{"Add":" },"},{"Add":" self.a,"},{"Add":" self.b"},{"Add":" )"}],"del_contents":[{"Del":"pub fn write_logdata(bpath: &Path, name: &str, data: &[LogEntry]) -> Result<(), Error> {\n use std::io::Write;\n let f = tempfile::NamedTempFile::new_in(bpath).map_err(csv::Error::from)?;\n let path = get_meter_path(bpath, name);\n let mut f = csv::WriterBuilder::new().delimiter(0x1f).from_writer(f);\n for i in data {\n f.serialize(i)?;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":119,"ins":{"up_context":[{"change":2,"pos":5718}],"down_context":[{"change":2,"pos":5860}],"flag":"BLOCK","start":1995,"end":3021,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5718},"to":{"change":2,"start":5718,"end":5860},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":"}"},{"Add":""},{"Add":"pub fn validate_logdata<'a>("},{"Add":" logdata: &'a BTreeSet,"},{"Add":" limit_date: Option<&NaiveDate>,"},{"Add":") -> Vec> {"},{"Add":" let ldv: Vec<&_> = logdata.iter().collect();"},{"Add":" ldv.windows(2)"},{"Add":" .map(|i| match i {"},{"Add":" [a, b] => (a, b),"},{"Add":" _ => unreachable!(),"},{"Add":" })"},{"Add":" .filter(|(a, b)| {"},{"Add":" if let Some(x) = limit_date {"},{"Add":" if !(&a.date == x || &b.date == x) {"},{"Add":" return false;"},{"Add":" }"},{"Add":" }"},{"Add":" true"},{"Add":" })"},{"Add":" .filter_map(|(a, b)| {"},{"Add":" use LogCommand as C;"},{"Add":" use ValidateErrorKind as K;"},{"Add":" Some(ValidateError {"},{"Add":" a,"},{"Add":" b,"},{"Add":" kind: match (a.cmd, b.cmd) {"},{"Add":" (C::Increase, C::Increase) if a.value >= b.value => K::InvalidValueDir,"},{"Add":" (C::Decrease, C::Decrease) if a.value <= b.value => K::InvalidValueDir,"},{"Add":" _ => return None,"},{"Add":" },"},{"Add":" })"},{"Add":" })"},{"Add":" .collect()"}],"del_contents":[{"Del":" // get the NamedTempFile back\n let mut f = f.into_inner()?;\n f.flush().map_err(csv::Error::from)?;\n f.persist(path)?;\n Ok(())\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":162,"ins":{"up_context":[{"change":2,"pos":5956}],"down_context":[{"change":2,"pos":6018}],"flag":"BLOCK","start":3022,"end":3108,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5956},"to":{"change":2,"start":5956,"end":6018},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" Handle::new(PathBuf::from(\"../meters\"), \"whubbs\".to_string()).log_path(),"}],"del_contents":[{"Del":" get_meter_path(Path::new(\"../meters\"), \"whubbs\"),\n"}]}},{"Edit":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":170,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":6206}],"down_context":[{"change":2,"pos":6206}],"flag":"BLOCK","start":3109,"end":3243,"inode":{"change":2,"pos":3640}}},"contents":[{"Add":" let handle = Handle::new("},{"Add":" dir.path().to_path_buf(),"},{"Add":" \"basic-countermeter-test\".to_string(),"},{"Add":" );"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":183,"ins":{"up_context":[{"change":2,"pos":6483}],"down_context":[{"change":2,"pos":6540}],"flag":"BLOCK","start":3244,"end":3301,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":6483},"to":{"change":2,"start":6483,"end":6540},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" date: NaiveDate::from_ymd(2021, 10, 11),"}],"del_contents":[{"Del":" date: NaiveDate::from_ymd(2021, 10, 10),\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":189,"ins":{"up_context":[{"change":2,"pos":6726}],"down_context":[{"change":2,"pos":6783}],"flag":"BLOCK","start":3302,"end":3359,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":6726},"to":{"change":2,"start":6726,"end":6783},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" date: NaiveDate::from_ymd(2021, 10, 12),"}],"del_contents":[{"Del":" date: NaiveDate::from_ymd(2021, 10, 11),\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":195,"ins":{"up_context":[{"change":2,"pos":6969}],"down_context":[{"change":2,"pos":7026}],"flag":"BLOCK","start":3360,"end":3417,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":6969},"to":{"change":2,"start":6969,"end":7026},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" date: NaiveDate::from_ymd(2021, 10, 13),"}],"del_contents":[{"Del":" date: NaiveDate::from_ymd(2021, 10, 11),\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":201,"ins":{"up_context":[{"change":2,"pos":7232}],"down_context":[{"change":2,"pos":7289}],"flag":"BLOCK","start":3418,"end":3475,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":7232},"to":{"change":2,"start":7232,"end":7289},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" date: NaiveDate::from_ymd(2021, 10, 14),"}],"del_contents":[{"Del":" date: NaiveDate::from_ymd(2021, 10, 12),\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":206,"ins":{"up_context":[{"change":2,"pos":7452}],"down_context":[{"change":2,"pos":7463}],"flag":"BLOCK","start":3476,"end":3542,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":7452},"to":{"change":2,"start":7452,"end":7463},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" ]"},{"Add":" .into_iter()"},{"Add":" .collect::>();"}],"del_contents":[{"Del":" ];\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":210,"ins":{"up_context":[{"change":2,"pos":7464}],"down_context":[{"change":2,"pos":7581}],"flag":"BLOCK","start":3543,"end":3611,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":7464},"to":{"change":2,"start":7464,"end":7581},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" handle.write_logdata(&data).expect(\"unable to write data\");"}],"del_contents":[{"Del":" write_logdata(dir.path(), \"basic-countermeter-test\", &data[..])\n .expect(\"unable to write data\");\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":213,"ins":{"up_context":[{"change":2,"pos":7644}],"down_context":[{"change":2,"pos":7788}],"flag":"BLOCK","start":3612,"end":3703,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":7644},"to":{"change":2,"start":7644,"end":7788},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" let datv = std::fs::read(handle.log_path()).expect(\"unable to read data (1)\");"}],"del_contents":[{"Del":" let datv = std::fs::read(get_meter_path(dir.path(), \"basic-countermeter-test\"))\n .expect(\"unable to read data (1)\");\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":218,"ins":{"up_context":[{"change":2,"pos":7960}],"down_context":[{"change":2,"pos":8067}],"flag":"BLOCK","start":3704,"end":3811,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":7960},"to":{"change":2,"start":7960,"end":8067},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":"2021-10-11\u001finc\u001f0.01\u001f"},{"Add":"2021-10-12\u001finc\u001f0.011\u001f"},{"Add":"2021-10-13\u001fbrk\u001f0.012\u001fwater damage, ouch..."},{"Add":"2021-10-14\u001fdec\u001f0.01\u001f"}],"del_contents":[{"Del":"2021-10-10\u001finc\u001f0.01\u001f\n2021-10-11\u001finc\u001f0.011\u001f\n2021-10-11\u001fbrk\u001f0.012\u001fwater damage, ouch...\n2021-10-12\u001fdec\u001f0.01\u001f\n"}]}},{"Replacement":{"inode":{"change":2,"pos":3640},"path":"crates/zs-utilinv-core/src/countermeter.rs","line":227,"ins":{"up_context":[{"change":2,"pos":8133}],"down_context":[{"change":2,"pos":8232}],"flag":"BLOCK","start":3812,"end":3880,"inode":{"change":2,"pos":3640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":8133},"to":{"change":2,"start":8133,"end":8232},"introduced_by":2}],"inode":{"change":2,"pos":3640}},"ins_contents":[{"Add":" handle.read_logdata().expect(\"unable to read data (2)\")"}],"del_contents":[{"Del":" parse_logdata(dir.path(), \"basic-countermeter-test\").expect(\"unable to read data (2)\")\n"}]}},{"FileAdd":{"meta":{"basename":"zs-utilinv-cometer","metadata":576},"context":[{"change":2,"pos":18}],"contents":[]}},{"FileAdd":{"meta":{"basename":"src","metadata":576},"context":[{"change":0,"pos":3911}],"contents":[]}},{"FileAdd":{"meta":{"basename":"main.rs","metadata":0},"context":[{"change":0,"pos":3927}],"contents":[{"Add":"use std::io::Write;"},{"Add":"use zs_utilinv_core::countermeter::{"},{"Add":" validate_logdata, FixpNum, Handle as CmHandle, LogCommand, LogEntry, NaiveDate,"},{"Add":"};"},{"Add":""},{"Add":"struct ViewIo {"},{"Add":" iatty: bool,"},{"Add":" stdin: std::io::Stdin,"},{"Add":" stdout: std::io::Stdout,"},{"Add":" buf: String,"},{"Add":"}"},{"Add":""},{"Add":"impl ViewIo {"},{"Add":" fn prompt(&mut self, q: &str) -> std::io::Result<&str> {"},{"Add":" if self.iatty {"},{"Add":" write!(&mut self.stdout, \"{} $ \", q)?;"},{"Add":" self.stdout.flush()?;"},{"Add":" }"},{"Add":" self.buf.clear();"},{"Add":" self.stdin.read_line(&mut self.buf)?;"},{"Add":" if !self.iatty {"},{"Add":" writeln!(&mut self.stdout)?;"},{"Add":" }"},{"Add":" Ok(self.buf.trim())"},{"Add":" }"},{"Add":""},{"Add":" fn prompt_yn(&mut self, q: &str) -> std::io::Result {"},{"Add":" let q2 = format!(\"{} ? [yn]\", q);"},{"Add":" Ok(loop {"},{"Add":" break match self.prompt(&q2)?.to_lowercase().as_str() {"},{"Add":" \"y\" | \"yes\" | \"j\" | \"ja\" => true,"},{"Add":" \"n\" | \"no\" | \"nein\" => false,"},{"Add":" _ => continue,"},{"Add":" };"},{"Add":" })"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn main() -> anyhow::Result<()> {"},{"Add":" let mut vio = ViewIo {"},{"Add":" iatty: atty::is(atty::Stream::Stdin) && atty::is(atty::Stream::Stdout),"},{"Add":" stdin: std::io::stdin(),"},{"Add":" stdout: std::io::stdout(),"},{"Add":" buf: String::new(),"},{"Add":" };"},{"Add":" std::fs::create_dir_all(\"cometers\")?;"},{"Add":""},{"Add":" let date: NaiveDate = loop {"},{"Add":" let tmp = vio.prompt(\"enter the date to edit\")?;"},{"Add":" if tmp.is_empty() {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" if let Ok(x) = NaiveDate::parse_from_str(tmp, \"%Y-%m-%d\") {"},{"Add":" break x;"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" loop {"},{"Add":" let meter = vio.prompt(\"meter\")?;"},{"Add":" if meter.is_empty() {"},{"Add":" break;"},{"Add":" }"},{"Add":" let meter = CmHandle::new(std::path::PathBuf::from(\"cometers\"), meter.to_string());"},{"Add":" let mut meterlog = if !meter.log_path().exists() {"},{"Add":" eprintln!(\"ERROR: countermeter «{}» doesn't exist.\", meter.name());"},{"Add":" if !vio.prompt_yn(\"would you like to init this cometer log\")? {"},{"Add":" continue;"},{"Add":" }"},{"Add":" Default::default()"},{"Add":" } else {"},{"Add":" meter.read_logdata()?"},{"Add":" };"},{"Add":" for i in validate_logdata(&meterlog, Some(&date)) {"},{"Add":" println!(\"{}\", i);"},{"Add":" }"},{"Add":" let use_res = on_meter(&mut vio, &date, meter.name(), &mut meterlog)?;"},{"Add":" if !use_res {"},{"Add":" // do nothing"},{"Add":" } else if meterlog.is_empty() {"},{"Add":" if vio.prompt_yn(\"WARN: would you like to clear+remove this cometer log\")? {"},{"Add":" std::fs::remove_file(meter.log_path())?;"},{"Add":" }"},{"Add":" } else {"},{"Add":" for i in validate_logdata(&meterlog, Some(&date)) {"},{"Add":" println!(\"{}\", i);"},{"Add":" }"},{"Add":" meter.write_logdata(&meterlog)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone)]"},{"Add":"enum MeterAct {"},{"Add":" Value(Option),"},{"Add":" Command(LogCommand),"},{"Add":" Comment(String),"},{"Add":"}"},{"Add":""},{"Add":"fn on_meter("},{"Add":" vio: &mut ViewIo,"},{"Add":" date: &NaiveDate,"},{"Add":" meter: &str,"},{"Add":" meterlog: &mut std::collections::BTreeSet,"},{"Add":") -> std::io::Result {"},{"Add":" let prpt = format!(\"cm:{}\", meter);"},{"Add":" for i in meterlog.iter().filter(|i| &i.date == date) {"},{"Add":" println!(\"{:?}\", i);"},{"Add":" }"},{"Add":" Ok(loop {"},{"Add":" let tmp = match vio.prompt(&prpt)? {"},{"Add":" \"\" | \"exit\" | \"quit\" => break true,"},{"Add":" \"qwos\" => break false,"},{"Add":" \"brk\" => MeterAct::Command(LogCommand::Broken),"},{"Add":" \"rst\" => MeterAct::Command(LogCommand::Reset),"},{"Add":" \"dec\" => MeterAct::Command(LogCommand::Decrease),"},{"Add":" \"inc\" => MeterAct::Command(LogCommand::Increase),"},{"Add":" \"-\" => MeterAct::Value(None),"},{"Add":" \"dlt\" => {"},{"Add":" meterlog.retain(|i| &i.date != date);"},{"Add":" continue;"},{"Add":" }"},{"Add":" \"p\" => {"},{"Add":" for i in meterlog.iter().filter(|i| &i.date == date) {"},{"Add":" println!(\"{:?}\", i);"},{"Add":" }"},{"Add":" continue;"},{"Add":" }"},{"Add":" \"?\" | \"help\" => {"},{"Add":" println!("},{"Add":" r#\"available log line types:"},{"Add":" brk .... broken"},{"Add":" rst .... reset"},{"Add":" dec .... decrease"},{"Add":" inc .... increase"},{"Add":""},{"Add":" - .... remove the registered value"},{"Add":" dlt .... delete the log line"},{"Add":" ? .... print this help text"},{"Add":" exit ... exit this sub-repl, save updated entries"},{"Add":" qwos ... exit this sub-repl, don't save updates entries"},{"Add":" p .... print the current entry"},{"Add":""},{"Add":"other allowed inputs:"},{"Add":" - a float number (must start with a digit)"},{"Add":" - \"cmt \" and then a comment"},{"Add":"\"#"},{"Add":" );"},{"Add":" continue;"},{"Add":" }"},{"Add":" tmp => {"},{"Add":" if tmp"},{"Add":" .chars()"},{"Add":" .next()"},{"Add":" .map(|i| i.is_ascii_digit())"},{"Add":" .unwrap_or(false)"},{"Add":" {"},{"Add":" match tmp.parse::() {"},{"Add":" Ok(x) => MeterAct::Value(Some(x)),"},{"Add":" Err(e) => {"},{"Add":" eprintln!(\"ERROR: unable to parse float number: {}\", e);"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(x) = tmp.strip_prefix(\"cmt \") {"},{"Add":" MeterAct::Comment(x.to_string())"},{"Add":" } else {"},{"Add":" eprintln!(\"ERROR: unknown meter action: {}\", tmp);"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" };"},{"Add":" let mut cnt = 0;"},{"Add":" *meterlog = std::mem::take(meterlog)"},{"Add":" .into_iter()"},{"Add":" .map(|mut i| {"},{"Add":" if &i.date == date {"},{"Add":" match tmp.clone() {"},{"Add":" MeterAct::Command(x) => i.cmd = x,"},{"Add":" MeterAct::Value(x) => i.value = x,"},{"Add":" MeterAct::Comment(x) => i.comment = x,"},{"Add":" }"},{"Add":" cnt += 1;"},{"Add":" }"},{"Add":" i"},{"Add":" })"},{"Add":" .collect();"},{"Add":" if cnt == 0 {"},{"Add":" let mut i = LogEntry {"},{"Add":" date: date.clone(),"},{"Add":" cmd: LogCommand::Broken,"},{"Add":" comment: String::new(),"},{"Add":" value: None,"},{"Add":" };"},{"Add":" match tmp {"},{"Add":" MeterAct::Command(x) => i.cmd = x,"},{"Add":" MeterAct::Value(x) => i.value = x,"},{"Add":" MeterAct::Comment(x) => i.comment = x,"},{"Add":" }"},{"Add":" meterlog.insert(i);"},{"Add":" }"},{"Add":" for i in validate_logdata(&meterlog, Some(&date)) {"},{"Add":" println!(\"{}\", i);"},{"Add":" }"},{"Add":" })"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"Cargo.toml","metadata":0},"context":[{"change":0,"pos":3911}],"contents":[{"Add":"[package]"},{"Add":"name = \"zs-utilinv-cometer\""},{"Add":"description = \"countermeter input/edit tool\""},{"Add":"version = \"0.1.0\""},{"Add":"edition = \"2018\""},{"Add":"license = \"Apache-2.0\""},{"Add":""},{"Add":"[dependencies]"},{"Add":"anyhow = \"1.0\""},{"Add":"atty = \"0.2\""},{"Add":"zs-utilinv-core = { path = \"../zs-utilinv-core\" }"}]}},{"Edit":{"inode":{"change":2,"pos":8826},"path":"Cargo.lock","line":4,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":8930}],"down_context":[{"change":2,"pos":8930}],"flag":"BLOCK","start":10554,"end":10988,"inode":{"change":2,"pos":8826}}},"contents":[{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"anyhow\""},{"Add":"version = \"1.0.44\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1\""},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"atty\""},{"Add":"version = \"0.2.14\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8\""},{"Add":"dependencies = ["},{"Add":" \"hermit-abi\","},{"Add":" \"libc\","},{"Add":" \"winapi\","},{"Add":"]"}]}},{"Edit":{"inode":{"change":2,"pos":8826},"path":"Cargo.lock","line":165,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":12408}],"down_context":[{"change":2,"pos":12408}],"flag":"BLOCK","start":10989,"end":11212,"inode":{"change":2,"pos":8826}}},"contents":[{"Add":"name = \"hermit-abi\""},{"Add":"version = \"0.1.19\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33\""},{"Add":"dependencies = ["},{"Add":" \"libc\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":2,"pos":8826},"path":"Cargo.lock","line":217,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":13639},"to":{"change":2,"start":13639,"end":13829},"introduced_by":2}],"inode":{"change":2,"pos":8826}}},"contents":[{"Del":"name = \"numtoa\"\nversion = \"0.1.0\"\nsource = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef\"\n\n[[package]]\n"}]}},{"Edit":{"inode":{"change":2,"pos":8826},"path":"Cargo.lock","line":317,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":16400},"to":{"change":2,"start":16400,"end":16634},"introduced_by":2}],"inode":{"change":2,"pos":8826}}},"contents":[{"Del":"]\n\n[[package]]\nname = \"redox_termios\"\nversion = \"0.1.2\"\nsource = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f\"\ndependencies = [\n \"redox_syscall\",\n"}]}},{"Edit":{"inode":{"change":2,"pos":8826},"path":"Cargo.lock","line":383,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":18263},"to":{"change":2,"start":18263,"end":18529},"introduced_by":2}],"inode":{"change":2,"pos":8826}}},"contents":[{"Del":"]\n\n[[package]]\nname = \"termion\"\nversion = \"1.5.6\"\nsource = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e\"\ndependencies = [\n \"libc\",\n \"numtoa\",\n \"redox_syscall\",\n \"redox_termios\",\n"}]}},{"Edit":{"inode":{"change":2,"pos":8826},"path":"Cargo.lock","line":452,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":20519}],"down_context":[{"change":2,"pos":20519}],"flag":"BLOCK","start":11213,"end":11331,"inode":{"change":2,"pos":8826}}},"contents":[{"Add":"name = \"zs-utilinv-cometer\""},{"Add":"version = \"0.1.0\""},{"Add":"dependencies = ["},{"Add":" \"anyhow\","},{"Add":" \"atty\","},{"Add":" \"zs-utilinv-core\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":2,"pos":8826},"path":"Cargo.lock","line":472,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":20663},"to":{"change":2,"start":20663,"end":20763},"introduced_by":2}],"inode":{"change":2,"pos":8826}}},"contents":[{"Del":"\n[[package]]\nname = \"zs-utilinv-terminal\"\nversion = \"0.1.0\"\ndependencies = [\n \"libc\",\n \"termion\",\n]\n"}]}},{"Edit":{"inode":{"change":2,"pos":20796},"path":".ignore","line":4,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":20823}],"down_context":[],"flag":"BLOCK","start":11332,"end":11342,"inode":{"change":2,"pos":20796}}},"contents":[{"Add":"/cometers"}]}}],"owner":"fogti","repo":"zs-utilinv","token":"yTN0bEs1fX8OLJdyb+uIm2Zob5aa7NluxlmI2HOF6hM=","login":null}

…

Dependencies

Change contents