floss: Implement new help menu and command processor am: 3b871f6eca (008c07e6) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/rust/linux/client/src/command_handler.rs

+276 −37

Original line number	Diff line number	Diff line
		@@ -7,12 +7,18 @@ use manager_service::iface_bluetooth_manager::IBluetoothManager;

		use num_traits::cast::FromPrimitive;

		use std::collections::HashMap;
		use std::sync::{Arc, Mutex};

		use crate::console_yellow;
		use crate::print_info;
		use crate::{BluetoothDBus, BluetoothManagerDBus};

		const INDENT_CHAR: &str = " ";
		const BAR1_CHAR: &str = "=";
		const BAR2_CHAR: &str = "-";
		const MAX_MENU_CHAR_WIDTH: usize = 72;

		struct BtCallback {
		objpath: String,
		}
		@@ -60,6 +66,18 @@ impl RPCProxy for BtCallback {
		}
		}

		type CommandFunction = fn(&mut CommandHandler, &Vec<String>);

		fn _noop(_handler: &mut CommandHandler, _args: &Vec<String>) {
		// Used so we can add options with no direct function
		// e.g. help and quit
		}

		pub struct CommandOption {
		description: String,
		function_pointer: CommandFunction,
		}

		/// Handles string command entered from command line.
		pub(crate) struct CommandHandler {
		bluetooth_manager: Arc<Mutex<Box<BluetoothManagerDBus>>>,
		@@ -67,72 +85,293 @@ pub(crate) struct CommandHandler {

		is_bluetooth_callback_registered: bool,

		commands: Vec<String>,
		command_options: HashMap<String, CommandOption>,
		}

		fn enforce_arg_len<F>(args: &Vec<String>, min_len: usize, msg: &str, mut action: F)
		where
		F: FnMut(),
		{
		if args.len() < min_len {
		println!("Usage: {}", msg);
		} else {
		action();
		}
		}

		fn wrap_help_text(text: &str, max: usize, indent: usize) -> String {
		let remaining_count = std::cmp::max(
		// real_max
		std::cmp::max(max, text.chars().count())
		// take away char count
		- text.chars().count()
		// take away real_indent
		- (
		if std::cmp::max(max, text.chars().count())- text.chars().count() > indent {
		indent
		} else {
		0
		}),
		0,
		);

		format!("\|{}{}{}\|", INDENT_CHAR.repeat(indent), text, INDENT_CHAR.repeat(remaining_count))
		}

		// This should be called during the constructor in order to populate the command option map
		fn build_commands() -> HashMap<String, CommandOption> {
		let mut command_options = HashMap::<String, CommandOption>::new();
		command_options.insert(
		String::from("adapter"),
		CommandOption {
		description: String::from("Enable/Disable Bluetooth adapter. (e.g. adapter enable)"),
		function_pointer: CommandHandler::cmd_adapter,
		},
		);
		command_options.insert(
		String::from("get_address"),
		CommandOption {
		description: String::from("Gets the local device address."),
		function_pointer: CommandHandler::cmd_get_address,
		},
		);
		command_options.insert(
		String::from("discovery"),
		CommandOption {
		description: String::from("Start and stop device discovery. (e.g. discovery start)"),
		function_pointer: CommandHandler::cmd_discovery,
		},
		);
		command_options.insert(
		String::from("bond"),
		CommandOption {
		description: String::from("Creates a bond with a device."),
		function_pointer: CommandHandler::cmd_bond,
		},
		);
		command_options.insert(
		String::from("help"),
		CommandOption {
		description: String::from("Shows this menu."),
		function_pointer: CommandHandler::cmd_help,
		},
		);
		command_options.insert(
		String::from("quit"),
		CommandOption {
		description: String::from("Quit out of the interactive shell."),
		function_pointer: _noop,
		},
		);
		command_options
		}

		impl CommandHandler {
		/// Creates a new CommandHandler.
		///
		/// * `commands` - List of commands for `help`.
		pub fn new(
		bluetooth_manager: Arc<Mutex<Box<BluetoothManagerDBus>>>,
		bluetooth: Arc<Mutex<Box<BluetoothDBus>>>,
		commands: Vec<String>,
		) -> CommandHandler {
		CommandHandler {
		bluetooth_manager,
		bluetooth,
		is_bluetooth_callback_registered: false,
		commands,
		command_options: build_commands(),
		}
		}

		pub fn cmd_help(&self) {
		println!("Available commands:");
		for cmd in &self.commands {
		println!("{}", cmd);
		/// Entry point for command and arguments
		pub fn process_cmd_line(&mut self, command: &String, args: &Vec<String>) {
		// Ignore empty line
		match &command[0..] {
		"" => {}
		_ => match self.command_options.get(command) {
		Some(cmd) => (cmd.function_pointer)(self, &args),
		None => {
		println!("'{}' is an invalid command!", command);
		self.cmd_help(&args);
		}
		},
		};
		}

		pub fn cmd_enable(&self, _cmd: String) {
		self.bluetooth_manager.lock().unwrap().start(0);
		fn cmd_help(&mut self, args: &Vec<String>) {
		if args.len() > 0 {
		match self.command_options.get(&args[0]) {
		Some(cmd) => {
		println!(
		"\n{}{}\n{}{}\n",
		INDENT_CHAR.repeat(4),
		args[0],
		INDENT_CHAR.repeat(8),
		cmd.description
		);
		}
		None => {
		println!("'{}' is an invalid command!", args[0]);
		self.cmd_help(&vec![]);
		}
		}
		} else {
		// Build equals bar and Shave off sides
		let equal_bar = format!(" {} ", BAR1_CHAR.repeat(MAX_MENU_CHAR_WIDTH));

		// Build empty bar and Shave off sides
		let empty_bar = format!("\|{}\|", INDENT_CHAR.repeat(MAX_MENU_CHAR_WIDTH));

		pub fn cmd_disable(&self, _cmd: String) {
		// Header
		println!(
		"\n{}\n{}\n{}\n{}",
		equal_bar,
		wrap_help_text("Help Menu", MAX_MENU_CHAR_WIDTH, 2),
		// Minus bar
		format!("+{}+", BAR2_CHAR.repeat(MAX_MENU_CHAR_WIDTH)),
		empty_bar
		);

		// Print commands
		for (key, val) in self.command_options.iter() {
		println!(
		"{}\n{}\n{}",
		wrap_help_text(&key, MAX_MENU_CHAR_WIDTH, 4),
		wrap_help_text(&val.description, MAX_MENU_CHAR_WIDTH, 8),
		empty_bar
		);
		}

		// Footer
		println!("{}\n{}", empty_bar, equal_bar);
		}
		}

		fn cmd_adapter(&mut self, args: &Vec<String>) {
		enforce_arg_len(args, 1, "adapter <enable\|disable>", \|\| match &args[0][0..] {
		"enable" => {
		self.bluetooth_manager.lock().unwrap().start(0);
		}
		"disable" => {
		self.bluetooth_manager.lock().unwrap().stop(0);
		}
		_ => {
		println!("Invalid argument '{}'", args[0]);
		}
		});
		}

		pub fn cmd_get_address(&self, _cmd: String) {
		fn cmd_get_address(&mut self, _args: &Vec<String>) {
		let addr = self.bluetooth.lock().unwrap().get_address();
		print_info!("Local address = {}", addr);
		}

		pub fn cmd_start_discovery(&mut self, _cmd: String) {
		fn cmd_discovery(&mut self, args: &Vec<String>) {
		enforce_arg_len(args, 1, "discovery <start\|stop>", \|\| {
		match &args[0][0..] {
		"start" => {
		// TODO: Register the BtCallback when getting a OnStateChangedCallback from btmanagerd.
		if !self.is_bluetooth_callback_registered {
		self.bluetooth.lock().unwrap().register_callback(Box::new(BtCallback {
		objpath: String::from("/org/chromium/bluetooth/client/bluetooth_callback"),
		objpath: String::from(
		"/org/chromium/bluetooth/client/bluetooth_callback",
		),
		}));
		self.is_bluetooth_callback_registered = true;
		}

		self.bluetooth.lock().unwrap().start_discovery();
		}

		pub fn cmd_cancel_discovery(&self, _cmd: String) {
		"stop" => {
		self.bluetooth.lock().unwrap().cancel_discovery();
		}

		pub fn cmd_create_bond(&self, cmd: String) {
		let s = cmd.split(' ').collect::<Vec<&str>>();
		if s.len() < 2 {
		println!("usage: create_bond <addr>");
		return;
		_ => {
		println!("Invalid argument '{}'", args[0]);
		}
		let device = BluetoothDevice { address: String::from(s[1]), name: String::from("") };
		}
		});
		}

		fn cmd_bond(&mut self, args: &Vec<String>) {
		enforce_arg_len(args, 1, "bond <address>", \|\| {
		let device = BluetoothDevice {
		address: String::from(&args[0]),
		name: String::from("Classic Device"),
		};
		self.bluetooth
		.lock()
		.unwrap()
		.create_bond(device, BluetoothTransport::from_i32(0).unwrap());
		});
		}

		/// Get the list of currently supported commands
		pub fn get_command_list(&self) -> Vec<String> {
		self.command_options.keys().map(\|key\| String::from(key)).collect::<Vec<String>>()
		}
		}

		#[cfg(test)]
		mod tests {

		use super::*;

		#[test]
		fn test_wrap_help_text() {
		let text = "hello";
		let text_len = text.chars().count();
		// ensure no overflow
		assert_eq!(format!("\|{}\|", text), wrap_help_text(text, 4, 0));
		assert_eq!(format!("\|{}\|", text), wrap_help_text(text, 5, 0));
		assert_eq!(format!("\|{}{}\|", text, " "), wrap_help_text(text, 6, 0));
		assert_eq!(format!("\|{}{}\|", text, " ".repeat(2)), wrap_help_text(text, 7, 0));
		assert_eq!(
		format!("\|{}{}\|", text, " ".repeat(100 - text_len)),
		wrap_help_text(text, 100, 0)
		);
		assert_eq!(format!("\|{}{}\|", " ", text), wrap_help_text(text, 4, 1));
		assert_eq!(format!("\|{}{}\|", " ".repeat(2), text), wrap_help_text(text, 5, 2));
		assert_eq!(format!("\|{}{}{}\|", " ".repeat(3), text, " "), wrap_help_text(text, 6, 3));
		assert_eq!(
		format!("\|{}{}{}\|", " ".repeat(4), text, " ".repeat(7 - text_len)),
		wrap_help_text(text, 7, 4)
		);
		assert_eq!(format!("\|{}{}\|", " ".repeat(9), text), wrap_help_text(text, 4, 9));
		assert_eq!(format!("\|{}{}\|", " ".repeat(10), text), wrap_help_text(text, 3, 10));
		assert_eq!(format!("\|{}{}\|", " ".repeat(11), text), wrap_help_text(text, 2, 11));
		assert_eq!(format!("\|{}{}\|", " ".repeat(12), text), wrap_help_text(text, 1, 12));
		assert_eq!("\|\|", wrap_help_text("", 0, 0));
		assert_eq!("\| \|", wrap_help_text("", 1, 0));
		assert_eq!("\| \|", wrap_help_text("", 1, 1));
		assert_eq!("\| \|", wrap_help_text("", 0, 1));
		}

		#[test]
		fn test_enforce_arg_len() {
		// With min arg set and min arg supplied
		let args: &Vec<String> = &vec![String::from("arg")];
		let mut i: usize = 0;
		enforce_arg_len(args, 1, "help text", \|\| {
		i = 1;
		});
		assert_eq!(1, i);

		// With no min arg set and with arg supplied
		i = 0;
		enforce_arg_len(args, 0, "help text", \|\| {
		i = 1;
		});
		assert_eq!(1, i);

		// With min arg set and no min arg supplied
		let args: &Vec<String> = &vec![];
		i = 0;
		enforce_arg_len(args, 1, "help text", \|\| {
		i = 1;
		});
		assert_eq!(0, i);

		// With no min arg set and no arg supplied
		i = 0;
		enforce_arg_len(args, 0, "help text", \|\| {
		i = 1;
		});
		assert_eq!(1, i);
		}
		}

system/gd/rust/linux/client/src/main.rs

+10 −36

Original line number	Diff line number	Diff line
		@@ -102,51 +102,25 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
		objpath: String::from("/org/chromium/bluetooth/client/bluetooth_manager_callback"),
		}));

		// TODO(b/193719802): Refactor this into a dedicated "Help" data structure.
		let commands = vec![
		String::from("help"),
		String::from("enable"),
		String::from("disable"),
		String::from("get_address"),
		String::from("start_discovery"),
		String::from("cancel_discovery"),
		String::from("create_bond"),
		];

		let mut handler = CommandHandler::new(
		api.bluetooth_manager.clone(),
		api.bluetooth.clone(),
		commands.clone(),
		);

		let mut handle_cmd = move \|cmd: String\| match cmd.split(' ').collect::<Vec<&str>>()[0] {
		"help" => handler.cmd_help(),

		"enable" => handler.cmd_enable(cmd),
		"disable" => handler.cmd_disable(cmd),
		"get_address" => handler.cmd_get_address(cmd),
		"start_discovery" => handler.cmd_start_discovery(cmd),
		"cancel_discovery" => handler.cmd_cancel_discovery(cmd),
		"create_bond" => handler.cmd_create_bond(cmd),
		let mut handler = CommandHandler::new(api.bluetooth_manager.clone(), api.bluetooth.clone());

		// Ignore empty commands.
		"" => {}

		// TODO: Print help.
		_ => print_info!("Command \"{}\" not recognized", cmd),
		};

		let editor = AsyncEditor::new(commands.clone());
		let editor = AsyncEditor::new(handler.get_command_list().clone());

		loop {
		let result = editor.readline().await;
		match result {
		Err(_err) => break,
		Ok(line) => {
		if line.eq("quit") {
		let command_vec =
		line.split(" ").map(\|s\| String::from(s)).collect::<Vec<String>>();
		let cmd = &command_vec[0];
		if cmd.eq("quit") {
		break;
		}
		handle_cmd(line.clone());
		handler.process_cmd_line(
		&String::from(cmd),
		&command_vec[1..command_vec.len()].to_vec(),
		);
		}
		}
		}