Merge branch 'saltduck-data-folder'

Author: cpacia

api/restapi.py

@@ -132,7 +132,7 @@ def _setContentDispositionAndSend(file_path, extension, content_type):
             if self.db.filemap.get_file(request.args["hash"][0]) is not None:
                 image_path = self.db.filemap.get_file(request.args["hash"][0])
             else:
-                image_path = DATA_FOLDER + "cache/" + request.args["hash"][0]
+                image_path = os.path.join(DATA_FOLDER, "cache", request.args["hash"][0])
             if not os.path.exists(image_path) and "guid" in request.args:
                 node = None
                 for connection in self.protocol.values():
@@ -726,7 +726,8 @@ def respond(success):
                 else:
                     request.write(json.dumps({"success": False, "reason": success}))
                     request.finish()
-            file_path = DATA_FOLDER + "store/contracts/in progress/" + request.args["id"][0] + ".json"
+            file_name = request.args["id"][0] + ".json"
+            file_path = os.path.join(DATA_FOLDER, "store", "contracts", "in progress", file_name)
             with open(file_path, 'r') as filename:
                 order = json.load(filename, object_pairs_hook=OrderedDict)
             c = Contract(self.db, contract=order, testnet=self.protocol.testnet)
@@ -762,23 +763,37 @@ def upload_image(self, request):
                 for image in request.args["image"]:
                     img = image.decode('base64')
                     hash_value = digest(img).encode("hex")
+<<<<<<< HEAD
                     with open(DATA_FOLDER +"store/media/" + hash_value, 'wb') as outfile:
                         outfile.write(img)
                     self.db.filemap.insert(hash_value, "store/media/" + hash_value)
+=======
+                    with open(os.path.join(DATA_FOLDER, "store", "media", hash_value), 'wb') as outfile:
+                        outfile.write(img)
+                    self.db.filemap.insert(hash_value, os.path.join(DATA_FOLDER, "store", "media", hash_value))
+>>>>>>> dbb6784f4627c543b4611e825e2729c60f46cb1b
                     ret.append(hash_value)
             elif "avatar" in request.args:
                 avi = request.args["avatar"][0].decode("base64")
                 hash_value = digest(avi).encode("hex")
-                with open(DATA_FOLDER + "store/avatar", 'wb') as outfile:
+                with open(os.path.join(DATA_FOLDER, "store", "avatar"), 'wb') as outfile:
                     outfile.write(avi)
+<<<<<<< HEAD
                 self.db.filemap.insert(hash_value, "store/avatar")
+=======
+                self.db.filemap.insert(hash_value, os.path.join(DATA_FOLDER, "store", "avatar"))
+>>>>>>> dbb6784f4627c543b4611e825e2729c60f46cb1b
                 ret.append(hash_value)
             elif "header" in request.args:
                 hdr = request.args["header"][0].decode("base64")
                 hash_value = digest(hdr).encode("hex")
-                with open(DATA_FOLDER + "store/header", 'wb') as outfile:
+                with open(os.path.join(DATA_FOLDER, "store", "header"), 'wb') as outfile:
                     outfile.write(hdr)
+<<<<<<< HEAD
                 self.db.filemap.insert(hash_value, "store/header")
+=======
+                self.db.filemap.insert(hash_value, os.path.join(DATA_FOLDER, "store", "header"))
+>>>>>>> dbb6784f4627c543b4611e825e2729c60f46cb1b
                 ret.append(hash_value)
             request.write(json.dumps({"success": True, "image_hashes": ret}, indent=4))
             request.finish()
@@ -798,9 +813,13 @@ def respond(success):
             else:
                 request.write(json.dumps({"success": False, "reason": success}))
                 request.finish()
+<<<<<<< HEAD
         file_path = DATA_FOLDER + "purchases/in progress/" + request.args["id"][0] + ".json"
         if not os.path.exists(file_path):
             file_path = DATA_FOLDER + "purchases/trade receipts/" + request.args["id"][0] + ".json"
+=======
+        file_path = os.path.join(DATA_FOLDER, "purchases", "in progress", request.args["id"][0] + ".json")
+>>>>>>> dbb6784f4627c543b4611e825e2729c60f46cb1b
         with open(file_path, 'r') as filename:
             order = json.load(filename, object_pairs_hook=OrderedDict)
         c = Contract(self.db, contract=order, testnet=self.protocol.testnet)
@@ -1152,27 +1171,27 @@ def get_order(self, request):
         #TODO: if this is either a funded direct payment sale or complete moderated sale but
         #TODO: the payout tx has not hit the blockchain, rebroadcast.
 
