ui: Convert remaining event handlers to use isinstance

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/lib/bb/ui/crumbs/runningbuild.py b/lib/bb/ui/crumbs/runningbuild.py
index 34f65d239600af3bf7838097ec1063298a818242..401559255b25e6d0cc73481fd43be1b9174c792b 100644 (file)
--- a/lib/bb/ui/crumbs/runningbuild.py
+++ b/lib/bb/ui/crumbs/runningbuild.py
@@ -61,36 +61,36 @@ class RunningBuild (gobject.GObject):
         # If we have a pid attached to this message/event try and get the
         # (package, task) pair for it. If we get that then get the parent iter
         # for the message.
-        if event[1].has_key ('pid'):
-            pid = event[1]['pid']
+        if hassattr(event, 'pid'):
+            pid = event.pid
             if self.pids_to_task.has_key(pid):
                 (package, task) = self.pids_to_task[pid]
                 parent = self.tasks_to_iter[(package, task)]
 
-        if event[0].startswith('bb.msg.Msg'):
+        if isinstance(event, bb.msg.Msg):
             # Set a pretty icon for the message based on it's type.
-            if (event[0].startswith ('bb.msg.MsgWarn')):
+            if isinstance(event, bb.msg.MsgWarn):
                 icon = "dialog-warning"
-            elif (event[0].startswith ('bb.msg.MsgErr')):
+            elif isinstance(event, bb.msg.MsgErr):
                 icon = "dialog-error"
             else:
                 icon = None
 
             # Ignore the "Running task i of n .." messages
-            if (event[1]['_message'].startswith ("Running task")):
+            if (event._message.startswith ("Running task")):
                 return
 
             # Add the message to the tree either at the top level if parent is
             # None otherwise as a descendent of a task.
             self.model.append (parent, 
-                               (event[0].split()[-1], # e.g. MsgWarn, MsgError
+                               (event.__name__.split()[-1], # e.g. MsgWarn, MsgError
                                 package, 
                                 task,
-                                event[1]['_message'],
+                                event._message,
                                 icon, 
                                 False))
-        elif event[0].startswith('bb.build.TaskStarted'):
-            (package, task) = (event[1]['_package'], event[1]['_task'])
+        elif isinstance(event, bb.build.TaskStarted):
+            (package, task) = (event._package, event._task)
 
             # Save out this PID.
             self.pids_to_task[pid] = (package,task)
@@ -128,9 +128,9 @@ class RunningBuild (gobject.GObject):
             # Mark this task as active.
             self.model.set(i, self.model.COL_ICON, "gtk-execute")
 
-        elif event[0].startswith('bb.build.Task'):
+        elif isinstance(event, bb.build.Task):
 
-            if event[0].startswith('bb.build.TaskFailed'):
+            if isinstance(event, bb.build.TaskFailed):
                 # Mark the task as failed
                 i = self.tasks_to_iter[(package, task)]
                 self.model.set(i, self.model.COL_ICON, "dialog-error")
@@ -153,8 +153,8 @@ class RunningBuild (gobject.GObject):
             del self.tasks_to_iter[(package, task)]
             del self.pids_to_task[pid]
 
-        elif event[0].startswith('bb.event.BuildCompleted'):
-            failures = int (event[1]['_failures'])
+        elif isinstance(event, bb.event.BuildCompleted):
+            failures = int (event._failures)
 
             # Emit the appropriate signal depending on the number of failures
             if (failures > 1):

diff --git a/lib/bb/ui/depexp.py b/lib/bb/ui/depexp.py
index 0c559c7976d2c980a8bd7e11068373a0dcfdbcf9..cfa5b6564eeb85a66969017d4377c39379a6e059 100644 (file)
--- a/lib/bb/ui/depexp.py
+++ b/lib/bb/ui/depexp.py
@@ -229,12 +229,12 @@ def init(server, eventHandler):
 
             if event is None:
                 continue
-            if event[0].startswith('bb.event.ParseProgress'):
-                x = event[1]['sofar']
-                y = event[1]['total']
+            if isinstance(event, bb.event.ParseProgress):
+                x = event.sofar
+                y = event.total
                 if x == y:
                     print("\nParsing finished. %d cached, %d parsed, %d skipped, %d masked, %d errors." 
-                        % ( event[1]['cached'], event[1]['parsed'], event[1]['skipped'], event[1]['masked'], event[1]['errors']))
+                        % ( event.cached, event.parsed, event.skipped, event.masked, event.errors))
                     pbar.hide()
                 gtk.gdk.threads_enter()
                 pbar.progress.set_fraction(float(x)/float(y))
