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

Commit 810029fb authored by Marie Janssen's avatar Marie Janssen
Browse files

bluetooth-cli: add support for --exec 

Adds the --exec and -e arguments, which execute commands when the
cli starts.

This also adds support for chaining commands at the command line by
separating them with ';' characters.

Change-Id: Ic2bf8a908fbb7fb4cf775810754571fa96d75e87
parent ac7b402c

system/service/client/main.cpp

+51 −23
Original line number Diff line number Diff line
@@ -736,6 +736,33 @@ void HandleHelp(IBluetooth* /* bt_iface */, const vector<string>& /* args */) { 
  cout << endl;

}



const char kExecuteLong[] = "exec";

const char kExecuteShort[] = "e";



bool ExecuteCommand(sp<IBluetooth> bt_iface, std::string &command) {

  vector<string> args =

      base::SplitString(command, " ", base::TRIM_WHITESPACE,

                        base::SPLIT_WANT_ALL);



  if (args.empty())

    return true;



  // The first argument is the command while the remaining are what we pass to

  // the handler functions.

  command = args[0];

  args.erase(args.begin());



  for (int i = 0; kCommandMap[i].func; i++) {

    if (command == kCommandMap[i].command) {

      kCommandMap[i].func(bt_iface.get(), args);

      return true;

    }

  }



  cout << "Unrecognized command: " << command << endl;

  return false;

}



}  // namespace



class BluetoothDeathRecipient : public android::IBinder::DeathRecipient {
@@ -758,6 +785,7 @@ class BluetoothDeathRecipient : public android::IBinder::DeathRecipient { 
  DISALLOW_COPY_AND_ASSIGN(BluetoothDeathRecipient);

};





int main(int argc, char* argv[]) {

  base::AtExitManager exit_manager;

  base::CommandLine::Init(argc, argv);
@@ -795,9 +823,31 @@ int main(int argc, char* argv[]) { 
       << "Type \"help\" to see possible commands.\n"

       << endl;



  while (true) {

  string command;



  // Add commands from the command line, if they exist.

  auto command_line = base::CommandLine::ForCurrentProcess();

  if (command_line->HasSwitch(kExecuteLong)) {

    command += command_line->GetSwitchValueASCII(kExecuteLong);

  }



  if (command_line->HasSwitch(kExecuteShort)) {

    if (!command.empty())

      command += " ; ";

    command += command_line->GetSwitchValueASCII(kExecuteShort);

  }



  while (true) {

    vector<string> commands = base::SplitString(command, ";",

                                                base::TRIM_WHITESPACE,

                                                base::SPLIT_WANT_ALL);

    for (string command : commands) {

      if (!ExecuteCommand(bt_iface, command))

        break;

    }



    commands.clear();



    PrintPrompt();



    showing_prompt = true;
@@ -814,28 +864,6 @@ int main(int argc, char* argv[]) { 
      return EXIT_FAILURE;

    }



    vector<string> args =

        base::SplitString(command, " ", base::TRIM_WHITESPACE,

                          base::SPLIT_WANT_ALL);



    if (args.empty())

      continue;



    // The first argument is the command while the remaning are what we pass to

    // the handler functions.

    command = args[0];

    args.erase(args.begin());



    bool command_handled = false;

    for (int i = 0; kCommandMap[i].func && !command_handled; i++) {

      if (command == kCommandMap[i].command) {

        kCommandMap[i].func(bt_iface.get(), args);

        command_handled = true;

      }

    }



    if (!command_handled)

      cout << "Unrecognized command: " << command << endl;

  }



  return EXIT_SUCCESS;