Refactor logging system to switch between stdout and file logging
* Refactor logging to switch between stdout and file logging * Use "clear" instead of "tput reset" for unix * Remove redundant comments
This commit is contained in:
parent
f76dc9cf24
commit
ceeec877c7
16 changed files with 252 additions and 148 deletions
|
@ -1,30 +1,28 @@
|
|||
use super::COMMAND_LIST;
|
||||
use std::process::Command;
|
||||
use log2::{debug, info};
|
||||
use log::debug;
|
||||
|
||||
pub(crate) fn say_hello() {
|
||||
println!("Hello, World!");
|
||||
}
|
||||
|
||||
pub(crate) fn echo(args: Vec<String>) {
|
||||
debug!("{}", args.join(" "));
|
||||
println!("{}", args.join(" "))
|
||||
}
|
||||
|
||||
pub(crate) fn exit() {
|
||||
debug!("Exiting...");
|
||||
println!("Exiting...");
|
||||
std::process::exit(0)
|
||||
}
|
||||
|
||||
pub(crate) fn clear() {
|
||||
info!("Clearing screen..., running command");
|
||||
println!("Clearing screen..., running command");
|
||||
let _result = if cfg!(target_os = "windows") {
|
||||
debug!("target_os is windows");
|
||||
Command::new("cmd").args(["/c", "cls"]).spawn()
|
||||
} else {
|
||||
debug!("target_os is unix");
|
||||
// "clear" or "tput reset"
|
||||
Command::new("tput").arg("reset").spawn()
|
||||
Command::new("clear").spawn()
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ pub mod commands;
|
|||
pub mod repl;
|
||||
|
||||
use lazy_static::lazy_static;
|
||||
use log2::{debug, error, info};
|
||||
use log::{debug, info};
|
||||
use parking_lot::RwLock;
|
||||
use std::{borrow::Borrow, collections::HashMap, sync::Arc};
|
||||
|
||||
|
@ -26,11 +26,10 @@ pub struct Command {
|
|||
|
||||
impl Command {
|
||||
pub fn execute(&self, args: Option<Vec<String>>) {
|
||||
//debug!("Executing command: {}", self.name);
|
||||
match &self.function {
|
||||
Callable::Simple(f) => {
|
||||
if let Some(args) = args {
|
||||
error!(
|
||||
eprintln!(
|
||||
"Command expected 0 arguments but {} args were given. Ignoring..",
|
||||
args.len()
|
||||
);
|
||||
|
@ -39,7 +38,7 @@ impl Command {
|
|||
}
|
||||
Callable::WithArgs(f) => match args {
|
||||
Some(args) => f(args),
|
||||
None => error!("Command expected arguments but received 0"),
|
||||
None => eprintln!("Command expected arguments but received 0"),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
@ -76,7 +75,7 @@ impl CommandList {
|
|||
func: Callable,
|
||||
arg_count: Option<u8>,
|
||||
) {
|
||||
debug!("Adding command: {}", name);
|
||||
info!("Adding command: {}", name);
|
||||
let mut commands = self.commands.write();
|
||||
|
||||
commands.push(Command {
|
||||
|
@ -88,24 +87,22 @@ impl CommandList {
|
|||
}
|
||||
|
||||
fn add_alias(&self, name: String, alias: String) {
|
||||
//println!("Input alias: {}", alias);
|
||||
if self.aliases.read().contains_key(&alias) {
|
||||
error!("Alias: '{}' already exists", alias);
|
||||
eprintln!("Alias: '{}' already exists", alias);
|
||||
return;
|
||||
}
|
||||
let mut commands = self.commands.write();
|
||||
if let Some(command) = commands.iter_mut().find(|cmd| cmd.name == name) {
|
||||
info!("Adding alias: {} for cmd: {}", alias, command.name);
|
||||
debug!("Adding alias: {} for cmd: {}", alias, command.name);
|
||||
self.aliases
|
||||
.write()
|
||||
.insert(alias.to_string(), name.to_string());
|
||||
} else {
|
||||
error!("Command: '{}' was not found", name);
|
||||
eprintln!("Command: '{}' was not found", name);
|
||||
}
|
||||
}
|
||||
|
||||
fn execute_command(&self, mut name: String, args: Option<Vec<String>>) {
|
||||
//info!("received input command: {}", name);
|
||||
let commands = self.commands.borrow();
|
||||
if self.aliases.read().contains_key(&name) {
|
||||
name = self
|
||||
|
@ -116,7 +113,7 @@ impl CommandList {
|
|||
.1
|
||||
.to_string();
|
||||
|
||||
debug!("changed to {}", name);
|
||||
debug!("changed to {}", &name);
|
||||
}
|
||||
if let Some(command) = commands.read().iter().find(|cmd| cmd.name == name) {
|
||||
match (command.arg_count, args.as_ref()) {
|
||||
|
|
|
@ -2,7 +2,6 @@ use super::{commands, Callable, COMMAND_LIST};
|
|||
use chrono::Local;
|
||||
use reedline::{Prompt, Reedline, Signal};
|
||||
use regex::Regex;
|
||||
use std::{borrow::Borrow, collections::HashMap, sync::Arc};
|
||||
|
||||
fn register_commands() {
|
||||
COMMAND_LIST.add_command(
|
||||
|
@ -42,7 +41,7 @@ fn register_commands() {
|
|||
|
||||
// EXAMPLE
|
||||
// Adding aliases for commands
|
||||
COMMAND_LIST.add_alias("cls".to_string(), "clear".to_string()); // Likely unintended; consider removing or renaming.
|
||||
COMMAND_LIST.add_alias("clear".to_string(), "cls".to_string());
|
||||
}
|
||||
|
||||
struct ZPrompt {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue