Show cleaned space bytes for dnf clean

resolves: #817

Author: alimirjamali

dnf5/commands/clean/clean.cpp

@@ -24,6 +24,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <errno.h>
 #include <libdnf5-cli/argument_parser.hpp>
+#include <libdnf5-cli/utils/units.hpp>
 #include <libdnf5/repo/repo_cache.hpp>
 #include <libdnf5/utils/bgettext/bgettext-lib.h>
 #include <libdnf5/utils/bgettext/bgettext-mark-domain.h>
@@ -180,10 +181,14 @@ void CleanCommand::run() {
             libdnf5::utils::sformat(_("Cannot iterate cache directory \"{}\": {}"), cachedir.string(), ec.message()));
     }
 
+    const auto [bytes_removed_value, bytes_removed_unit] =
+        libdnf5::cli::utils::units::to_size(static_cast<int64_t>(statistics.get_bytes_removed()));
     std::cout << fmt::format(
-                     "Removed {} files, {} directories. {} errors occurred.",
+                     "Removed {} files, {} directories (total of {:.0f} {:s}). {} errors occurred.",
                      statistics.get_files_removed(),
                      statistics.get_dirs_removed(),
+                     bytes_removed_value,
+                     bytes_removed_unit,
                      statistics.get_errors())
               << std::endl;
 }

include/libdnf5/repo/repo_cache.hpp

