Show the user progress when loading the cache

Signed-off-by: Bob Foerster <robert@erafx.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>

1 files changed, 24 insertions, 8 deletions

diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py
index e5351fee7..f3abe8c99 100644
--- a/lib/bb/ui/knotty.py
+++ b/lib/bb/ui/knotty.py
@@ -29,12 +29,14 @@ import bb.msg
 from bb.ui import uihelper
 
 logger = logging.getLogger("BitBake")
-widgets = [progressbar.Percentage(), ' ', progressbar.Bar(), ' ',
-           progressbar.ETA()]
+interactive = sys.stdout.isatty()
 
 class BBProgress(progressbar.ProgressBar):
     def __init__(self, msg, maxval):
         self.msg = msg
+        widgets = [progressbar.Percentage(), ' ', progressbar.Bar(), ' ',
+           progressbar.ETA()]
+
         progressbar.ProgressBar.__init__(self, maxval, [self.msg + ": "] + widgets)
 
 class NonInteractiveProgress(object):
@@ -56,6 +58,12 @@ class NonInteractiveProgress(object):
         self.fobj.write("done.\n")
         self.fobj.flush()
 
+def new_progress(msg, maxval):
+    if interactive:
+        return BBProgress(msg, maxval)
+    else:
+        return NonInteractiveProgress(msg, maxval)
+
 def main(server, eventHandler):
 
     # Get values of variables which control our output
@@ -91,8 +99,9 @@ def main(server, eventHandler):
         print("XMLRPC Fault getting commandline:\n %s" % x)
         return 1
 
+
     parseprogress = None
-    interactive = os.isatty(sys.stdout.fileno())
+    cacheprogress = None
     shutdown = 0
     return_value = 0
     while True:
@@ -144,11 +153,7 @@ def main(server, eventHandler):
                 logger.info(event._message)
                 continue
             if isinstance(event, bb.event.ParseStarted):
-                if interactive:
-                    progress = BBProgress
-                else:
-                    progress = NonInteractiveProgress
-                parseprogress = progress("Parsing recipes", event.total).start()
+                parseprogress = new_progress("Parsing recipes", event.total).start()
                 continue
             if isinstance(event, bb.event.ParseProgress):
                 parseprogress.update(event.current)
@@ -159,6 +164,17 @@ def main(server, eventHandler):
                     % ( event.total, event.cached, event.parsed, event.virtuals, event.skipped, event.masked, event.errors)))
                 continue
 
+            if isinstance(event, bb.event.CacheLoadStarted):
+                cacheprogress = new_progress("Loading cache", event.total).start()
+                continue
+            if isinstance(event, bb.event.CacheLoadProgress):
+                cacheprogress.update(event.current)
+                continue
+            if isinstance(event, bb.event.CacheLoadCompleted):
+                cacheprogress.finish()
+                print("Loaded %d entries from dependency cache." % event.num_entries)
+                continue
+
             if isinstance(event, bb.command.CommandCompleted):
                 break
             if isinstance(event, bb.command.CommandFailed):