Support multi command in CLI, with commands starting without -- (for …

…instance, 'trade' instead of '--trade')
sjanel · Oct 1, 2023 · d9b58a7 · d9b58a7
1 parent 7e5cc4a
commit d9b58a7
Show file tree

Hide file tree

Showing 13 changed files with 647 additions and 480 deletions.
diff --git a/CONFIG.md b/CONFIG.md
diff --git a/README.md b/README.md
diff --git a/src/engine/include/coincentercommands.hpp b/src/engine/include/coincentercommands.hpp
@@ -17,13 +17,17 @@ class CoincenterCommands {
   CoincenterCommands() noexcept(std::is_nothrow_default_constructible_v<Commands>) = default;
 
   // Builds a CoincenterCommands and add commands from given command line options.
-  explicit CoincenterCommands(const CoincenterCmdLineOptions &cmdLineOptions);
+  explicit CoincenterCommands(const CoincenterCmdLineOptions &cmdLineOptions)
+      : CoincenterCommands(std::span<const CoincenterCmdLineOptions>{&cmdLineOptions, 1U}) {}
 
-  static CoincenterCmdLineOptions ParseOptions(int argc, const char *argv[]);
+  // Builds a CoincenterCommands and add commands from given command line options span.
+  explicit CoincenterCommands(std::span<const CoincenterCmdLineOptions> cmdLineOptionsSpan);
+
+  static vector<CoincenterCmdLineOptions> ParseOptions(int argc, const char *argv[]);
 
   /// @brief Set this CoincenterCommands from given command line options.
   /// @return false if only help or version is asked, true otherwise
-  bool setFromOptions(const CoincenterCmdLineOptions &cmdLineOptions);
+  bool addOption(const CoincenterCmdLineOptions &cmdLineOptions);
 
   std::span<const CoincenterCommand> commands() const { return _commands; }
 

diff --git a/src/engine/include/coincenteroptions.hpp b/src/engine/include/coincenteroptions.hpp
diff --git a/src/engine/include/commandlineoption.hpp b/src/engine/include/commandlineoption.hpp
@@ -3,6 +3,7 @@
 #include <compare>
 #include <optional>
 #include <string_view>
+#include <type_traits>
 #include <variant>
 
 #include "cct_cctype.hpp"
@@ -21,11 +22,11 @@ class CommandLineOption {
 
   template <class StringViewType>
   constexpr CommandLineOption(GroupNameAndPrio optionGroupName, const char* fullName, char shortName,
-                              const char* valueDescription, StringViewType description)
+                              const char* valueDescription, StringViewType descriptionStr)
       : _optionGroupName(optionGroupName.first),
         _fullName(fullName),
         _valueDescription(valueDescription),
-        _description(description),
+        _description(descriptionStr),
         _prio(optionGroupName.second),
         _shortName(shortName) {
     static_assert(std::is_same_v<StringViewType, std::string_view> || std::is_same_v<StringViewType, const char*>);
@@ -47,9 +48,11 @@ class CommandLineOption {
 
   constexpr bool hasShortName() const { return _shortName != '\0'; }
 
-  constexpr std::strong_ordering operator<=>(const CommandLineOption& o) const;
+  constexpr std::strong_ordering operator<=>(const CommandLineOption& other) const;
 
  private:
+  static constexpr std::string_view kLegacyFullNamePrefixOption = "--";
+
   std::string_view _optionGroupName;
   std::string_view _fullName;
   std::string_view _valueDescription;
@@ -92,19 +95,27 @@ struct AllowedCommandLineOptionsBase {
 
 constexpr bool CommandLineOption::matches(std::string_view optName) const {
   if (optName.size() == 2 && optName.front() == '-' && optName.back() == _shortName) {
-    return true;
+    return true;  // it is a short hand flag
+  }
+  if (optName == _fullName) {
+    return true;  // standard full match
+  }
+  if (optName.starts_with(kLegacyFullNamePrefixOption)) {
+    // backwards compatibility check
+    optName.remove_prefix(kLegacyFullNamePrefixOption.length());
+    return optName == _fullName;
   }
-  return optName == _fullName;
+  return false;
 }
 
-constexpr std::strong_ordering CommandLineOption::operator<=>(const CommandLineOption& o) const {
-  if (_prio != o._prio) {
-    return _prio <=> o._prio;
+constexpr std::strong_ordering CommandLineOption::operator<=>(const CommandLineOption& other) const {
+  if (_prio != other._prio) {
+    return _prio <=> other._prio;
   }
-  if (_optionGroupName != o._optionGroupName) {
-    return _optionGroupName <=> o._optionGroupName;
+  if (_optionGroupName != other._optionGroupName) {
+    return _optionGroupName <=> other._optionGroupName;
   }
-  return _fullName <=> o._fullName;
+  return _fullName <=> other._fullName;
 }
 
 }  // namespace cct