From f68ec5f2d0831702bc36a6fbb92f185e509b5a0f Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sat, 21 Oct 2017 07:35:23 +1300
Subject: [PATCH] Error argument as optional, for AsyncHTTPClient compatibility

---
 mopidy_iris/core.py     | 28 ++++++++++++++--------------
 mopidy_iris/handlers.py | 15 +++++----------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/mopidy_iris/core.py b/mopidy_iris/core.py
index fce2b2a8..96440d28 100755
--- a/mopidy_iris/core.py
+++ b/mopidy_iris/core.py
@@ -108,7 +108,7 @@ class IrisCore(object):
             'message': 'Broadcast to '+str(len(self.connections))+' connections'
         }
         if (callback):
-            callback(response, False)
+            callback(response)
         else:
             return response  
     
@@ -131,7 +131,7 @@ class IrisCore(object):
             'connections': connections
         }
         if (callback):
-            callback(response, False)
+            callback(response)
         else:
             return response  
 
@@ -195,7 +195,7 @@ class IrisCore(object):
                 'username': data['username']
             }
             if (callback):
-                callback(response, False)
+                callback(response)
             else:
                 return response  
 
@@ -222,7 +222,7 @@ class IrisCore(object):
                 'message': 'Sent message to '+data['connection_id']
             }
             if (callback):
-                callback(response, False)
+                callback(response)
             else:
                 return response
 
@@ -268,7 +268,7 @@ class IrisCore(object):
         }
 
         if (callback):
-            callback(response, False)
+            callback(response)
         else:
             return response
 
@@ -300,7 +300,7 @@ class IrisCore(object):
             }
         }
         if (callback):
-            callback(response, False)
+            callback(response)
         else:
             return response
 
@@ -313,7 +313,7 @@ class IrisCore(object):
                 'message': "Upgrade started"
             }
             if (callback):
-                callback(response, False)
+                callback(response)
             else:
                 return response
 
@@ -346,7 +346,7 @@ class IrisCore(object):
             'radio': self.radio
         }
         if (callback):
-            callback(response, False)
+            callback(response)
         else:
             return response
 
@@ -438,7 +438,7 @@ class IrisCore(object):
             'message': 'Stopped radio'
         }
         if (callback):
-            callback(response, False)
+            callback(response)
         else:
             return response
 
@@ -518,7 +518,7 @@ class IrisCore(object):
             'queue_metadata': self.queue_metadata
         }
         if (callback):
-            callback(response, False)
+            callback(response)
         else:
             return response
 
@@ -545,7 +545,7 @@ class IrisCore(object):
             'message': 'Added queue metadata'
         }
         if (callback):
-            callback(response, False)
+            callback(response)
         else:
             return response
 
@@ -572,7 +572,7 @@ class IrisCore(object):
             'message': 'Cleaned queue metadata'
         }
         if (callback):
-            callback(response, False)
+            callback(response)
         else:
             return response
 
@@ -592,7 +592,7 @@ class IrisCore(object):
         }
 
         if (callback):
-            callback(response, False)
+            callback(response)
         else:
             return response
 
@@ -627,7 +627,7 @@ class IrisCore(object):
             }
 
             if (callback):
-                callback(response, False)
+                callback(response)
             else:
                 return response
 
diff --git a/mopidy_iris/handlers.py b/mopidy_iris/handlers.py
index 2ad2d1db..8584b436 100755
--- a/mopidy_iris/handlers.py
+++ b/mopidy_iris/handlers.py
@@ -85,7 +85,7 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
 
             # make sure the method exists
             if hasattr(mem.iris, message['method']):
-                getattr(mem.iris, message['method'])(data=data, callback=lambda response, error: self.handle_response(response=response, error=error, request_id=request_id))
+                getattr(mem.iris, message['method'])(data=data, callback=lambda response, error=False: self.handle_response(response=response, error=error, request_id=request_id))
 
             else:
                 self.handle_response(error={'message': 'Method "'+message['method']+'" does not exist'})
@@ -120,9 +120,8 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
         # when our request calls subsequent external requests (eg Spotify, Genius)
         elif isinstance(response, tornado.httpclient.HTTPResponse):
             data = {
-                'status': 1,
-                'response_code': response.code,
-                'response_reason': response.reason,
+                'status': response.code,
+                'message': response.reason,
                 'response': response.body,
                 'request_id': request_id
             }
@@ -162,7 +161,7 @@ class HttpHandler(tornado.web.RequestHandler):
 
         # make sure the method exists
         if hasattr(mem.iris, slug):
-            getattr(mem.iris, slug)(request=self.request, callback=lambda response, error: self.handle_response(response=response, error=error))
+            getattr(mem.iris, slug)(request=self.request, callback=lambda response, error=False: self.handle_response(response=response, error=error))
 
         else:
             self.handle_response(error={'message': "Method "+slug+" does not exist"})
@@ -175,7 +174,7 @@ class HttpHandler(tornado.web.RequestHandler):
         if hasattr(mem.iris, slug):
             try:
                 data = json.loads(self.request.body.decode('utf-8'))
-                getattr(mem.iris, slug)(data=data, request=self.request, callback=lambda response, error: self.handle_response(response=response, error=error))
+                getattr(mem.iris, slug)(data=data, request=self.request, callback=lambda response, error=False: self.handle_response(response=response, error=error))
 
             except urllib2.HTTPError as e:
                 self.handle_response(error={'message': "Invalid JSON payload"})
@@ -194,10 +193,6 @@ class HttpHandler(tornado.web.RequestHandler):
         error = kwargs.get('error', None)
         data = {}
 
-        print response
-        print error
-        print "------------"
-
         if error:
             data = error
             data['status'] = 0