vmupdate: print fetching info

Author: piotrbartman

vmupdate/agent/source/apt/apt_api.py

@@ -108,6 +108,7 @@ class FetchProgress(apt.progress.base.AcquireProgress, Progress):
     def __init__(self, weight: int, log, refresh: bool = False):
         Progress.__init__(self, weight, log)
         self.action = "refresh" if refresh else "fetch"
+        self.fetching_notified = False
 
     def fail(self, item):
         """
@@ -126,13 +127,19 @@ def pulse(self, _owner):
         This function returns a boolean value indicating whether the
         acquisition should be continued (True) or cancelled (False).
         """
+        if self.action == "fetch" and not self.fetching_notified:
+            print(f"Fetching {self.total_items} packages "
+                  f"[{self._format_bytes(self.total_bytes)}]",
+                  flush=True)
+            self.fetching_notified = True
         self.notify_callback(self.current_bytes / self.total_bytes * 100)
         return True
 
     def start(self):
         """Invoked when the Acquire process starts running."""
         self.log.info(f"{self.action.capitalize()} started.")
-        print(f"{self.action.capitalize()}ing packages.", flush=True)
+        if self.action == "refresh":
+            print("Refreshing available packages.", flush=True)
         super().start()
         self.notify_callback(0)
 

vmupdate/agent/source/common/progress_reporter.py

@@ -64,6 +64,16 @@ def notify_callback(self, percent):
             self._callback(_percent)
             self._last_percent = _percent
 
+    @staticmethod
+    def _format_bytes(size):
+        units = ["B", "KB", "MB", "GB", "TB", "PB"]
+        factor = 1000
+        for unit in units:
+            if size < factor:
+                return f"{size:.2f} {unit}"
+            size /= factor
+        return f"{size:.2f} {units[-1]}"
+
 
 class ProgressReporter:
     """

vmupdate/agent/source/dnf/dnf5_api.py

@@ -165,7 +165,9 @@ def progress(
         :param downloaded: Number of bytes downloaded.
         """
         if not self.fetching_notified:
-            print(f"Fetching {self.count} packages", flush=True)
+            print(f"Fetching {self.count} packages "
+                  f"[{self._format_bytes(self.bytes_to_fetch)}]",
+                  flush=True)
             self.fetching_notified = True
         self.bytes_fetched += downloaded - self.package_bytes[user_cb_data]
         if downloaded > self.package_bytes[user_cb_data]:

vmupdate/agent/source/dnf/dnf_api.py

@@ -182,8 +182,10 @@ def start(self, total_files, total_size, total_drpms=0):
 
         """
         self.log.info("Fetch started.")
-        print("Fetching packages:", flush=True)
         self.bytes_to_fetch = total_size
+        print(f"Fetching {total_files} packages "
+              f"[{self._format_bytes(self.bytes_to_fetch)}]",
+              flush=True)
         self.package_bytes = {}
         self.notify_callback(0)