-        if os.path.exists(DATA_FOLDER + "purchases/unfunded/" + request.args["order_id"][0] + ".json"):
-            file_path = DATA_FOLDER + "purchases/unfunded/" + request.args["order_id"][0] + ".json"
+        filename = request.args["order_id"][0] + ".json"
+        if os.path.exists(os.path.join(DATA_FOLDER, "purchases", "unfunded", filename)):
+            file_path = os.path.join(DATA_FOLDER, "purchases", "unfunded", filename)
             status = self.db.purchases.get_status(request.args["order_id"][0])
-        elif os.path.exists(DATA_FOLDER + "purchases/in progress/" + request.args["order_id"][0] + ".json"):
-            file_path = DATA_FOLDER + "purchases/in progress/" + request.args["order_id"][0] + ".json"
+        elif os.path.exists(os.path.join(DATA_FOLDER, "purchases", "in progress", filename)):
+            file_path = os.path.join(DATA_FOLDER, "purchases", "in progress", filename)
             status = self.db.purchases.get_status(request.args["order_id"][0])
-        elif os.path.exists(DATA_FOLDER + "purchases/trade receipts/" + request.args["order_id"][0] + ".json"):
-            file_path = DATA_FOLDER + "purchases/trade receipts/" + request.args["order_id"][0] + ".json"
+        elif os.path.exists(os.path.join(DATA_FOLDER, "purchases", "trade receipts", filename)):
+            file_path = os.path.join(DATA_FOLDER, "purchases", "trade receipts", filename)
             status = self.db.purchases.get_status(request.args["order_id"][0])
-        elif os.path.exists(DATA_FOLDER + "store/contracts/unfunded/" + request.args["order_id"][0] + ".json"):
-            file_path = DATA_FOLDER + "store/contracts/unfunded/" + request.args["order_id"][0] + ".json"
+        elif os.path.exists(os.path.join(DATA_FOLDER, "store", "contracts", "unfunded", filename)):
+            file_path = os.path.join(DATA_FOLDER, "store", "contracts", "unfunded", filename)
             status = self.db.sales.get_status(request.args["order_id"][0])
-        elif os.path.exists(DATA_FOLDER + "store/contracts/in progress/" + request.args["order_id"][0] + ".json"):
-            file_path = DATA_FOLDER + "store/contracts/in progress/" + request.args["order_id"][0] + ".json"
+        elif os.path.exists(os.path.join(DATA_FOLDER, "store", "contracts", "in progress", filename)):
+            file_path = os.path.join(DATA_FOLDER, "store", "contracts", "in progress", filename)
             status = self.db.sales.get_status(request.args["order_id"][0])
-        elif os.path.exists(DATA_FOLDER +
-                            "store/contracts/trade receipts/" + request.args["order_id"][0] + ".json"):
-            file_path = DATA_FOLDER + "store/contracts/trade receipts/" + request.args["order_id"][0] + ".json"
+        elif os.path.exists(os.path.join(DATA_FOLDER, "store", "contracts", "trade receipts", filename)):
+            file_path = os.path.join(DATA_FOLDER, "store", "contracts", "trade receipts", filename)
             status = self.db.sales.get_status(request.args["order_id"][0])
-        elif os.path.exists(DATA_FOLDER + "cases/" + request.args["order_id"][0] + ".json"):
-            file_path = DATA_FOLDER + "cases/" + request.args["order_id"][0] + ".json"
+        elif os.path.exists(os.path.join(DATA_FOLDER, "cases", filename)):
+            file_path = os.path.join(DATA_FOLDER, "cases", filename)
             status = 4
         else:
             request.write(json.dumps({}, indent=4))

api/ws.py

@@ -182,9 +182,11 @@ def handle_response(listings, node):
                             }
                             for country in l.ships_to:
                                 listing_json["listing"]["ships_to"].append(str(CountryCode.Name(country)))
-                            if not os.path.isfile(DATA_FOLDER + 'cache/' + l.thumbnail_hash.encode("hex")):
+                            if not os.path.isfile(os.path.join( \
+                                    DATA_FOLDER, 'cache', l.thumbnail_hash.encode("hex"))):
                                 self.factory.mserver.get_image(node, l.thumbnail_hash)
-                            if not os.path.isfile(DATA_FOLDER + 'cache/' + listings.avatar_hash.encode("hex")):
+                            if not os.path.isfile(os.path.join( \
+                                    DATA_FOLDER, 'cache', listings.avatar_hash.encode("hex"))):
                                 self.factory.mserver.get_image(node, listings.avatar_hash)
                             self.transport.write(str(bleach.clean(
                                 json.dumps(listing_json, indent=4), tags=ALLOWED_TAGS)))

db/datastore.py

@@ -591,7 +591,7 @@ def get_conversations(self):
             handle = ""
             if val[0] is not None:
                 try:
-                    with open(DATA_FOLDER + 'cache/' + g[0], "r") as filename:
+                    with open(join(DATA_FOLDER, 'cache', g[0]), "r") as filename:
                         profile = filename.read()
                     p = objects.Profile()
                     p.ParseFromString(profile)