kaizenkodo/HEL
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split the code to separate modules and add the first tests for the reply module.

Browse Source
This commit is contained in:
Kiyomichi Kosaka
2022-11-27 15:01:26 +00:00
parent 3defe08d2b
commit a909cac999
5 changed files with 131 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+2 -2
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "my-project" name = "lesskey"
version = "0.1.0" version = "0.1.0"
authors = ["runner"] authors = ["ok2"]
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
src/main.rs
+9 -4
View File
@@ -1,12 +1,17 @@
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
pub mod structs; mod structs;
pub mod parser; mod parser;
pub mod repl; mod repl;
use std::{cell::RefCell, rc::Rc};
use std::collections::HashMap;
use rustyline::Editor; use rustyline::Editor;
use std::{cell::RefCell, rc::Rc};
use crate::structs::LK;
use crate::repl::LKRead;
pub fn main() { pub fn main() {
let lk = Rc::new(RefCell::new(LK { db: HashMap::new() })); let lk = Rc::new(RefCell::new(LK { db: HashMap::new() }));
src/parser.rs
+60 -56
View File
@@ -1,7 +1,11 @@
extern crate peg; extern crate peg;
use std::{cell::RefCell, rc::Rc};
use chrono::naive::NaiveDate;
use crate::structs::{Mode, Command, Password, LKErr};
peg::parser!{ peg::parser!{
grammar command_parser() for str { pub grammar command_parser() for str {
pub rule cmd() -> Command<'input> = c:( pub rule cmd() -> Command<'input> = c:(
help_cmd() help_cmd()
/ add_cmd() / add_cmd()
@@ -66,60 +70,60 @@ peg::parser!{
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
#[test] #[test]
fn parse_password_test() { fn parse_password_test() {
assert_eq!(command_parser::name("ableton89 R 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"), assert_eq!(command_parser::name("ableton89 R 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: None, mode: Mode::Regular, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: None, mode: Mode::Regular,
length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string()) })); comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string()) }));
assert_eq!(command_parser::name("ableton89 U 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"), assert_eq!(command_parser::name("ableton89 U 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: None, mode: Mode::RegularUpcase, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: None, mode: Mode::RegularUpcase,
length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string()) })); comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string()) }));
assert_eq!(command_parser::name("ableton89 U 2020-12-09"), assert_eq!(command_parser::name("ableton89 U 2020-12-09"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: None, mode: Mode::RegularUpcase, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: None, mode: Mode::RegularUpcase,
length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), comment: None })); length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), comment: None }));
assert_eq!(command_parser::name("#W9 ableton89 R 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"), assert_eq!(command_parser::name("#W9 ableton89 R 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: Some("#W9".to_string()), mode: Mode::Regular, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: Some("#W9".to_string()), mode: Mode::Regular,
length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string()) })); comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string()) }));
assert_eq!(command_parser::name("#W9 ableton89 N 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"), assert_eq!(command_parser::name("#W9 ableton89 N 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: Some("#W9".to_string()), mode: Mode::NoSpace, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: Some("#W9".to_string()), mode: Mode::NoSpace,
length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string()) })); comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string()) }));
assert_eq!(command_parser::name("#W9 ableton89 UN 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"), assert_eq!(command_parser::name("#W9 ableton89 UN 99 2020-12-09 xx.ableton@domain.info https://www.ableton.com"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: Some("#W9".to_string()), mode: Mode::NoSpaceUpcase, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: Some("#W9".to_string()), mode: Mode::NoSpaceUpcase,
length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: None, seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string()) })); comment: Some("xx.ableton@domain.info https://www.ableton.com".to_string()) }));
assert_eq!(command_parser::name("#W9 ableton89 20R 99 2020-12-09 a b c"), assert_eq!(command_parser::name("#W9 ableton89 20R 99 2020-12-09 a b c"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: Some("#W9".to_string()), mode: Mode::Regular, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: Some("#W9".to_string()), mode: Mode::Regular,
length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("a b c".to_string()) })); comment: Some("a b c".to_string()) }));
assert_eq!(command_parser::name("#W9 ableton89 20UR 99 2020-12-09 a b c"), assert_eq!(command_parser::name("#W9 ableton89 20UR 99 2020-12-09 a b c"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: Some("#W9".to_string()), mode: Mode::RegularUpcase, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: Some("#W9".to_string()), mode: Mode::RegularUpcase,
length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("a b c".to_string()) })); comment: Some("a b c".to_string()) }));
assert_eq!(command_parser::name("#W9 ableton89 20UH 99 2020-12-09 a b c"), assert_eq!(command_parser::name("#W9 ableton89 20UH 99 2020-12-09 a b c"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: Some("#W9".to_string()), mode: Mode::HexUpcase, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: Some("#W9".to_string()), mode: Mode::HexUpcase,
length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("a b c".to_string()) })); comment: Some("a b c".to_string()) }));
assert_eq!(command_parser::name("#W9 ableton89 20UB 99 2020-12-09 a b c"), assert_eq!(command_parser::name("#W9 ableton89 20UB 99 2020-12-09 a b c"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: Some("#W9".to_string()), mode: Mode::Base64Upcase, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: Some("#W9".to_string()), mode: Mode::Base64Upcase,
length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("a b c".to_string()) })); comment: Some("a b c".to_string()) }));
assert_eq!(command_parser::name("#W9 ableton89 20D 99 2020-12-09 a b c"), assert_eq!(command_parser::name("#W9 ableton89 20D 99 2020-12-09 a b c"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: Some("#W9".to_string()), mode: Mode::Decimal, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: Some("#W9".to_string()), mode: Mode::Decimal,
length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("a b c".to_string()) })); comment: Some("a b c".to_string()) }));
assert_eq!(command_parser::name("ableton89 20D 98 2020-12-09 a b c"), assert_eq!(command_parser::name("ableton89 20D 98 2020-12-09 a b c"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: None, mode: Mode::Decimal, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: None, mode: Mode::Decimal,
length: Some(20), seq: 98, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: Some(20), seq: 98, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("a b c".to_string()) })); comment: Some("a b c".to_string()) }));
assert_eq!(command_parser::name("ableton89 20D 2020-12-09 a b c"), assert_eq!(command_parser::name("ableton89 20D 2020-12-09 a b c"),
Ok(Password { name: "ableton89".to_string(), parent: None, prefix: None, mode: Mode::Decimal, Ok(Password { name: Rc::new("ableton89".to_string()), parent: None, prefix: None, mode: Mode::Decimal,
length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(), length: Some(20), seq: 99, date: NaiveDate::from_ymd_opt(2020, 12, 09).unwrap(),
comment: Some("a b c".to_string()) })); comment: Some("a b c".to_string()) }));
} }
} }
src/repl.rs
+46 -17
View File
@@ -1,5 +1,11 @@
use rustyline::Editor;
use std::{cell::RefCell, rc::Rc};
use crate::structs::{LKErr, Command, LK};
use crate::parser::command_parser;
#[derive(Debug)] #[derive(Debug)]
struct LKRead { pub struct LKRead {
rl: Editor::<()>, rl: Editor::<()>,
prompt: String, prompt: String,
state: Rc<RefCell<LK>>, state: Rc<RefCell<LK>>,
@@ -7,47 +13,47 @@ struct LKRead {
} }
#[derive(Debug)] #[derive(Debug)]
struct LKEval<'a> { pub struct LKEval<'a> {
cmd: Command<'a>, cmd: Command<'a>,
state: Rc<RefCell<LK>>, state: Rc<RefCell<LK>>,
} }
#[derive(Debug)] #[derive(Debug, PartialEq)]
struct LKPrint { pub struct LKPrint {
out: Vec<String>, out: Vec<String>,
quit: bool, quit: bool,
// state: Rc<RefCell<LK>>, state: Rc<RefCell<LK>>,
} }
impl LKRead { impl LKRead {
fn new(rl: Editor::<()>, prompt: String, state: Rc<RefCell<LK>>) -> Self { pub fn new(rl: Editor::<()>, prompt: String, state: Rc<RefCell<LK>>) -> Self {
Self { rl, prompt, state, cmd: "".to_string() } Self { rl, prompt, state, cmd: "".to_string() }
} }
fn read(&mut self) -> LKEval { pub fn read(&mut self) -> LKEval {
self.cmd = match self.rl.readline(&*self.prompt) { self.cmd = match self.rl.readline(&*self.prompt) {
Ok(str) => str, Ok(str) => str,
Err(err) => return LKEval::new(Command::Error(LKErr::ReadError(err.to_string())), self.state.clone()), Err(err) => return LKEval::new(Command::Error(LKErr::ReadError(err.to_string())), self.state.clone()),
}; };
match command_parser::cmd(self.cmd.as_str()) { match command_parser::cmd(self.cmd.as_str()) {
Ok(cmd) => LKEval::new(cmd, self.state.clone()), Ok(cmd) => LKEval::new(cmd, self.state.clone()),
Err(err) => LKEval::new(Command::Error(LKErr::PegParseError(err)), self.state.clone()), Err(err) => LKEval::new(Command::Error(LKErr::ParseError(err)), self.state.clone()),
} }
} }
fn refresh(&mut self) { pub fn refresh(&mut self) {
} }
fn quit(&mut self) { pub fn quit(&mut self) {
} }
} }
impl<'a> LKEval<'a> { impl<'a> LKEval<'a> {
fn new(cmd: Command<'a>, state: Rc<RefCell<LK>>) -> Self { Self { cmd, state } } pub fn new(cmd: Command<'a>, state: Rc<RefCell<LK>>) -> Self { Self { cmd, state } }
fn eval(&mut self) -> LKPrint { pub fn eval(&mut self) -> LKPrint {
let mut out: Vec<String> = vec![]; let mut out: Vec<String> = vec![];
let mut quit: bool = false; let mut quit: bool = false;
@@ -95,25 +101,48 @@ impl<'a> LKEval<'a> {
}, },
Command::Error(err) => { Command::Error(err) => {
match err { match err {
LKErr::PegParseError(e) => { out.push(e.to_string()) }, LKErr::ParseError(e) => { out.push(e.to_string()) },
LKErr::ReadError(e) => { out.push(e.to_string()) }, LKErr::ReadError(e) => { out.push(e.to_string()) },
LKErr::Error(e) => { out.push(format!("error: {}", e.to_string())) }, LKErr::Error(e) => { out.push(format!("error: {}", e.to_string())) },
_ => out.push(format!("error: {:?}", err)),
} }
} }
} }
LKPrint::new(out, quit) LKPrint::new(out, quit, self.state.clone())
} }
} }
impl LKPrint { impl LKPrint {
fn new(out: Vec<String>, quit: bool) -> Self { Self { out, quit } } pub fn new(out: Vec<String>, quit: bool, state: Rc<RefCell<LK>>) -> Self { Self { out, quit, state } }
fn print(&mut self) -> bool { pub fn print(&mut self) -> bool {
for line in &self.out { for line in &self.out {
println!("{}", line); println!("{}", line);
} }
return !self.quit; return !self.quit;
} }
} }
#[cfg(test)]
mod tests {
use super::*;
use std::collections::HashMap;
use chrono::naive::NaiveDate;
use crate::structs::*;
#[test]
fn exec_cmds_basic() {
let lk = Rc::new(RefCell::new(LK { db: HashMap::new() }));
assert_eq!(LKEval::new(Command::Ls, lk.clone()).eval(), LKPrint::new(vec![], false, lk.clone()));
let pwd = Rc::new(RefCell::new(Password { name: Rc::new("t1".to_string()),
prefix: None,
length: None,
mode: Mode::Regular,
seq: 99,
date: NaiveDate::from_ymd_opt(2022, 12, 30).unwrap(),
comment: Some("comment".to_string()),
parent: None }));
assert_eq!(LKEval::new(Command::Add(pwd.clone()), lk.clone()).eval().state.borrow().db,
{ let mut db = HashMap::new(); db.insert(pwd.borrow().name.clone(), pwd.clone()); db });
}
}
src/structs.rs
+14 -17
View File
@@ -1,3 +1,4 @@
use std::{cell::RefCell, rc::Rc};
use std::collections::HashMap; use std::collections::HashMap;
use regex::{Regex, Captures}; use regex::{Regex, Captures};
use chrono::naive::NaiveDate; use chrono::naive::NaiveDate;
@@ -8,12 +9,8 @@ pub enum LKErr<'a> {
Error(&'a str), Error(&'a str),
#[error("Failed to read the line: {0}")] #[error("Failed to read the line: {0}")]
ReadError(String), ReadError(String),
#[error("Failed to parse {0}: {1}")]
ParseError(&'a str, &'a str),
#[error("Failed to parse {0}: {1}")]
ParseErrorS(&'a str, String),
#[error("Failed to parse: {0}")] #[error("Failed to parse: {0}")]
PegParseError(peg::error::ParseError<peg::str::LineCol>), ParseError(peg::error::ParseError<peg::str::LineCol>),
} }
#[derive(PartialEq, Debug)] #[derive(PartialEq, Debug)]
@@ -31,14 +28,14 @@ pub enum Mode {
#[derive(PartialEq, Debug)] #[derive(PartialEq, Debug)]
pub struct Password { pub struct Password {
parent: Option<Rc<RefCell<Password>>>, pub parent: Option<Rc<RefCell<Password>>>,
prefix: Option<String>, pub prefix: Option<String>,
name: Rc<String>, pub name: Rc<String>,
length: Option<u32>, pub length: Option<u32>,
mode: Mode, pub mode: Mode,
seq: u32, pub seq: u32,
date: NaiveDate, pub date: NaiveDate,
comment: Option<String>, pub comment: Option<String>,
} }
#[derive(PartialEq, Debug)] #[derive(PartialEq, Debug)]
@@ -51,9 +48,9 @@ pub enum Command<'a> {
Quit Quit
} }
#[derive(Debug)] #[derive(PartialEq, Debug)]
struct LK { pub struct LK {
db: HashMap<Rc<String>, Rc<RefCell<Password>>>, pub db: HashMap<Rc<String>, Rc<RefCell<Password>>>,
} }
impl std::fmt::Display for Mode { impl std::fmt::Display for Mode {
@@ -73,7 +70,7 @@ impl std::fmt::Display for Mode {
} }
impl LK { impl LK {
fn fix_hierarchy(&self) { pub fn fix_hierarchy(&self) {
lazy_static! { lazy_static! {
static ref RE: Regex = Regex::new(r"\s*\^([!-~]+)").unwrap(); static ref RE: Regex = Regex::new(r"\s*\^([!-~]+)").unwrap();
} }