Hide more things behind verbose flag. (#84)

Author: mrstegeman

gateway_addon/adapter.py

@@ -34,6 +34,7 @@ def __init__(self, _id, package_name, verbose=False):
         # False in its constructor.
         self.ready = True
 
+        self.verbose = verbose
         self.manager_proxy = \
             AddonManagerProxy(self.package_name, verbose=verbose)
         self.manager_proxy.add_adapter(self)
@@ -60,7 +61,8 @@ def send_error(self, message):
 
     def dump(self):
         """Dump the state of the adapter to the log."""
-        print('Adapter:', self.name, '- dump() not implemented')
+        if self.verbose:
+            print('Adapter:', self.name, '- dump() not implemented')
 
     def get_id(self):
         """
@@ -166,7 +168,8 @@ def start_pairing(self, timeout):
 
         timeout -- Timeout in seconds at which to quit pairing
         """
-        print('Adapter:', self.name, 'id', self.id, 'pairing started')
+        if self.verbose:
+            print('Adapter:', self.name, 'id', self.id, 'pairing started')
 
     def send_pairing_prompt(self, prompt, url=None, device=None):
         """
@@ -190,7 +193,8 @@ def send_unpairing_prompt(self, prompt, url=None, device=None):
 
     def cancel_pairing(self):
         """Cancel the pairing process."""
-        print('Adapter:', self.name, 'id', self.id, 'pairing cancelled')
+        if self.verbose:
+            print('Adapter:', self.name, 'id', self.id, 'pairing cancelled')
 
     def remove_thing(self, device_id):
         """
@@ -200,8 +204,9 @@ def remove_thing(self, device_id):
         """
         device = self.get_device(device_id)
         if device:
-            print('Adapter:', self.name, 'id', self.id,
-                  'remove_thing(' + device.id + ')')
+            if self.verbose:
+                print('Adapter:', self.name, 'id', self.id,
+                      'remove_thing(' + device.id + ')')
 
             self.handle_device_removed(device)
 
@@ -212,13 +217,14 @@ def cancel_remove_thing(self, device_id):
         device_id -- ID of device to cancel unpairing with
         """
         device = self.get_device(device_id)
-        if device:
+        if device and self.verbose:
             print('Adapter:', self.name, 'id', self.id,
                   'cancel_remove_thing(' + device.id + ')')
 
     def unload(self):
         """Perform any necessary cleanup before adapter is shut down."""
-        print('Adapter:', self.name, 'unloaded')
+        if self.verbose:
+            print('Adapter:', self.name, 'unloaded')
 
     def set_pin(self, device_id, pin):
         """
@@ -229,8 +235,9 @@ def set_pin(self, device_id, pin):
         """
         device = self.get_device(device_id)
         if device:
-            print('Adapter:', self.name, 'id', self.id,
-                  'set_pin(' + device.id + ', ' + pin + ')')
+            if self.verbose:
+                print('Adapter:', self.name, 'id', self.id,
+                      'set_pin(' + device.id + ', ' + pin + ')')
         else:
             raise SetPinError('Device not found')
 
@@ -244,8 +251,9 @@ def set_credentials(self, device_id, username, password):
         """
         device = self.get_device(device_id)
         if device:
-            print('Adapter:', self.name, 'id', self.id,
-                  'set_credentials(' + device.id + ', ' + username + ', ' +
-                  password + ')')
+            if self.verbose:
+                print('Adapter:', self.name, 'id', self.id,
+                      'set_credentials(' + device.id + ', ' + username + ', ' +
+                      password + ')')
         else:
             raise SetCredentialsError('Device not found')

gateway_addon/api_handler.py

@@ -25,6 +25,7 @@ def __init__(self, package_name, verbose=False):
         """
         self.package_name = package_name
 
+        self.verbose = verbose
         self.manager_proxy = \
             AddonManagerProxy(self.package_name, verbose=verbose)
         self.manager_proxy.add_api_handler(self)
@@ -63,9 +64,13 @@ def handle_request(self, request):
 
         request -- APIRequest object
         """
-        print('New API request for {}: {}'.format(self.package_name, request))
+        if self.verbose:
+            print('New API request for {}: {}'
+                  .format(self.package_name, request))
+
         return APIResponse(status=404)
 
     def unload(self):
         """Perform any necessary cleanup before handler is shut down."""
-        print('API Handler:', self.package_name, 'unloaded')
+        if self.verbose:
+            print('API Handler:', self.package_name, 'unloaded')

gateway_addon/notifier.py

@@ -32,6 +32,7 @@ def __init__(self, _id, package_name, verbose=False):
         # False in its constructor.
         self.ready = True
 
+        self.verbose = verbose
         self.manager_proxy = \
             AddonManagerProxy(self.package_name, verbose=verbose)
         self.manager_proxy.add_notifier(self)
@@ -58,7 +59,8 @@ def send_error(self, message):
 
     def dump(self):
         """Dump the state of the notifier to the log."""
-        print('Notifier:', self.name, '- dump() not implemented')
+        if self.verbose:
+            print('Notifier:', self.name, '- dump() not implemented')
 
     def get_id(self):
         """
@@ -144,4 +146,5 @@ def handle_outlet_removed(self, outlet):
 
     def unload(self):
         """Perform any necessary cleanup before notifier is shut down."""
-        print('Notifier:', self.name, 'unloaded')
+        if self.verbose:
+            print('Notifier:', self.name, 'unloaded')

gateway_addon/outlet.py

@@ -56,5 +56,6 @@ def notify(self, title, message, level):
         message -- message of notification
         level -- alert level
         """
-        print('Outlet: {} notify("{}", "{}", {})'
-              .format(self.name, title, message, level))
+        if self.notifier.verbose:
+            print('Outlet: {} notify("{}", "{}", {})'
+                  .format(self.name, title, message, level))