Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ad7ca15 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "floss: btclient will now accept command line arguments" am: de115d9c... 

Merge "floss: btclient will now accept command line arguments" am: de115d9c am: 2530581a am: fe63e477 am: ce3b9cef

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1799247

Change-Id: I2d8a9f2f2a19e6dd30a972af7368ffa9ae7c0a6a
parents 77231c90 ce3b9cef

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(())

    })

}