From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 2 Mar 2015 04:17:27 +0000 (+0100)
Subject: Server/py: On savefile writing, handle escapes and quotes.
X-Git-Tag: tce~446
X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=063eb0e64a0a2122c5581a668217290eb0b01f2b;p=plomrogue

Server/py: On savefile writing, handle escapes and quotes.
---

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 7c67024..c8cb0ee 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -119,18 +119,20 @@ def record(command):
 def save_world():
     """Save all commands needed to reconstruct current world state.""" 
     # TODO: Misses same optimizations as record() from the original record().
-    # TODO: How to handle strings that contain ' or "?
+
+    def quote(string):
+        string = string.replace("\u005C", '\u005C\u005C')
+        return '"' + string.replace('"', '\u005C"') + '"'
 
     def mapsetter(key):
         def helper(id):
             string = ""
             if world_db["Things"][id][key]:
-                memmap = world_db["Things"][id][key]
+                rmap = world_db["Things"][id][key]
                 length = world_db["MAP_LENGTH"]
                 for i in range(world_db["MAP_LENGTH"]):
-                    string = string + key + " " + str(i) + " '" + \
-                             memmap[i * length:(i * length) + length].decode() \
-                             + "'\n"
+                    line = rmap[i * length:(i * length) + length].decode()
+                    string = string + key + " " + str(i) + quote(line) + "\n"
             return string
         return helper
 
@@ -148,7 +150,7 @@ def save_world():
             for key in world_db[category][id]:
                 if not key in special_keys:
                     x = world_db[category][id][key]
-                    argument = "'" + x + "'" if str == type(x) else str(x)
+                    argument = quote(x) if str == type(x) else str(x)
                     string = string + key + " " + argument + "\n"
                 elif special_keys[key]:
                     string = string + special_keys[key](id)