StringListOption: Add delimiters with default value

`StringListOption` is a wrapper for `OptionStringList` both need to support custom delimiters.
kontura · Nov 16, 2022 · f94d86e · f94d86e
1 parent 486b628
commit f94d86e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/include/libdnf-cli/session.hpp b/include/libdnf-cli/session.hpp
@@ -190,7 +190,8 @@ class StringListOption : public Option {
         const std::string & long_name,
         char short_name,
         const std::string & desc,
-        const std::string & help);
+        const std::string & help,
+        const char * delimiters = OptionStringList::DEFAULT_DELIMITERS);
 
     explicit StringListOption(
         libdnf::cli::session::Command & command,
@@ -199,7 +200,8 @@ class StringListOption : public Option {
         const std::string & desc,
         const std::string & help,
         const std::string & allowed_values_regex,
-        const bool icase);
+        const bool icase,
+        const char * delimiters = OptionStringList::DEFAULT_DELIMITERS);
 
     /// @return Parsed value.
     /// @since 5.0

diff --git a/libdnf-cli/session.cpp b/libdnf-cli/session.cpp
@@ -127,10 +127,11 @@ StringListOption::StringListOption(
     const std::string & desc,
     const std::string & help,
     const std::string & allowed_values_regex,
-    const bool icase) {
+    const bool icase,
+    const char * delimiters) {
     auto & parser = command.get_session().get_argument_parser();
-    conf = dynamic_cast<libdnf::OptionStringList *>(parser.add_init_value(
-        std::make_unique<libdnf::OptionStringList>(std::vector<std::string>(), allowed_values_regex, icase)));
+    conf = dynamic_cast<libdnf::OptionStringList *>(parser.add_init_value(std::make_unique<libdnf::OptionStringList>(
+        std::vector<std::string>(), allowed_values_regex, icase, delimiters)));
     arg = parser.add_new_named_arg(long_name);
 
     if (!long_name.empty()) {
@@ -165,8 +166,9 @@ StringListOption::StringListOption(
     const std::string & long_name,
     char short_name,
     const std::string & desc,
-    const std::string & help)
-    : StringListOption(command, long_name, short_name, desc, help, "", false) {}
+    const std::string & help,
+    const char * delimiters)
+    : StringListOption(command, long_name, short_name, desc, help, "", false, delimiters) {}
 
 
 StringArgumentList::StringArgumentList(