Split up the ParseProgress event

We now have ParseStarted, ParseProgress, and ParseCompleted.  I think this
clarifies matters, and avoids sending all our statistics with every parse
progress event.

Signed-off-by: Chris Larson <chris_larson@mentor.com>

2 files changed, 28 insertions, 24 deletions

diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py
index a2841bcd4..7412b39e8 100644
--- a/lib/bb/ui/knotty.py
+++ b/lib/bb/ui/knotty.py
@@ -78,6 +78,7 @@ def init(server, eventHandler):
         return 1
 
     pbar = None
+    interactive = os.isatty(sys.stdout.fileno())
     shutdown = 0
     return_value = 0
     while True:
@@ -129,23 +130,26 @@ def init(server, eventHandler):
             if isinstance(event, bb.build.TaskBase):
                 logger.info(event._message)
                 continue
+            if isinstance(event, bb.event.ParseStarted):
+                if interactive:
+                    pbar = progressbar.ProgressBar(widgets=widgets,
+                                                   maxval=event.total).start()
+                else:
+                    sys.stdout.write("Parsing recipes...")
+                    sys.stdout.flush()
+                continue
             if isinstance(event, bb.event.ParseProgress):
-                current, total = event.sofar, event.total
-                if os.isatty(sys.stdout.fileno()):
-                    if not pbar:
-                        pbar = progressbar.ProgressBar(widgets=widgets,
-                                                       maxval=total).start()
-                    pbar.update(current)
+                if interactive:
+                    pbar.update(event.current)
+                continue
+            if isinstance(event, bb.event.ParseCompleted):
+                if interactive:
+                    pbar.update(event.total)
                 else:
-                    if current == 1:
-                        sys.stdout.write("Parsing .bb files, please wait...")
-                        sys.stdout.flush()
-                    if current == total:
-                        sys.stdout.write("done.")
-                        sys.stdout.flush()
-                if current == total:
-                    print(("\nParsing of %d .bb files complete (%d cached, %d parsed). %d targets, %d skipped, %d masked, %d errors."
-                        % ( event.total, event.cached, event.parsed, event.virtuals, event.skipped, event.masked, event.errors)))
+                    sys.stdout.write("done.\n")
+                    sys.stdout.flush()
+                print(("\nParsing of %d .bb files complete (%d cached, %d parsed). %d targets, %d skipped, %d masked, %d errors."
+                    % ( event.total, event.cached, event.parsed, event.virtuals, event.skipped, event.masked, event.errors)))
                 continue
 
             if isinstance(event, bb.command.CookerCommandCompleted):
diff --git a/lib/bb/ui/uievent.py b/lib/bb/ui/uievent.py
index f1e4d791e..b404805d8 100644
--- a/lib/bb/ui/uievent.py
+++ b/lib/bb/ui/uievent.py
@@ -37,8 +37,8 @@ class BBUIEventQueue:
         self.BBServer = BBServer
 
         self.t = threading.Thread()
-        self.t.setDaemon(True)

-        self.t.run = self.startCallbackHandler

+        self.t.setDaemon(True)
+        self.t.run = self.startCallbackHandler
         self.t.start()
 
     def getEvent(self):
@@ -70,7 +70,7 @@ class BBUIEventQueue:
     def startCallbackHandler(self):
 
         server = UIXMLRPCServer()
-        self.host, self.port = server.socket.getsockname()

+        self.host, self.port = server.socket.getsockname()
 
         server.register_function( self.system_quit, "event.quit" )
         server.register_function( self.queue_event, "event.send" )
@@ -83,7 +83,7 @@ class BBUIEventQueue:
             server.handle_request()
         server.server_close()
 
-    def system_quit( self ):

+    def system_quit( self ):
         """
         Shut down the callback thread
         """
@@ -95,11 +95,11 @@ class BBUIEventQueue:
 
 class UIXMLRPCServer (SimpleXMLRPCServer):
 
-    def __init__( self, interface = ("localhost", 0) ):

+    def __init__( self, interface = ("localhost", 0) ):
         self.quit = False
-        SimpleXMLRPCServer.__init__( self,

-                                    interface,

-                                    requestHandler=SimpleXMLRPCRequestHandler,

+        SimpleXMLRPCServer.__init__( self,
+                                    interface,
+                                    requestHandler=SimpleXMLRPCRequestHandler,
                                     logRequests=False, allow_none=True)
 
     def get_request(self):
@@ -121,4 +121,4 @@ class UIXMLRPCServer (SimpleXMLRPCServer):
         if request is None:
             return
         SimpleXMLRPCServer.process_request(self, request, client_address)
-

+