Fix embedded resource links when importing a GDO (#8419)

Author: D8H

Core/GDCore/IDE/ObjectAssetSerializer.cpp

@@ -112,9 +112,7 @@ void ObjectAssetSerializer::SerializeTo(
     usedResourceNames.push_back(resourceName);
     auto &resource = resourcesManager.GetResource(resourceName);
     SerializerElement &resourceElement = resourcesElement.AddChild("resource");
-    resource.SerializeTo(resourceElement);
-    resourceElement.SetAttribute("kind", resource.GetKind());
-    resourceElement.SetAttribute("name", resource.GetName());
+    gd::ResourcesContainer::SerializeResourceTo(resource, resourceElement);
   }
 
   SerializerElement &requiredExtensionsElement =

Core/GDCore/Project/ResourcesContainer.cpp

@@ -369,28 +369,32 @@ void ResourcesContainer::UnserializeFrom(const SerializerElement &element) {
   resourcesElement.ConsiderAsArrayOf("resource", "Resource");
   for (std::size_t i = 0; i < resourcesElement.GetChildrenCount(); ++i) {
     const SerializerElement &resourceElement = resourcesElement.GetChild(i);
-    gd::String kind = resourceElement.GetStringAttribute("kind");
-    gd::String name = resourceElement.GetStringAttribute("name");
-    gd::String metadata = resourceElement.GetStringAttribute("metadata", "");
 
+    gd::String kind = resourceElement.GetStringAttribute("kind");
     std::shared_ptr<Resource> resource = CreateResource(kind);
-    resource->SetName(name);
-    resource->SetMetadata(metadata);
-
-    if (resourceElement.HasChild("origin")) {
-      gd::String originName =
-          resourceElement.GetChild("origin").GetStringAttribute("name", "");
-      gd::String originIdentifier =
-          resourceElement.GetChild("origin").GetStringAttribute("identifier",
-                                                                "");
-      resource->SetOrigin(originName, originIdentifier);
-    }
-    resource->UnserializeFrom(resourceElement);
-
+    UnserializeResourceFrom(*resource, resourceElement);
     resources.push_back(resource);
   }
 }
 
+void ResourcesContainer::UnserializeResourceFrom(
+    gd::Resource &resource, const SerializerElement &resourceElement) {
+  gd::String name = resourceElement.GetStringAttribute("name");
+  gd::String metadata = resourceElement.GetStringAttribute("metadata", "");
+
+  resource.SetName(name);
+  resource.SetMetadata(metadata);
+
+  if (resourceElement.HasChild("origin")) {
+    gd::String originName =
+        resourceElement.GetChild("origin").GetStringAttribute("name", "");
+    gd::String originIdentifier =
+        resourceElement.GetChild("origin").GetStringAttribute("identifier", "");
+    resource.SetOrigin(originName, originIdentifier);
+  }
+  resource.UnserializeFrom(resourceElement);
+}
+
 void ResourcesContainer::SerializeTo(SerializerElement &element) const {
   SerializerElement &resourcesElement = element.AddChild("resources");
   resourcesElement.ConsiderAsArrayOf("resource");

Core/GDCore/Project/ResourcesContainer.h

@@ -778,6 +778,12 @@ class GD_CORE_API ResourcesContainer {
    */
   void UnserializeFrom(const SerializerElement &element);
 
+  /**
+   * \brief Unserialize one resource.
+   */
+  static void UnserializeResourceFrom(gd::Resource &resource,
+                                      const SerializerElement &resourceElement);
+
 private:
   void Init(const ResourcesContainer &other);
 

GDevelop.js/Bindings/Bindings.idl

@@ -1353,6 +1353,10 @@ interface ResourcesContainer {
     boolean MoveResourceUpInList([Const] DOMString oldName);
     boolean MoveResourceDownInList([Const] DOMString oldName);
     void MoveResource(unsigned long oldIndex, unsigned long newIndex);
+
+    void STATIC_UnserializeResourceFrom(
+        [Ref] Resource resource,
+        [Const, Ref] SerializerElement resourceElement);
 };
 
 interface ResourcesContainersList {

GDevelop.js/Bindings/Wrapper.cpp

@@ -873,6 +873,7 @@ typedef std::vector<gd::PropertyDescriptorChoice> VectorPropertyDescriptorChoice
 
 #define STATIC_CopyAllResourcesTo CopyAllResourcesTo
 #define STATIC_CopyObjectResourcesTo CopyObjectResourcesTo
+#define STATIC_UnserializeResourceFrom UnserializeResourceFrom
 
 #define STATIC_IsExtensionLifecycleEventsFunction \
   IsExtensionLifecycleEventsFunction

GDevelop.js/types.d.ts

@@ -1142,6 +1142,7 @@ export class ResourcesContainer extends EmscriptenObject {
   moveResourceUpInList(oldName: string): boolean;
   moveResourceDownInList(oldName: string): boolean;
   moveResource(oldIndex: number, newIndex: number): void;
+  static unserializeResourceFrom(resource: Resource, resourceElement: SerializerElement): void;
 }
 
 export class ResourcesContainersList extends EmscriptenObject {

GDevelop.js/types/gdresourcescontainer.js

@@ -21,6 +21,7 @@ declare class gdResourcesContainer {
   moveResourceUpInList(oldName: string): boolean;
   moveResourceDownInList(oldName: string): boolean;
   moveResource(oldIndex: number, newIndex: number): void;
+  static unserializeResourceFrom(resource: gdResource, resourceElement: gdSerializerElement): void;
   delete(): void;
   ptr: number;
 };

newIDE/app/src/ObjectEditor/ObjectImporterDialog.js

@@ -25,6 +25,7 @@ import newNameGenerator from '../Utils/NewNameGenerator';
 import LoaderModal from '../UI/LoaderModal';
 import AlertMessage from '../UI/AlertMessage';
 import { getOrCreate } from '../Utils/Map';
+import { unserializeResourceFromJSObject } from '../Utils/Serializer';
 
 const gd: libGDevelop = global.gd;
 
@@ -696,8 +697,7 @@ const ObjectImporterDialog = ({
         }
         // The resource does not exist yet, add it. Note that the "origin" will be preserved.
         const newResource = resourceKindMetadata.createNewResource();
-        unserializeFromJSObject(newResource, serializedResource);
-        newResource.setName(serializedResource.name);
+        unserializeResourceFromJSObject(newResource, serializedResource);
 
         const resourceBlob: Blob = await getFileBlob({
           archiveBlob: assetPackBlob,

newIDE/app/src/Utils/Serializer.js

@@ -134,3 +134,12 @@ export function unserializeFromJSObject(
   }
   serializedElement.delete();
 }
+
+export function unserializeResourceFromJSObject(
+  resource: gdResource,
+  object: Object
+) {
+  const serializedElement = gd.Serializer.fromJSObject(object);
+  gd.ResourcesContainer.unserializeResourceFrom(resource, serializedElement);
+  serializedElement.delete();
+}