@@ -242,17 +242,17 @@ def init(server, eventHandler):
                 gtk.gdk.threads_leave()
                 continue
 
-            if event[0] == "bb.event.DepTreeGenerated":
+            if isinstance(event, bb.event.DepTreeGenerated):
                 gtk.gdk.threads_enter()
-                parse(event[1]['_depgraph'], dep.pkg_model, dep.depends_model)
+                parse(event._depgraph, dep.pkg_model, dep.depends_model)
                 gtk.gdk.threads_leave()
 
-            if event[0] == 'bb.command.CookerCommandCompleted':
+            if isinstance(event, bb.command.CookerCommandCompleted):
                 continue
-            if event[0] == 'bb.command.CookerCommandFailed':
-                print "Command execution failed: %s" % event[1]['error']
+            if isinstance(event, bb.command.CookerCommandFailed):
+                print "Command execution failed: %s" % event.error
                 break
-            if event[0] == 'bb.cooker.CookerExit':
+            if isinstance(event, bb.cooker.CookerExit):
                 break
 
             continue

diff --git a/lib/bb/ui/ncurses.py b/lib/bb/ui/ncurses.py
index 2cd7e8e6e71684611a8317c9273fcd6cc6aac327..14310dc1240606e15d77261f3e89f559e4ed92b6 100644 (file)
--- a/lib/bb/ui/ncurses.py
+++ b/lib/bb/ui/ncurses.py
@@ -246,29 +246,29 @@ class NCursesUI:
                     continue
                 helper.eventHandler(event)
                 #mw.appendText("%s\n" % event[0])
-                if event[0].startswith('bb.build.Task'):
-                    mw.appendText("NOTE: %s\n" % event[1]['_message'])
-                if event[0].startswith('bb.msg.MsgDebug'):
-                    mw.appendText('DEBUG: ' + event[1]['_message'] + '\n')
-                if event[0].startswith('bb.msg.MsgNote'):
-                    mw.appendText('NOTE: ' + event[1]['_message'] + '\n')
-                if event[0].startswith('bb.msg.MsgWarn'):
-                    mw.appendText('WARNING: ' + event[1]['_message'] + '\n')
-                if event[0].startswith('bb.msg.MsgError'):
-                    mw.appendText('ERROR: ' + event[1]['_message'] + '\n')
-                if event[0].startswith('bb.msg.MsgFatal'):
-                    mw.appendText('FATAL: ' + event[1]['_message'] + '\n')
-                if event[0].startswith('bb.event.ParseProgress'):
-                    x = event[1]['sofar']
-                    y = event[1]['total']
+                if isinstance(event, bb.build.Task):
+                    mw.appendText("NOTE: %s\n" % event._message)
+                if isinstance(event, bb.msg.MsgDebug):
+                    mw.appendText('DEBUG: ' + event._message + '\n')
+                if isinstance(event, bb.msg.MsgNote):
+                    mw.appendText('NOTE: ' + event._message + '\n')
+                if isinstance(event, bb.msg.MsgWarn):
+                    mw.appendText('WARNING: ' + event._message + '\n')
+                if isinstance(event, bb.msg.MsgError):
+                    mw.appendText('ERROR: ' + event._message + '\n')
+                if isinstance(event, bb.msg.MsgFatal):
+                    mw.appendText('FATAL: ' + event._message + '\n')
+                if isinstance(event, bb.event.ParseProgress):
+                    x = event.sofar
+                    y = event.total
                     if x == y:
                         mw.setStatus("Idle")
                         mw.appendText("Parsing finished. %d cached, %d parsed, %d skipped, %d masked." 
-                                % ( event[1]['cached'], event[1]['parsed'], event[1]['skipped'], event[1]['masked'] ))
+                                % ( event.cached, event.parsed, event.skipped, event.masked ))
                     else:
                         mw.setStatus("Parsing: %s (%04d/%04d) [%2d %%]" % ( parsespin.next(), x, y, x*100/y ) )
