Remove unnecessary help flag handling

The `CvdCommandHandler` and related logic already handle help flags. Test: cvd powerbtn --help Test: cvd restart -h Test: cvd clear -h Test: cvd remove -h Test: cvd powerwash -h
google · Jan 30, 2025 · 9037acc · 9037acc
1 parent 13eb859
commit 9037acc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 47 deletions.
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/clear.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/clear.cpp
@@ -22,7 +22,6 @@
 #include <android-base/parseint.h>
 #include <android-base/scopeguard.h>
 
-#include "common/libs/utils/flag_parser.h"
 #include "common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/legacy/cvd_server.pb.h"
 #include "host/commands/cvd/cli/commands/command_handler.h"
@@ -43,7 +42,7 @@ class CvdClearCommandHandler : public CvdCommandHandler {
   Result<void> Handle(const CommandRequest& request) override;
   cvd_common::Args CmdList() const override { return {kClearCmd}; }
   Result<std::string> SummaryHelp() const override { return kSummaryHelpText; }
-  bool ShouldInterceptHelp() const override { return false; }
+  bool ShouldInterceptHelp() const override { return true; }
   Result<std::string> DetailedHelp(std::vector<std::string>&) const override;
 
  private:
@@ -56,16 +55,7 @@ CvdClearCommandHandler::CvdClearCommandHandler(
 
 Result<void> CvdClearCommandHandler::Handle(const CommandRequest& request) {
   CF_EXPECT(CanHandle(request));
-
-  std::vector<std::string> cmd_args = request.SubcommandArguments();
-
-  // TODO: chadreynolds - check if this can be removed
-  if (CF_EXPECT(HasHelpFlag(cmd_args))) {
-    std::cout << kSummaryHelpText << std::endl;
-    return {};
-  }
   CF_EXPECT_EQ(instance_manager_.CvdClear(request).code(), cvd::Status::OK);
-
   return {};
 }
 

diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/power_btn.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/power_btn.cpp
@@ -22,7 +22,6 @@
 #include <android-base/strings.h>
 #include <fmt/format.h>
 
-#include "common/libs/utils/flag_parser.h"
 #include "common/libs/utils/result.h"
 #include "host/commands/cvd/cli/commands/command_handler.h"
 #include "host/commands/cvd/cli/selector/selector.h"
@@ -43,13 +42,6 @@ class CvdDevicePowerBtnCommandHandler : public CvdCommandHandler {
 
   Result<void> Handle(const CommandRequest& request) override {
     CF_EXPECT(CanHandle(request));
-
-    // TODO: chadreynolds - check if this can be removed
-    if (CF_EXPECT(HasHelpFlag(request.SubcommandArguments()))) {
-      std::cout << kSummaryHelpText << std::endl;
-      return {};
-    }
-
     auto [instance, _] =
         CF_EXPECT(selector::SelectInstance(instance_manager_, request),
                   "Unable to select an instance");

diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/powerwash.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/powerwash.cpp
@@ -67,21 +67,13 @@ class CvdDevicePowerwashCommandHandler : public CvdCommandHandler {
   Result<void> Handle(const CommandRequest& request) override {
     CF_EXPECT(CanHandle(request));
 
+    PowerwashOptions options;
     std::vector<std::string> subcmd_args = request.SubcommandArguments();
-
-    // TODO: chadreynolds - check if this can be removed
-    if (CF_EXPECT(HasHelpFlag(subcmd_args))) {
-      std::cout << kDetailedHelpText << std::endl;
-      return {};
-    }
+    CF_EXPECT(ConsumeFlags(options.Flags(), subcmd_args));
 
     auto [instance, unused] =
         CF_EXPECT(selector::SelectInstance(instance_manager_, request),
                   "Unable to select an instance");
-
-    PowerwashOptions options;
-    CF_EXPECT(ConsumeFlags(options.Flags(), subcmd_args));
-
     CF_EXPECT(instance.PowerWash(
         std::chrono::seconds(options.wait_for_launcher_seconds),
         std::chrono::seconds(options.boot_timeout_seconds)));

diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/remove.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/remove.cpp
@@ -20,7 +20,6 @@
 #include <string>
 #include <vector>
 
-#include "common/libs/utils/flag_parser.h"
 #include "common/libs/utils/result.h"
 #include "host/commands/cvd/cli/commands/command_handler.h"
 #include "host/commands/cvd/cli/selector/selector.h"
@@ -50,19 +49,12 @@ class RemoveCvdCommandHandler : public CvdCommandHandler {
            "cvd itself)";
   }
 
-  bool ShouldInterceptHelp() const override { return false; }
+  bool ShouldInterceptHelp() const override { return true; }
 
   Result<void> Handle(const CommandRequest& request) override {
     CF_EXPECT(CanHandle(request));
     std::vector<std::string> subcmd_args = request.SubcommandArguments();
 
-    // TODO: chadreynolds - check if this can be removed
-    if (CF_EXPECT(HasHelpFlag(subcmd_args))) {
-      std::vector<std::string> unused;
-      std::cout << CF_EXPECT(DetailedHelp(unused));
-      return {};
-    }
-
     if (!CF_EXPECT(instance_manager_.HasInstanceGroups())) {
       return CF_ERR(NoGroupMessage(request));
     }

diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/restart.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/restart.cpp
@@ -66,21 +66,14 @@ class CvdDeviceRestartCommandHandler : public CvdCommandHandler {
   Result<void> Handle(const CommandRequest& request) override {
     CF_EXPECT(CanHandle(request));
 
+    RestartOptions options;
     std::vector<std::string> subcmd_args = request.SubcommandArguments();
-
-    // TODO: chadreynolds - check if this can be removed
-    if (CF_EXPECT(HasHelpFlag(subcmd_args))) {
-      std::cout << kDetailedHelpText << std::endl;
-      return {};
-    }
+    CF_EXPECT(ConsumeFlags(options.Flags(), subcmd_args));
 
     auto [instance, unused] =
         CF_EXPECT(selector::SelectInstance(instance_manager_, request),
                   "Unable to select an instance");
 
-    RestartOptions options;
-    CF_EXPECT(ConsumeFlags(options.Flags(), subcmd_args));
-
     CF_EXPECT(instance.Restart(
         std::chrono::seconds(options.wait_for_launcher_seconds),
         std::chrono::seconds(options.boot_timeout_seconds)));