From 1461a37489448bf574e614757d40dcfe53fd65c6 Mon Sep 17 00:00:00 2001 From: Derick Diaz Date: Fri, 15 Dec 2023 22:19:10 -0600 Subject: [PATCH] Added url option --- dnf5/commands/download/download.cpp | 41 ++++++++++++++++++++++------- dnf5/commands/download/download.hpp | 1 + 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dnf5/commands/download/download.cpp b/dnf5/commands/download/download.cpp index 7518c6817..ced34949f 100644 --- a/dnf5/commands/download/download.cpp +++ b/dnf5/commands/download/download.cpp @@ -64,6 +64,9 @@ void DownloadCommand::set_argument_parser() { alldeps_option = dynamic_cast( parser.add_init_value(std::unique_ptr(new libdnf5::OptionBool(false)))); + url_option = dynamic_cast( + parser.add_init_value(std::unique_ptr(new libdnf5::OptionBool(false)))); + auto resolve = parser.add_new_named_arg("resolve"); resolve->set_long_name("resolve"); resolve->set_description("Resolve and download needed dependencies"); @@ -77,10 +80,17 @@ void DownloadCommand::set_argument_parser() { alldeps->set_const_value("true"); alldeps->link_value(alldeps_option); + auto url = parser.add_new_named_arg("url"); + url->set_long_name("url"); + url->set_description("Print the list of urls where the rpms can be downloaded instead of downloading"); + url->set_const_value("true"); + url->link_value(url_option); + cmd.register_named_arg(alldeps); create_destdir_option(*this); cmd.register_named_arg(resolve); cmd.register_positional_arg(keys); + cmd.register_named_arg(url); } void DownloadCommand::configure() { @@ -146,20 +156,31 @@ void DownloadCommand::run() { } } - if (!download_pkgs.empty()) { - libdnf5::repo::PackageDownloader downloader(ctx.base); - - // for download command, we don't want to mark the packages for removal - downloader.force_keep_packages(true); + if (download_pkgs.empty()) { + return; + } - for (auto & [nevra, pkg] : download_pkgs) { - downloader.add(pkg); + if (url_option->get_value()) { + for (auto & [nerva, pkg] : download_pkgs) { + auto urls = pkg.get_remote_locations(); + libdnf_assert(!urls.empty(), "Failed to get mirror for package: \"{}\"", pkg.get_name()); + std::cout << urls[0] << std::endl; } + return; + } + libdnf5::repo::PackageDownloader downloader(ctx.base); + + // for download command, we don't want to mark the packages for removal + downloader.force_keep_packages(true); - std::cout << "Downloading Packages:" << std::endl; - downloader.download(); - std::cout << std::endl; + for (auto & [nevra, pkg] : download_pkgs) { + downloader.add(pkg); } + + std::cout << "Downloading Packages:" << std::endl; + downloader.download(); + std::cout << std::endl; } + } // namespace dnf5 diff --git a/dnf5/commands/download/download.hpp b/dnf5/commands/download/download.hpp index 32eb247ee..be9805f80 100644 --- a/dnf5/commands/download/download.hpp +++ b/dnf5/commands/download/download.hpp @@ -42,6 +42,7 @@ class DownloadCommand : public Command { private: libdnf5::OptionBool * resolve_option{nullptr}; libdnf5::OptionBool * alldeps_option{nullptr}; + libdnf5::OptionBool * url_option{nullptr}; std::vector> * patterns_to_download_options{nullptr}; };