make world.Export()'s returned CONTENT a resource value

OpenDreamProject · Oct 15, 2023 · d3b8c7c · d3b8c7c
1 parent 2698cab
commit d3b8c7c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/OpenDreamRuntime/Procs/Native/DreamProcNativeWorld.cs b/OpenDreamRuntime/Procs/Native/DreamProcNativeWorld.cs
@@ -61,8 +61,9 @@ public static async Task<DreamValue> NativeProc_Export(AsyncNativeProc.State sta
                 list.SetValue(new DreamValue(header.Key), new DreamValue(header.Value.First()));
             }
 
+            var content = state.ResourceManager.CreateResource(await response.Content.ReadAsByteArrayAsync());
             list.SetValue(new DreamValue("STATUS"), new DreamValue(((int) response.StatusCode).ToString()));
-            list.SetValue(new DreamValue("CONTENT"), new DreamValue(await response.Content.ReadAsStringAsync()));
+            list.SetValue(new DreamValue("CONTENT"), new DreamValue(content));
 
             return new DreamValue(list);
         }

diff --git a/OpenDreamRuntime/Resources/DreamResourceManager.cs b/OpenDreamRuntime/Resources/DreamResourceManager.cs
@@ -133,6 +133,18 @@ public IconResource CreateIconResource(byte[] data, Image<Rgba32> texture, DMIPa
             return resource;
         }
 
+        /// <summary>
+        /// Dynamically create a new generic resource that clients can use
+        /// </summary>
+        /// <param name="data">The resource's data</param>
+        public DreamResource CreateResource(byte[] data) {
+            int resourceId = _resourceCache.Count;
+            DreamResource resource = new DreamResource(resourceId, data);
+
+            _resourceCache.Add(resource);
+            return resource;
+        }
+
         /// <summary>
         /// Dynamically create a new icon resource that clients can use
         /// </summary>