Merge "floss: btclient will now accept command line arguments" am: de115d9cdf... (66475924) · Commits · e / os / android_packages_modules_Bluetooth

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

+30 −21

Original line number	Diff line number	Diff line
		@@ -104,6 +104,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {

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

		let args: Vec<String> = std::env::args().collect();

		// Allow command line arguments to be read
		if args.len() > 1 {
		handler.process_cmd_line(&args[1], &args[2..].to_vec());
		} else {
		start_interactive_shell(handler).await;
		}
		return Result::Ok(());
		})
		}

		async fn start_interactive_shell(mut handler: CommandHandler) {
		let editor = AsyncEditor::new(handler.get_command_list().clone());

		loop {
		@@ -111,8 +124,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
		match result {
		Err(_err) => break,
		Ok(line) => {
		let command_vec =
		line.split(" ").map(\|s\| String::from(s)).collect::<Vec<String>>();
		let command_vec = line.split(" ").map(\|s\| String::from(s)).collect::<Vec<String>>();
		let cmd = &command_vec[0];
		if cmd.eq("quit") {
		break;
		@@ -126,7 +138,4 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
		}

		print_info!("Client exiting");

		Result::Ok(())
		})
		}