Revert "status.py: Group queues by name"

This reverts commit 2669fcfb2440b9bd651e6fd9cc834936194de3a5.

This is undesirable, it confounds the activity of fetching
sources and the activity of pulling artifacts into a single
activity, lets keep these activities distinctly separate.

1 files changed, 4 insertions, 12 deletions

diff --git a/buildstream/_frontend/status.py b/buildstream/_frontend/status.py
index daf719c93..7a176369f 100644
--- a/buildstream/_frontend/status.py
+++ b/buildstream/_frontend/status.py
@@ -20,7 +20,6 @@
 import datetime
 import click
 from blessings import Terminal
-from collections import OrderedDict
 
 # Import a widget internal for formatting time codes
 from .widget import TimeCode
@@ -277,20 +276,13 @@ class StatusHeader():
             self.content_profile.fmt(total) + \
             self.format_profile.fmt("]")
 
-        # Group queues by name
-        queue_status = OrderedDict()
-        for queue in self.scheduler.queues:
-            if queue.complete_name not in queue_status:
-                queue_status[queue.complete_name] = 0
-            queue_status[queue.complete_name] += len(queue.processed_elements)
-
         # Format and calculate size for each queue progress
-        for queue_name, processed_elements in queue_status.items():
-            processed = str(processed_elements)
-            size += len(processed) + len(queue_name) + 4
+        for queue in self.scheduler.queues:
+            processed = str(len(queue.processed_elements))
+            size += len(processed) + len(queue.complete_name) + 4
             text += ' ' + \
                 self.format_profile.fmt("[") + \
-                self.content_profile.fmt(queue_name) + \
+                self.content_profile.fmt(queue.complete_name) + \
                 self.format_profile.fmt(":") + \
                 self.content_profile.fmt(processed) + \
                 self.format_profile.fmt("]")