handle null index writes

OpenDreamProject · Jan 28, 2024 · baecb4b · baecb4b
1 parent f3efcb7
commit baecb4b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/Content.Tests/DMProject/Tests/Savefile/ExportText.dm b/Content.Tests/DMProject/Tests/Savefile/ExportText.dm
@@ -35,3 +35,10 @@
 .2
 	type = /datum
 "}
+	ASSERT(F.ExportText("list") ~= list_match)
+
+	F.cd = "dir6"
+	F << "test"
+	F.cd = "/"
+	ASSERT(F.ExportText("dir6") == ". = \"test\"\nsubdir6 = 321\n")
+	ASSERT(F.ExportText("dir6/subdir6/") == ". = 321\n")
diff --git a/OpenDreamRuntime/Objects/Types/DreamObjectSavefile.cs b/OpenDreamRuntime/Objects/Types/DreamObjectSavefile.cs
@@ -252,9 +252,18 @@ public DreamValue GetSavefileValue(string? index) {
     }
 
     public void SetSavefileValue(string? index, DreamValue value) {
-        // TODO reimplement nulling values when cd
         if (index == null) {
-            CurrentDir[$".{CurrentDir.Count}"] = SerializeDreamValue(value);
+            SFDreamJsonValue newCurrentDir = SerializeDreamValue(value);
+            foreach(var key in CurrentDir.Keys) {
+                newCurrentDir[key] = CurrentDir[key];
+            }
+
+            if(CurrentDir != _rootNode) {
+                SFDreamJsonValue parentDir = SeekTo("..");
+                parentDir[CurrentPath.Split("/").Last()] = newCurrentDir;
+            } else {
+                CurrentDir = _rootNode = newCurrentDir;
+            }
             _savefilesToFlush.Add(this);
             return;
         }

diff --git a/OpenDreamRuntime/Procs/Native/DreamProcNativeSavefile.cs b/OpenDreamRuntime/Procs/Native/DreamProcNativeSavefile.cs
@@ -43,8 +43,7 @@ private static string ExportTextInternal(DreamObjectSavefile savefile, int inden
         var value = savefile.CurrentDir;
         var key = savefile.CurrentPath.Split('/').Last();
         if(indent == int.MinValue){
-            if(!string.IsNullOrEmpty(key)) //if this is is the start and not root dir, use . = value syntax
-                key = ".";
+            key = ".";
             indent = 0; //either way, set indent to 0 so we know we're not at the start anymore
         }
         switch(value) {