Change upload_image api call to accept multiple images

Author: cpacia

api/restapi.py

@@ -577,12 +577,14 @@ def respond(success):
     @POST('^/api/v1/upload_image')
     def upload_image(self, request):
         try:
-            image = request.args["image"][0]
-            hash_value = digest(image).encode("hex")
-            with open(DATA_FOLDER + "store/media/" + hash_value, 'w') as outfile:
-                outfile.write(image)
-            self.db.HashMap().insert(digest(image), DATA_FOLDER + "store/media/" + hash_value)
-            request.write(hash_value)
+            ret = []
+            for image in request.args["image"]:
+                hash_value = digest(image).encode("hex")
+                with open(DATA_FOLDER + "store/media/" + hash_value, 'w') as outfile:
+                    outfile.write(image)
+                self.db.HashMap().insert(digest(image), DATA_FOLDER + "store/media/" + hash_value)
+                ret.append(hash_value)
+            request.write(json.dumps({"success": True, "image_hashes": ret}, indent=4))
             request.finish()
             return server.NOT_DONE_YET
         except Exception, e:

market/contracts.py

@@ -381,7 +381,7 @@ def add_order_confirmation(self,
         with open(file_path, 'w') as outfile:
             outfile.write(json.dumps(self.contract, indent=4))
 
-    def accept_order_confirmation(self, ws, confirmation_json=False):
+    def accept_order_confirmation(self, ws, confirmation_json=None):
         """
         Validate the order confirmation sent over from the seller and update our node accordingly.
         """

openbazaard.py

@@ -98,7 +98,10 @@ def on_bootstrap_complete(resp):
     # blockchain
     def height_fetched(ec, height):
         print "Libbitcoin server online"
-        timeout.cancel()
+        try:
+            timeout.cancel()
+        except Exception:
+            pass
 
     def timeout(client):
         print "Libbitcoin server offline"