-#                if event[0].startswith('bb.build.TaskFailed'):
-#                    if event[1]['logfile']:
+#                if isinstance(event, bb.build.TaskFailed):
+#                    if event.logfile:
 #                        if data.getVar("BBINCLUDELOGS", d):
 #                            bb.msg.error(bb.msg.domain.Build, "log data follows (%s)" % logfile)
 #                            number_of_lines = data.getVar("BBINCLUDELOGS_LINES", d)
@@ -286,13 +286,13 @@ class NCursesUI:
 #                        else:
 #                            bb.msg.error(bb.msg.domain.Build, "see log in %s" % logfile)
 
-                if event[0] == 'bb.command.CookerCommandCompleted':
+                if isinstance(event, bb.command.CookerCommandCompleted):
                     exitflag = True
-                if event[0] == 'bb.command.CookerCommandFailed':
-                    mw.appendText("Command execution failed: %s" % event[1]['error'])
+                if isinstance(event, bb.command.CookerCommandFailed):
+                    mw.appendText("Command execution failed: %s" % event.error)
                     time.sleep(2)
                     exitflag = True
-                if event[0] == 'bb.cooker.CookerExit':
+                if isinstance(event, bb.cooker.CookerExit):
                     exitflag = True
 
                 if helper.needUpdate:

diff --git a/lib/bb/ui/uihelper.py b/lib/bb/ui/uihelper.py
index 246844c9d21431eed7f57fe05db98f44ebc6adc4..151ffc5854e06de514a8d69ed6379fd8a123adbf 100644 (file)
--- a/lib/bb/ui/uihelper.py
+++ b/lib/bb/ui/uihelper.py
@@ -24,25 +24,25 @@ class BBUIHelper:
         self.failed_tasks = {}
 
     def eventHandler(self, event):
-        if event[0].startswith('bb.build.TaskStarted'):
-            self.running_tasks["%s %s\n" % (event[1]['_package'], event[1]['_task'])] = ""
+        if isinstance(event, bb.build.TaskStarted):
+            self.running_tasks["%s %s\n" % (event._package, event._task)] = ""
             self.needUpdate = True
-        if event[0].startswith('bb.build.TaskSucceeded'):
-            del self.running_tasks["%s %s\n" % (event[1]['_package'], event[1]['_task'])]
+        if isinstance(event, bb.build.TaskSucceeded):
+            del self.running_tasks["%s %s\n" % (event._package, event._task)]
             self.needUpdate = True
-        if event[0].startswith('bb.build.TaskFailed'):
-            del self.running_tasks["%s %s\n" % (event[1]['_package'], event[1]['_task'])]
-            self.failed_tasks["%s %s\n" % (event[1]['_package'], event[1]['_task'])] = ""
+        if isinstance(event, bb.build.TaskFailed):
+            del self.running_tasks["%s %s\n" % (event._package, event._task)]
+            self.failed_tasks["%s %s\n" % (event._package, event._task)] = ""
             self.needUpdate = True
 
         # Add runqueue event handling
-        #if event[0].startswith('bb.runqueue.runQueueTaskCompleted'):
+        #if isinstance(event, bb.runqueue.runQueueTaskCompleted):
         #    a = 1
-        #if event[0].startswith('bb.runqueue.runQueueTaskStarted'):
+        #if isinstance(event, bb.runqueue.runQueueTaskStarted):
         #    a = 1
-        #if event[0].startswith('bb.runqueue.runQueueTaskFailed'):
+        #if isinstance(event, bb.runqueue.runQueueTaskFailed):
         #    a = 1
-        #if event[0].startswith('bb.runqueue.runQueueExitWait'):
+        #if isinstance(event, bb.runqueue.runQueueExitWait):
         #    a = 1
 
     def getTasks(self):