Fix correctly exporting desktop icon when project is saved in the clo…

…ud (#7282)
4ian · Jan 6, 2025 · 3d80709 · 3d80709
1 parent 5ab9c56
commit 3d80709
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/GDJS/GDJS/IDE/Exporter.cpp b/GDJS/GDJS/IDE/Exporter.cpp
@@ -195,11 +195,8 @@ bool Exporter::ExportWholePixiProject(const ExportOptions &options) {
             exportedProject, options.exportPath, usedExtensions))
       return false;
 
-    if (!helper.ExportBuildResourcesElectronFiles(
-            // It's important to use the original project here, as the exported
-            // project can have its resources modified.
-            options.project,
-            options.exportPath))
+    if (!helper.ExportBuildResourcesElectronFiles(exportedProject,
+                                                  options.exportPath))
       return false;
   } else if (options.target == "facebookInstantGames") {
     if (!exportProject(options.exportPath)) return false;

diff --git a/GDJS/GDJS/IDE/ExporterHelper.cpp b/GDJS/GDJS/IDE/ExporterHelper.cpp
@@ -747,9 +747,7 @@ bool ExporterHelper::ExportBuildResourcesElectronFiles(
           .GetResource(platformSpecificAssets.Get("desktop", "icon-512"))
           .GetFile();
 
-  auto projectDirectory = gd::AbstractFileSystem::NormalizeSeparator(
-      fs.DirNameFrom(project.GetProjectFile()));
-  fs.MakeAbsolute(iconFilename, projectDirectory);
+  fs.MakeAbsolute(iconFilename, exportDir + "/app");
   fs.MkDir(exportDir + "/buildResources");
   if (fs.FileExists(iconFilename)) {
     fs.CopyFile(iconFilename, exportDir + "/buildResources/icon.png");

diff --git a/newIDE/app/src/ExportAndShare/BrowserExporters/BrowserFileSystem.js b/newIDE/app/src/ExportAndShare/BrowserExporters/BrowserFileSystem.js
@@ -183,6 +183,21 @@ export default class BrowserFileSystem {
       return true;
     }
 
+    // If this is a file that we have to download,
+    // consider the file copied by getting it to be downloaded in the new destination
+    const existingDestToDownload = Object.keys(this._filesToDownload).find(
+      filePath => filePath === source
+    );
+    if (existingDestToDownload) {
+      const existingSourceToDownload = this._filesToDownload[
+        existingDestToDownload
+      ];
+      this._filesToDownload[
+        pathPosix.normalize(dest)
+      ] = existingSourceToDownload;
+      return true;
+    }
+
     console.error(`File not found in copyFile (from ${source} to ${dest}).`);
     return false;
   };

diff --git a/newIDE/app/src/ExportAndShare/LocalExporters/LocalFileSystem.js b/newIDE/app/src/ExportAndShare/LocalExporters/LocalFileSystem.js
@@ -153,6 +153,23 @@ class LocalFileSystem {
     try {
       if (source !== dest) fs.copySync(source, dest);
     } catch (e) {
+      if (e.code === 'ENOENT') {
+        // If the file does not exist, it's possible it is meant to be downloaded.
+        // In this case, consider the file copied by getting it to be downloaded in the new destination.
+        const existingDestToDownload = Object.keys(this._filesToDownload).find(
+          filePath => filePath === source
+        );
+        if (existingDestToDownload) {
+          const existingSourceToDownload = this._filesToDownload[
+            existingDestToDownload
+          ];
+          this._filesToDownload[
+            pathPosix.normalize(dest)
+          ] = existingSourceToDownload;
+          return true;
+        }
+      }
+
       console.error('copyFile(' + source + ', ' + dest + ') failed: ' + e);
       return false;
     }