Move "[DEBUG]" behavior into terminal notifier

Author: theotherjimmy

tools/notifier/__init__.py

@@ -69,7 +69,6 @@ def debug(self, message):
         """
         if isinstance(message, list):
             message = ' '.join(message)
-        message = "[DEBUG] " + message
         self.notify({'type': 'debug', 'message': message})
 
     def cc_info(self, info=None):
@@ -78,7 +77,12 @@ def cc_info(self, info=None):
             self.notify(info)
 
     def cc_verbose(self, message, file=""):
-        self.debug(message)
+        self.notify({
+            'type': 'info',
+            'severity': 'verbose',
+            'file': file,
+            'message': message
+        })
 
     def progress(self, action, file, percent=None):
         """

tools/notifier/term.py

@@ -107,9 +107,10 @@ def print_notify(self, event):
     def print_notify_verbose(self, event):
         """ Default command line notification with more verbose mode
         """
-        if event['type'] in ['info', 'debug']:
+        if event['type'] == 'info':
             return event['message']
-
+        elif event['type'] == 'debug':
+            return "[DEBUG] {message}".format(**event)
         elif event['type'] == 'cc':
             event['severity'] = event['severity'].title()
             event['file'] = basename(event['file'])