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

Move more command implementations from repl.rs to commands.rs.

Browse Source
This commit is contained in:
Kiyomichi Kosaka
2022-12-21 14:32:54 +00:00
parent 1845916a12
commit b6c7b08320
3 changed files with 85 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/commands.rs
+75 -3
View File
@@ -6,9 +6,10 @@ use std::fs;
use std::io::{BufRead, BufReader};
use std::io::{BufWriter, Write};
use crate::repl::LKEval;
use crate::parser::command_parser;
use crate::password::fix_password_recursion;
use crate::password::{Name, PasswordRef};
use crate::repl::LKEval;
use crate::structs::{LKOut, Radix, CORRECT_FILE, DUMP_FILE};
use crate::utils::{call_cmd_with_input, get_cmd_args_from_command, get_copy_command_from_env};
@@ -83,7 +84,78 @@ impl<'a> LKEval<'a> {
}
}
}
pub fn cmd_add(&self, out: &LKOut, name: &PasswordRef) {
let state = &mut self.state.borrow_mut();
let mut fix = false;
{
let db = &mut state.db;
let pwname = &name.borrow().name.to_string();
if db.get(pwname).is_some() {
out.e(format!("error: password {} already exist", pwname));
} else {
db.insert(pwname.to_string(), name.clone());
fix = true;
}
}
if fix {
state.fix_hierarchy();
}
}
pub fn cmd_mv(&self, out: &LKOut, name: &String, folder: &String) {
match self.get_password(name) {
Some(pwd) => {
if folder == "/" {
pwd.borrow_mut().parent = None
} else {
match self.get_password(folder) {
Some(fld) => {
pwd.borrow_mut().parent = Some(fld.clone());
fix_password_recursion(pwd.clone());
}
None => out.e(format!("error: folder {} not found", folder)),
}
}
}
None => out.e(format!("error: password with name {} not found", name)),
}
}
pub fn cmd_pass(&self, out: &LKOut, name: &String) {
match self.get_password(name) {
Some(p) => {
let pwd = (self.read_password)(format!("Password for {}: ", p.borrow().name)).unwrap();
self.cmd_correct(&out, &p.borrow().name.as_ref(), true, Some(pwd.clone()));
self.state.borrow_mut().secrets.insert(p.borrow().name.to_string(), pwd);
}
None => {
if name == "/" {
let pwd = (self.read_password)("Master: ".to_string()).unwrap();
self.cmd_correct(&out, &"/".to_string(), true, Some(pwd.clone()));
self.state
.borrow_mut()
.secrets
.insert("/".to_string(), (self.read_password)("Master: ".to_string()).unwrap());
} else {
out.e(format!("error: password with name {} not found", name));
}
}
}
}
pub fn cmd_comment(&self, out: &LKOut, name: &String, comment: &Option<String>) {
match self.get_password(name) {
Some(pwd) => {
pwd.borrow_mut().comment = match comment {
Some(c) => Some(c.to_string()),
None => None,
}
}
None => out.e("error: password not found".to_string()),
}
}
pub fn cmd_enc(&self, out: &LKOut, name: &String) -> Option<(String, String)> {
let root_folder = "/".to_string();
let (name, pass) = if name == "/" && self.state.borrow().secrets.contains_key(&root_folder) {
@@ -337,4 +409,4 @@ impl<'a> LKEval<'a> {
Err(e) => out.e(format!("error: failed to write: {}", e.to_string())),
};
}
}
}
src/main.rs
+6 -3
View File
@@ -1,8 +1,11 @@
#[macro_use] extern crate lazy_static;
#[allow(unused_imports)] #[macro_use(defer)] extern crate scopeguard;
#[macro_use]
extern crate lazy_static;
#[allow(unused_imports)]
#[macro_use(defer)]
extern crate scopeguard;
mod lk;
mod commands;
mod lk;
mod parser;
mod password;
mod repl;
src/repl.rs
+4 -62
View File
@@ -5,7 +5,6 @@ use std::{cell::RefCell, rc::Rc};
use crate::lk::LK;
use crate::parser::command_parser;
use crate::password::fix_password_recursion;
use crate::structs::{Command, LKErr, LKOut, HISTORY_FILE};
#[derive(Debug)]
@@ -98,32 +97,8 @@ impl<'a> LKEval<'a> {
quit = true;
}
Command::Ls(filter) => self.cmd_ls(&out, filter.to_string()),
Command::Add(name) => {
let state = &mut self.state.borrow_mut();
let mut fix = false;
{
let db = &mut state.db;
let pwname = &name.borrow().name.to_string();
if db.get(pwname).is_some() {
out.e(format!("error: password {} already exist", pwname));
} else {
db.insert(pwname.to_string(), name.clone());
fix = true;
}
}
if fix {
state.fix_hierarchy();
}
}
Command::Comment(name, comment) => match self.get_password(name) {
Some(pwd) => {
pwd.borrow_mut().comment = match comment {
Some(c) => Some(c.to_string()),
None => None,
}
}
None => out.e("error: password not found".to_string()),
},
Command::Add(name) => self.cmd_add(&out, &name),
Command::Comment(name, comment) => self.cmd_comment(&out, &name, &comment),
Command::Rm(name) => match self.get_password(name) {
Some(pwd) => {
self.state.borrow_mut().db.remove(pwd.borrow().name.as_ref());
@@ -137,25 +112,7 @@ impl<'a> LKEval<'a> {
Command::PasteBuffer(command) => self.cmd_pb(&out, command),
Command::Source(script) => self.cmd_source(&out, script),
Command::Dump(script) => self.cmd_dump(&out, script),
Command::Pass(name) => match self.get_password(name) {
Some(p) => {
let pwd = (self.read_password)(format!("Password for {}: ", p.borrow().name)).unwrap();
self.cmd_correct(&out, &p.borrow().name.as_ref(), true, Some(pwd.clone()));
self.state.borrow_mut().secrets.insert(p.borrow().name.to_string(), pwd);
}
None => {
if name == "/" {
let pwd = (self.read_password)("Master: ".to_string()).unwrap();
self.cmd_correct(&out, &"/".to_string(), true, Some(pwd.clone()));
self.state
.borrow_mut()
.secrets
.insert("/".to_string(), (self.read_password)("Master: ".to_string()).unwrap());
} else {
out.e(format!("error: password with name {} not found", name));
}
}
},
Command::Pass(name) => self.cmd_pass(&out, &name),
Command::UnPass(name) => match self.state.borrow_mut().secrets.remove(name) {
Some(_) => out.o(format!("Removed saved password for {}", name)),
None => out.e(format!("error: saved password for {} not found", name)),
@@ -166,22 +123,7 @@ impl<'a> LKEval<'a> {
Command::Help => {
out.o("HELP".to_string());
}
Command::Mv(name, folder) => match self.get_password(name) {
Some(pwd) => {
if folder == "/" {
pwd.borrow_mut().parent = None
} else {
match self.get_password(folder) {
Some(fld) => {
pwd.borrow_mut().parent = Some(fld.clone());
fix_password_recursion(pwd.clone());
}
None => out.e(format!("error: folder {} not found", folder)),
}
}
}
None => out.e(format!("error: password with name {} not found", name)),
},
Command::Mv(name, folder) => self.cmd_mv(&out, &name, &folder),
Command::Error(error) => match error {
LKErr::ParseError(e) => out.e(e.to_string()),
LKErr::ReadError(e) => out.e(e.to_string()),