Add --queryformat, --requires, --provides, --conflicts .. options

dnf5/commands/repoquery/repoquery.cpp

@@ -57,11 +57,13 @@ void RepoqueryCommand::set_argument_parser() {
     info_option = dynamic_cast<libdnf::OptionBool *>(
         parser.add_init_value(std::unique_ptr<libdnf::OptionBool>(new libdnf::OptionBool(false))));
 
-    nevra_option = dynamic_cast<libdnf::OptionBool *>(
-        parser.add_init_value(std::unique_ptr<libdnf::OptionBool>(new libdnf::OptionBool(true))));
+    // The default format is full_nevra
+    query_format_option = dynamic_cast<libdnf::OptionString *>(
+        parser.add_init_value(std::make_unique<libdnf::OptionString>("%{full_nevra}\n")));
 
     auto available = parser.add_new_named_arg("available");
     available->set_long_name("available");
+    //TODO(amatej): Unify description of all repoquery options to use the same wording
     available->set_description("display available packages (default)");
     available->set_const_value("true");
     available->link_value(available_option);
@@ -78,11 +80,13 @@ void RepoqueryCommand::set_argument_parser() {
     info->set_const_value("true");
     info->link_value(info_option);
 
-    auto nevra = parser.add_new_named_arg("nevra");
-    nevra->set_long_name("nevra");
-    nevra->set_description("use name-epoch:version-release.architecture format for displaying packages (default)");
-    nevra->set_const_value("true");
-    nevra->link_value(nevra_option);
+    auto query_format = parser.add_new_named_arg("queryformat");
+    query_format->set_long_name("queryformat");
+    query_format->set_description(
+        "display format for listing packages: %{name} %{version} ... use --querytags to view full tag list");
+    query_format->set_has_value(true);
+    query_format->set_arg_value_help("QUERYFORMAT");
+    query_format->link_value(query_format_option);
 
     auto keys =
         parser.add_new_positional_arg("keys_to_match", ArgumentParser::PositionalArg::UNLIMITED, nullptr, nullptr);
@@ -102,8 +106,6 @@ void RepoqueryCommand::set_argument_parser() {
         }
     });
 
-    info->add_conflict_argument(*nevra);
-
     whatdepends_option = dynamic_cast<libdnf::OptionStringList *>(
         parser.add_init_value(std::make_unique<libdnf::OptionStringList>(std::vector<std::string>(), "", false, ",")));
     auto * whatdepends = parser.add_new_named_arg("whatdepends");
