{"header":{"message":"dbtin: add parser for double-colon-separated format (similar to the passwd format)","description":null,"timestamp":"2021-08-26T17:39:08.944000942Z","authors":[{}]},"hash":"PIAOZYFBE5EILPMFZT5H7CZ6WODTTZ2DBSL4KIWGPE2Z5I6QXR7QC","authors":[{"login":"fogti","key":"ZFnYYAXSF9fgPaXKyrt5a2oor75nLVcpU8T8fEnRqwm"}],"deps":{"hashes":[["PIAOZYFBE5EILPMFZT5H7CZ6WODTTZ2DBSL4KIWGPE2Z5I6QXR7QC","dbtin: add parser for double-colon-separated format (similar to the passwd format)"],["AA",null],["VLUIVUU5SQKL6NPXBHT75UHM23UJ34IX24HSGXIBKFKRIFJIFBJAC","initialize repository"]],"deps":["VLUIVUU5SQKL6NPXBHT75UHM23UJ34IX24HSGXIBKFKRIFJIFBJAC"],"known":[]},"hunks":[{"Edit":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":15,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2308}],"down_context":[{"change":2,"pos":2308}],"flag":"BLOCK","start":0,"end":86,"inode":{"change":2,"pos":2034}}},"contents":[{"Add":"```"},{"Add":""},{"Add":"or alternatively:"},{"Add":""},{"Add":"```text"},{"Add":"PATH/TO/OBJECT:KEY1:VALUE1"},{"Add":"PATH/TO/OBJECT:KEY2:VALUE2"}]}},{"Edit":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":26,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2361}],"down_context":[{"change":2,"pos":2361}],"flag":"BLOCK","start":87,"end":1109,"inode":{"change":2,"pos":2034}}},"contents":[{"Add":" let mut it = s.lines().filter(|i| !i.trim().is_empty()).peekable();"},{"Add":""},{"Add":" let i = it.peek()?;"},{"Add":" let dcl = i.find(':')?;"},{"Add":" // find out which type of dbtin dump we have here"},{"Add":" if dcl != 0 && i[dcl + 1..].find(':').is_some() {"},{"Add":" // (OBJ:KEY:VALUE)+"},{"Add":" parse_colsv(it)"},{"Add":" } else {"},{"Add":" // :OBJ\\n(KEY:VALUE)+"},{"Add":" parse_groups(it)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn parse_colsv<'a>(it: impl Iterator) -> Option> {"},{"Add":" let mut ret = Node::Branch(HashMap::new());"},{"Add":""},{"Add":" for i in it {"},{"Add":" let dcl1 = i.find(':')?;"},{"Add":" if dcl1 == 0 {"},{"Add":" // format error, this indicates a group instead"},{"Add":" return None;"},{"Add":" }"},{"Add":" let kvp = &i[dcl1 + 1..];"},{"Add":" let dcl2 = kvp.find(':')?;"},{"Add":" let (obj, key, value) = (&i[..dcl1], &kvp[..dcl2], &kvp[dcl2 + 1..]);"},{"Add":" let sel = ret.select(obj)?;"},{"Add":" if !final_leaf_push(sel, key, value) {"},{"Add":" return None;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Some(ret)"},{"Add":"}"},{"Add":""},{"Add":"fn parse_groups<'a>(it: impl Iterator) -> Option> {"}]}},{"Edit":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":74,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2681},"to":{"change":2,"start":2681,"end":2772},"introduced_by":2}],"inode":{"change":2,"pos":2034}}},"contents":[{"Del":"\n for i in s.lines() {\n if i.trim().is_empty() {\n continue;\n }\n"}]}},{"Edit":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":75,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2773}],"down_context":[{"change":2,"pos":2773}],"flag":"BLOCK","start":1110,"end":1128,"inode":{"change":2,"pos":2034}}},"contents":[{"Add":" for i in it {"}]}},{"Edit":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":92,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3187}],"down_context":[{"change":2,"pos":3187}],"flag":"BLOCK","start":1129,"end":1424,"inode":{"change":2,"pos":2034}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"fn final_leaf_push<'a>(sel: &mut HashMap<&'a str, Node<'a>>, key: &'a str, value: &'a str) -> bool {"},{"Add":" use std::collections::hash_map::Entry;"},{"Add":" match sel.entry(key) {"},{"Add":" Entry::Occupied(_) => return false,"},{"Add":" Entry::Vacant(vac) => vac.insert(Node::Leaf(value)),"},{"Add":" };"},{"Add":" true"}]}},{"Replacement":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":104,"ins":{"up_context":[{"change":2,"pos":3210}],"down_context":[{"change":2,"pos":3404}],"flag":"BLOCK","start":1425,"end":1577,"inode":{"change":2,"pos":2034}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3210},"to":{"change":2,"start":3210,"end":3404},"introduced_by":2}],"inode":{"change":2,"pos":2034}},"ins_contents":[{"Add":" fn branch_mut<'s>(&'s mut self) -> Option<&'s mut HashMap<&'a str, Node<'a>>> {"},{"Add":" if let Node::Branch(ref mut x) = self {"},{"Add":" Some(x)"}],"del_contents":[{"Del":" fn push_to_leaves(&mut self, obj: &'a str, kvm: HashMap<&'a str, &'a str>) -> bool {\n let mut sel: &mut HashMap<&'a str, Node> = if let Node::Branch(ref mut b) = self {\n b\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":108,"ins":{"up_context":[{"change":2,"pos":3421}],"down_context":[{"change":2,"pos":3746}],"flag":"BLOCK","start":1578,"end":1595,"inode":{"change":2,"pos":2034}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3421},"to":{"change":2,"start":3421,"end":3746},"introduced_by":2}],"inode":{"change":2,"pos":2034}},"ins_contents":[{"Add":" None"}],"del_contents":[{"Del":" return false;\n };\n\n for i in obj.split('/').filter(|i| !i.is_empty()) {\n if let Node::Branch(ref mut x) =\n sel.entry(i).or_insert_with(|| Node::Branch(HashMap::new()))\n {\n sel = x;\n } else {\n return false;\n };\n"}]}},{"Edit":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":110,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3756}],"down_context":[{"change":2,"pos":3756}],"flag":"BLOCK","start":1596,"end":1602,"inode":{"change":2,"pos":2034}}},"contents":[{"Add":" }"}]}},{"Replacement":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":112,"ins":{"up_context":[{"change":2,"pos":3757}],"down_context":[{"change":2,"pos":4023}],"flag":"BLOCK","start":1603,"end":1965,"inode":{"change":2,"pos":2034}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3757},"to":{"change":2,"start":3757,"end":4023},"introduced_by":2}],"inode":{"change":2,"pos":2034}},"ins_contents":[{"Add":" fn select<'s>(&'s mut self, obj: &'a str) -> Option<&'s mut HashMap<&'a str, Node<'a>>> {"},{"Add":" obj.split('/')"},{"Add":" .filter(|i| !i.is_empty())"},{"Add":" .try_fold(self.branch_mut()?, |sel, i| {"},{"Add":" sel.entry(i)"},{"Add":" .or_insert_with(|| Node::Branch(HashMap::new()))"},{"Add":" .branch_mut()"},{"Add":" })"},{"Add":" }"}],"del_contents":[{"Del":" for (key, value) in kvm {\n use std::collections::hash_map::Entry;\n match sel.entry(key) {\n Entry::Occupied(_) => return false,\n Entry::Vacant(vac) => vac.insert(Node::Leaf(value)),\n };\n }\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":122,"ins":{"up_context":[{"change":2,"pos":4024}],"down_context":[{"change":2,"pos":4037}],"flag":"BLOCK","start":1966,"end":2244,"inode":{"change":2,"pos":2034}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4024},"to":{"change":2,"start":4024,"end":4037},"introduced_by":2}],"inode":{"change":2,"pos":2034}},"ins_contents":[{"Add":" fn push_to_leaves(&mut self, obj: &'a str, kvm: HashMap<&'a str, &'a str>) -> bool {"},{"Add":" if let Some(sel) = self.select(obj) {"},{"Add":" kvm.into_iter()"},{"Add":" .all(|(key, value)| final_leaf_push(sel, key, value))"},{"Add":" } else {"},{"Add":" false"},{"Add":" }"}],"del_contents":[{"Del":" true\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":135,"ins":{"up_context":[{"change":2,"pos":4089}],"down_context":[{"change":2,"pos":4118}],"flag":"BLOCK","start":2245,"end":2278,"inode":{"change":2,"pos":2034}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4089},"to":{"change":2,"start":4089,"end":4118},"introduced_by":2}],"inode":{"change":2,"pos":2034}},"ins_contents":[{"Add":""},{"Add":" fn ex0() -> Node<'static> {"}],"del_contents":[{"Del":" #[test]\n fn ex_ok() {\n"}]}},{"Edit":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":158,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":4905}],"down_context":[{"change":2,"pos":4905}],"flag":"BLOCK","start":2279,"end":2315,"inode":{"change":2,"pos":2034}}},"contents":[{"Add":""},{"Add":" Node::Branch(inner1)"},{"Add":" }"}]}},{"Edit":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":162,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":4906}],"down_context":[{"change":2,"pos":4906}],"flag":"BLOCK","start":2316,"end":2350,"inode":{"change":2,"pos":2034}}},"contents":[{"Add":" #[test]"},{"Add":" fn ex0_groups() {"}]}},{"Replacement":{"inode":{"change":2,"pos":2034},"path":"crates/zhed-misc-parsers/src/dbtin.rs","line":177,"ins":{"up_context":[{"change":2,"pos":5112}],"down_context":[{"change":2,"pos":5151}],"flag":"BLOCK","start":2351,"end":2690,"inode":{"change":2,"pos":2034}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5112},"to":{"change":2,"start":5112,"end":5151},"introduced_by":2}],"inode":{"change":2,"pos":2034}},"ins_contents":[{"Add":" Some(ex0())"},{"Add":" );"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn ex0_colsv() {"},{"Add":" assert_eq!("},{"Add":" parse("},{"Add":" r#\""},{"Add":"Schule/Orga/Fach/ETH:trfull:Ethik"},{"Add":"Schule/Orga/Fach/ETH:tanken:Ja "},{"Add":"Schule/Orga/Fach/RUF:trfull:Rufen"},{"Add":"Schule/Orga/Fach/RUF:tanken:Nein"},{"Add":"Schule/Orga:locan :bl\tuüpp"},{"Add":" \"#"},{"Add":" ),"},{"Add":" Some(ex0())"}],"del_contents":[{"Del":" Some(Node::Branch(inner1))\n"}]}}],"owner":"fogti","repo":"zhed","token":"gmR7Pn38AXFYUzmAf7ec2CORI94Askn1BeT6SHdIu+4=","login":null}

…

Dependencies

Change contents