Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added commands to basic mode

Browse Source
This commit is contained in:
Capucho 2020-09-02 12:47:17 +01:00 committed by Marcel Märtens
parent 6e24ff31ee
commit 5fd0e0a5b7
2 changed files with 111 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server-cli/src/main.rs
View File

@ -78,9 +78,7 @@ fn main() -> io::Result<()> {
subscriber.with_writer(|| LOG.clone()).init();
}
if !basic {
tui.run();
}
tui.run(basic);
info!("Starting server...");

101
server-cli/src/tui_runner.rs
View File

@ -93,43 +93,7 @@ impl Tui {
input.pop();
},
KeyCode::Enter => {
let mut args = input.as_str().split_whitespace();
if let Some(cmd_name) = args.next() {
if let Some(cmd) = COMMANDS.iter().find(|cmd| cmd.name == cmd_name) {
let args = args.collect::<Vec<_>>();
let (arg_len, args) = if cmd.split_spaces {
(
args.len(),
args.into_iter()
.map(|s| s.to_string())
.collect::<Vec<String>>(),
)
} else {
(1, vec![args.into_iter().collect::<String>()])
};
match arg_len.cmp(&cmd.args) {
std::cmp::Ordering::Less => {
error!("{} takes {} arguments", cmd_name, cmd.args)
},
std::cmp::Ordering::Greater => {
warn!("{} only takes {} arguments", cmd_name, cmd.args);
let cmd = cmd.cmd;
cmd(args, msg_s)
},
std::cmp::Ordering::Equal => {
let cmd = cmd.cmd;
cmd(args, msg_s)
},
}
} else {
error!("{} not found", cmd_name);
}
}
parse_command(input, msg_s);
*input = String::new();
},
@ -138,12 +102,7 @@ impl Tui {
}
}
pub fn run(&mut self) {
let mut stdout = io::stdout();
execute!(stdout, EnterAlternateScreen, EnableMouseCapture).unwrap();
enable_raw_mode().unwrap();
pub fn run(&mut self, basic: bool) {
let hook = std::panic::take_hook();
std::panic::set_hook(Box::new(move |info| {
Self::shutdown();
@ -153,9 +112,24 @@ impl Tui {
let mut msg_s = self.msg_s.take().unwrap();
let running = self.running.clone();
if basic {
std::thread::spawn(move || {
while running.load(Ordering::Relaxed) {
let mut buf = String::new();
io::stdin().read_line(&mut buf).unwrap();
parse_command(&buf, &mut msg_s);
}
});
} else {
self.background = Some(std::thread::spawn(move || {
// Start the tui
let stdout = io::stdout();
let mut stdout = io::stdout();
execute!(stdout, EnterAlternateScreen, EnableMouseCapture).unwrap();
enable_raw_mode().unwrap();
let backend = CrosstermBackend::new(stdout);
let mut terminal = Terminal::new(backend).unwrap();
@ -214,6 +188,7 @@ impl Tui {
}
}));
}
}
fn shutdown() {
let mut stdout = io::stdout();
@ -230,3 +205,41 @@ impl Drop for Tui {
Self::shutdown();
}
}
fn parse_command(input: &str, msg_s: &mut mpsc::Sender<Message>) {
let mut args = input.split_whitespace();
if let Some(cmd_name) = args.next() {
if let Some(cmd) = COMMANDS.iter().find(|cmd| cmd.name == cmd_name) {
let args = args.collect::<Vec<_>>();
let (arg_len, args) = if cmd.split_spaces {
(
args.len(),
args.into_iter()
.map(|s| s.to_string())
.collect::<Vec<String>>(),
)
} else {
(1, vec![args.into_iter().collect::<String>()])
};
match arg_len.cmp(&cmd.args) {
std::cmp::Ordering::Less => error!("{} takes {} arguments", cmd_name, cmd.args),
std::cmp::Ordering::Greater => {
warn!("{} only takes {} arguments", cmd_name, cmd.args);
let cmd = cmd.cmd;
cmd(args, msg_s)
},
std::cmp::Ordering::Equal => {
let cmd = cmd.cmd;
cmd(args, msg_s)
},
}
} else {
error!("{} not found", cmd_name);
}
}
}