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

Commit 4fed731d authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Abhishek Pandit-Subedi
Browse files

floss: Rename list-devices and support bonded devices 

Rename list-devices to just list and support listing either bonded or
found devices. This will let users both look at their bonded device list
as well as devices found during the most recent discovery session.

Bug: 196887009
Tag: #floss
Test: In btclient, check "list found" and "list bonded"
Change-Id: I907c0dc46949c03723c3d0dab068ed1a8b2f7a83
parent 25b37aa1

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

+32 −6
Original line number Diff line number Diff line
@@ -112,10 +112,10 @@ fn build_commands() -> HashMap<String, CommandOption> { 
        },

    );

    command_options.insert(

        String::from("list-devices"),

        String::from("list"),

        CommandOption {

            description: String::from(

                "List known remote devices from most recent discovery session.",

                "List bonded or found remote devices. Use: list <bonded|found>",

            ),

            function_pointer: CommandHandler::cmd_list_devices,

        },
@@ -376,11 +376,37 @@ impl CommandHandler { 
        self.command_options.keys().map(|key| String::from(key)).collect::<Vec<String>>()

    }



    fn cmd_list_devices(&mut self, _args: &Vec<String>) {

    fn cmd_list_devices(&mut self, args: &Vec<String>) {

        if !self.context.lock().unwrap().adapter_ready {

            self.adapter_not_ready();

            return;

        }



        enforce_arg_len(args, 1, "list <bonded|found>", || match &args[0][0..] {

            "bonded" => {

                print_info!("Known bonded devices:");

                let devices = self

                    .context

                    .lock()

                    .unwrap()

                    .adapter_dbus

                    .as_ref()

                    .unwrap()

                    .get_bonded_devices();

                for device in devices.iter() {

                    print_info!("[{:17}] {}", device.address, device.name);

                }

            }

            "found" => {

                print_info!("Devices found in most recent discovery session:");

                for (key, val) in self.context.lock().unwrap().found_devices.iter() {

            print_info!("[{:18}] {}", key, val.name);

                    print_info!("[{:17}] {}", key, val.name);

                }

            }

            _ => {

                println!("Invalid argument '{}'", args[0]);

            }

        });

    }

}