@@ -45,6 +45,7 @@ struct LIBDNF_API RepoCacheRemoveStatistics {
 
     std::size_t get_files_removed();  // Number of removed files and links.
     std::size_t get_dirs_removed();   // Number of removed directorires.
+    std::size_t get_bytes_removed();  // Number of removed bytes.
     std::size_t get_errors();         // Numbes of errors.
 
     RepoCacheRemoveStatistics & operator+=(const RepoCacheRemoveStatistics & rhs) noexcept;

libdnf5/repo/repo_cache.cpp

@@ -37,9 +37,20 @@ constexpr const char * CACHE_ATTRS_DIR = "attrs";
 // Removes a file or empty directory.
 // In case of an error, the error_count increases by one.
 // Returns number of removed items (0 or 1).
-std::size_t remove(const std::filesystem::path & path, std::size_t & error_count, Logger & log) noexcept {
+std::size_t remove(
+    const std::filesystem::path & path, std::size_t & error_count, std::size_t & bytes_count, Logger & log) noexcept {
     try {
+        std::error_code ec;
+        auto size = std::filesystem::file_size(path, ec);
+        if (ec.value() == 21) {
+            // `path` is a directory. Allocated space is FS depended (usually 4096 bytes). Do not risk it
+            size = 0;
+        } else if (ec) {
+            // Usually error #2 (No such file or directory)
+            size = 0;
+        }
         if (std::filesystem::remove(path)) {
+            bytes_count += size;
             return 1;
         }
     } catch (const std::filesystem::filesystem_error & ex) {
@@ -62,10 +73,12 @@ inline std::filesystem::path get_attribute_filepath(
 RepoCache::RemoveStatistics RepoCache::Impl::cache_remove_attributes(const std::filesystem::path & path, Logger & log) {
     auto status = remove_recursive(path / CACHE_ATTRS_DIR, log);
     log.debug(
-        "Attributes removal from repository cache in path \"{}\" complete. Removed {} files, {} directories. {} errors",
+        "Attributes removal from repository cache in path \"{}\" complete. "
+        "Removed {} files, {} directories (total of {} bytes). {} errors",
         path.native(),
         status.get_files_removed(),
         status.get_dirs_removed(),
+        status.get_bytes_removed(),  // Print actual bytes (instead of MiB, GiB, ...) for debug
         status.get_errors());
     return status;
 }
@@ -77,19 +90,20 @@ RepoCache::RemoveStatistics RepoCache::Impl::remove_recursive(const std::filesys
     for (const auto & dir_entry : std::filesystem::directory_iterator(dir_path, ec)) {
         if (dir_entry.is_directory() && !dir_entry.is_symlink()) {
             status += remove_recursive(dir_entry, log);
-            status.p_impl->dirs_removed += remove(dir_entry, status.p_impl->errors, log);
+            status.p_impl->dirs_removed += remove(dir_entry, status.p_impl->errors, status.p_impl->bytes_removed, log);
         } else {
-            status.p_impl->files_removed += remove(dir_entry, status.p_impl->errors, log);
+            status.p_impl->files_removed += remove(dir_entry, status.p_impl->errors, status.p_impl->bytes_removed, log);
         }
     }
-    status.p_impl->dirs_removed += remove(dir_path, status.p_impl->errors, log);
+    status.p_impl->dirs_removed += remove(dir_path, status.p_impl->errors, status.p_impl->bytes_removed, log);
     return status;
 }
 
 
 RepoCacheRemoveStatistics & RepoCacheRemoveStatistics::operator+=(const RepoCacheRemoveStatistics & rhs) noexcept {
     p_impl->files_removed += rhs.p_impl->files_removed;
     p_impl->dirs_removed += rhs.p_impl->dirs_removed;
+    p_impl->bytes_removed += rhs.p_impl->bytes_removed;
     p_impl->errors += rhs.p_impl->errors;
     return *this;
 }
@@ -109,6 +123,9 @@ std::size_t RepoCacheRemoveStatistics::get_files_removed() {
 std::size_t RepoCacheRemoveStatistics::get_dirs_removed() {
     return p_impl->dirs_removed;
 }
+std::size_t RepoCacheRemoveStatistics::get_bytes_removed() {
+    return p_impl->bytes_removed;
+}
 std::size_t RepoCacheRemoveStatistics::get_errors() {
     return p_impl->errors;
 }
@@ -133,13 +150,17 @@ RepoCache::RemoveStatistics RepoCache::remove_metadata() {
     auto & log = *p_impl->base->get_logger();
     auto status = p_impl->remove_recursive(p_impl->cache_dir / CACHE_METADATA_DIR, log);
 
-    status.p_impl->files_removed += remove(p_impl->cache_dir / CACHE_MIRRORLIST_FILE, status.p_impl->errors, log);
-    status.p_impl->files_removed += remove(p_impl->cache_dir / CACHE_METALINK_FILE, status.p_impl->errors, log);
+    status.p_impl->files_removed +=
+        remove(p_impl->cache_dir / CACHE_MIRRORLIST_FILE, status.p_impl->errors, status.p_impl->bytes_removed, log);
+    status.p_impl->files_removed +=
+        remove(p_impl->cache_dir / CACHE_METALINK_FILE, status.p_impl->errors, status.p_impl->bytes_removed, log);
     log.debug(
-        "Metadata removal from repository cache in path \"{}\" complete. Removed {} files, {} directories. {} errors",
+        "Metadata removal from repository cache in path \"{}\" complete. "
+        "Removed {} files, {} directories (total of {} bytes). {} errors",
         p_impl->cache_dir.native(),
         status.get_files_removed(),
         status.get_dirs_removed(),
+        status.get_bytes_removed(),
         status.get_errors());
     return status;
 }
@@ -149,10 +170,12 @@ RepoCache::RemoveStatistics RepoCache::remove_packages() {
     auto & log = *p_impl->base->get_logger();
     auto status = p_impl->remove_recursive(p_impl->cache_dir / CACHE_PACKAGES_DIR, log);
     log.debug(
-        "Packages removal from repository cache in path \"{}\" complete. Removed {} files, {} directories. {} errors",
+        "Packages removal from repository cache in path \"{}\" complete. "
+        "Removed {} files, {} directories (total of {} bytes). {} errors",
         p_impl->cache_dir.native(),
         status.get_files_removed(),
         status.get_dirs_removed(),
+        status.get_bytes_removed(),
         status.get_errors());
     return status;
 }
@@ -162,10 +185,12 @@ RepoCache::RemoveStatistics RepoCache::remove_solv_files() {
     auto & log = *p_impl->base->get_logger();
     auto status = p_impl->remove_recursive(p_impl->cache_dir / CACHE_SOLV_FILES_DIR, log);
     log.debug(
-        "Solv files removal from repository cache in path \"{}\" complete. Removed {} files, {} directories. {} errors",
+        "Solv files removal from repository cache in path \"{}\" complete. "
+        "Removed {} files, {} directories (total of {} bytes). {} errors",
         p_impl->cache_dir.native(),
         status.get_files_removed(),
         status.get_dirs_removed(),
+        status.get_bytes_removed(),
         status.get_errors());
     return status;
 }

libdnf5/repo/repo_cache_private.hpp

@@ -46,6 +46,7 @@ class RepoCacheRemoveStatistics::Impl {
 
     std::size_t files_removed;  // Number of removed files and links.
     std::size_t dirs_removed;   // Number of removed directorires.
+    std::size_t bytes_removed;  // Number of removed bytes.
     std::size_t errors;         // Numbes of errors.
 };