@@ -222,10 +224,45 @@ void RepoqueryCommand::set_argument_parser() {
     advisory_bz = std::make_unique<BzOption>(*this);
     advisory_cve = std::make_unique<CveOption>(*this);
 
+    std::vector<std::string> pkg_attrs_options{
+        "conflicts",
+        "enhances",
+        "obsoletes",
+        "provides",
+        "recommends",
+        "requires",
+        "requires-pre",
+        "suggests",
+        "supplements",
+        "",  // empty when option is not used
+    };
+    pkg_attr_option = dynamic_cast<libdnf::OptionEnum<std::string> *>(
+        parser.add_init_value(std::make_unique<libdnf::OptionEnum<std::string>>("", pkg_attrs_options)));
+
+    auto * repoquery_formatting = get_context().get_argument_parser().add_new_group("repoquery_formatting");
+    repoquery_formatting->set_header("Formatting:");
+    cmd.register_group(repoquery_formatting);
+
+    // remove the last empty ("") option, it should not be an arg
+    pkg_attrs_options.pop_back();
+    for (const auto & pkg_attr : pkg_attrs_options) {
+        auto * arg = parser.add_new_named_arg(pkg_attr);
+        arg->set_long_name(pkg_attr);
+        arg->set_description("Like --queryformat=\"%{" + pkg_attr + "}\" but deduplicated and sorted.");
+        arg->set_has_value(false);
+        arg->set_const_value(pkg_attr);
+        arg->link_value(pkg_attr_option);
+        repoquery_formatting->register_argument(arg);
+        cmd.register_named_arg(arg);
+    }
+    repoquery_formatting->register_argument(info);
+    cmd.register_named_arg(info);
+    repoquery_formatting->register_argument(query_format);
+    cmd.register_named_arg(query_format);
+
     cmd.register_named_arg(available);
     cmd.register_named_arg(installed);
-    cmd.register_named_arg(info);
-    cmd.register_named_arg(nevra);
+
     cmd.register_named_arg(whatdepends);
     cmd.register_named_arg(whatconflicts);
     cmd.register_named_arg(whatprovides);
@@ -235,6 +272,7 @@ void RepoqueryCommand::set_argument_parser() {
     cmd.register_named_arg(whatenhances);
     cmd.register_named_arg(whatsupplements);
     cmd.register_named_arg(whatsuggests);
+
     cmd.register_positional_arg(keys);
 }
 
@@ -450,10 +488,10 @@ void RepoqueryCommand::run() {
             libdnf::cli::output::print_package_info_table(package);
             std::cout << '\n';
         }
+    } else if (!pkg_attr_option->get_value().empty()) {
+        libdnf::cli::output::print_pkg_attr_uniq_sorted(stdout, result_pset, pkg_attr_option->get_value());
     } else {
-        for (auto package : result_pset) {
-            std::cout << package.get_full_nevra() << '\n';
-        }
+        libdnf::cli::output::print_pkg_set_with_format(stdout, result_pset, query_format_option->get_value());
     }
 }
 

dnf5/commands/repoquery/repoquery.hpp

@@ -48,7 +48,6 @@ class RepoqueryCommand : public Command {
     libdnf::OptionBool * available_option{nullptr};
     libdnf::OptionBool * installed_option{nullptr};
     libdnf::OptionBool * info_option{nullptr};
-    libdnf::OptionBool * nevra_option{nullptr};
     std::vector<std::string> pkg_specs;
     std::vector<libdnf::rpm::Package> cmdline_packages;
 
@@ -65,6 +64,9 @@ class RepoqueryCommand : public Command {
     std::unique_ptr<libdnf::cli::session::BoolOption> exactdeps{nullptr};
     std::unique_ptr<libdnf::cli::session::BoolOption> duplicates{nullptr};
 
+    libdnf::OptionString * query_format_option{nullptr};
+    libdnf::OptionEnum<std::string> * pkg_attr_option{nullptr};
+
     std::unique_ptr<AdvisoryOption> advisory_name{nullptr};
     std::unique_ptr<SecurityOption> advisory_security{nullptr};
     std::unique_ptr<BugfixOption> advisory_bugfix{nullptr};

include/libdnf-cli/output/repoquery.hpp

@@ -21,11 +21,14 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #ifndef LIBDNF_CLI_OUTPUT_REPOQUERY_HPP
 #define LIBDNF_CLI_OUTPUT_REPOQUERY_HPP
 
+#include "libdnf/rpm/package_set.hpp"
+
 #include <libsmartcols/libsmartcols.h>
 
 namespace libdnf::cli::output {
 
-static void add_line_into_package_info_table(struct libscols_table * table, const char * key, const char * value) {
+[[maybe_unused]] static void add_line_into_package_info_table(
+    struct libscols_table * table, const char * key, const char * value) {
     struct libscols_line * ln = scols_table_new_line(table, nullptr);
     scols_line_set_data(ln, 0, key);
     scols_line_set_data(ln, 1, value);
@@ -68,6 +71,11 @@ static void print_package_info_table(Package & package) {
     scols_unref_table(table);
 }
 
+void print_pkg_set_with_format(
+    std::FILE * target, const libdnf::rpm::PackageSet & pkgs, const std::string & queryformat);
+
+void print_pkg_attr_uniq_sorted(
+    std::FILE * target, const libdnf::rpm::PackageSet & pkgs, const std::string & getter_name);
 
 }  // namespace libdnf::cli::output