From 701eeab9c5e86ea7528ff56651e86eca271bd764 Mon Sep 17 00:00:00 2001
From: steven-omaha <35634100+steven-omaha@users.noreply.github.com>
Date: Wed, 11 Jan 2023 13:50:39 +0100
Subject: [PATCH] refactor

---
 src/backend/todo_per_backend.rs | 10 +++++++---
 src/core.rs                     | 25 ++++---------------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/backend/todo_per_backend.rs b/src/backend/todo_per_backend.rs
index af0e0d9..5e4e1b3 100644
--- a/src/backend/todo_per_backend.rs
+++ b/src/backend/todo_per_backend.rs
@@ -34,14 +34,18 @@ impl ToDoPerBackend {
         self.0.iter().all(|(_, packages)| packages.is_empty())
     }
 
-    pub(crate) fn show(&self) {
+    pub(crate) fn show(&self, keyword: Option<&str>) {
         for (backend, packages) in self.iter() {
             if packages.is_empty() {
                 continue;
             }
-            println!("{}", backend.get_section());
+
+            if let Some(kw) = keyword {
+                println!("Would {kw} the following packages:");
+            }
+            println!("[{}]", backend.get_section());
             for package in packages {
-                println!("  {package}");
+                println!("{package}");
             }
         }
     }
diff --git a/src/core.rs b/src/core.rs
index 5350e1c..8a93dac 100644
--- a/src/core.rs
+++ b/src/core.rs
@@ -65,7 +65,7 @@ impl Pacdef {
             return;
         }
 
-        to_install.show();
+        to_install.show("install".into());
 
         if !get_user_confirmation() {
             return;
@@ -110,15 +110,7 @@ impl Pacdef {
     fn show_unmanaged_packages(self) {
         let unmanaged_per_backend = &self.get_unmanaged_packages();
 
-        for (backend, packages) in unmanaged_per_backend.iter() {
-            if packages.is_empty() {
-                continue;
-            }
-            println!("{}", backend.get_section());
-            for package in packages {
-                println!("  {package}");
-            }
-        }
+        unmanaged_per_backend.show(None);
     }
 
     fn get_unmanaged_packages(self) -> ToDoPerBackend {
@@ -145,22 +137,13 @@ impl Pacdef {
 
     fn clean_packages(self) {
         let to_remove = self.get_unmanaged_packages();
+
         if to_remove.is_empty() {
             println!("nothing to do");
             return;
         }
 
-        println!("Would remove the following packages and their dependencies:");
-        for (backend, packages) in to_remove.iter() {
-            if packages.is_empty() {
-                continue;
-            }
-
-            println!("  {}", backend.get_section());
-            for package in packages {
-                println!("    {package}");
-            }
-        }
+        to_remove.show("remove".into());
 
         if !get_user_confirmation() {
             return;