rust: Copy template files on compile (#848)

Fixes
#608 (comment)

Author: sonnyp

.github/CODEOWNERS

@@ -1,4 +1,5 @@
-* @sonnyp
+/src/langs/javascript/ @sonnyp
+*.js @sonnyp
 
 /src/langs/vala/ @lw64
 *.vala @lw64

.gitignore

@@ -17,10 +17,3 @@ __pycache__
 
 # IDEs / editors
 .idea
-
-# Project files - sync with Makefile
-src/Library/**/settings
-src/Library/**/workbench.vala
-src/Library/**/main.ui
-src/Library/**/libworkbenchcode.so
-src/Library/**/__pycache__

data/app.metainfo.xml

@@ -5,7 +5,7 @@
   <name translatable="no">Workbench</name>
   <!-- developer_name tag deprecated with Appstream 1.0 -->
   <developer_name translatable="no">Sonny Piers</developer_name>
-  <developer id="gitlab.com">
+  <developer>
     <name translatable="no">Sonny Piers</name>
   </developer>
   <update_contact>sonnyp@gnome.org</update_contact>

src/langs/rust/Compiler.js

@@ -1,7 +1,11 @@
 import Gio from "gi://Gio";
 import GLib from "gi://GLib";
 import dbus_previewer from "../../Previewer/DBusPreviewer.js";
-import { decode, encode } from "../../util.js";
+import { copyDirectory, decode, encode } from "../../util.js";
+
+const rust_template_dir = Gio.File.new_for_path(
+  pkg.pkgdatadir,
+).resolve_relative_path("langs/rust/template");
 
 export default function Compiler({ session }) {
   const { file } = session;
@@ -15,6 +19,8 @@ export default function Compiler({ session }) {
   let savedRustcVersion;
 
   async function compile() {
+    copyDirectory(rust_template_dir, file);
+
     rustcVersion ||= await getRustcVersion();
     savedRustcVersion ||= await getSavedRustcVersion({ rustcVersionFile });
 

src/sessions.js

@@ -7,11 +7,11 @@ import {
   ensureDir,
   getNowForFilename,
   demos_dir,
-  rust_template_dir,
   settings as global_settings,
   encode,
   languages,
   settings,
+  copyDirectory,
 } from "./util.js";
 
 export const sessions_dir = data_dir.get_child("sessions");
@@ -64,7 +64,6 @@ export function createSessionFromDemo(demo) {
 
   const { file, settings } = session;
   copyDirectory(demo_dir, file);
-  copyDirectory(rust_template_dir, file);
 
   settings.set_string("name", name);
   settings.set_boolean("show-code", panels.includes("code"));
@@ -79,24 +78,6 @@ export function createSessionFromDemo(demo) {
   return session;
 }
 
-// There is no copy directory function
-function copyDirectory(source, destination) {
-  for (const file_info of source.enumerate_children(
-    "",
-    Gio.FileQueryInfoFlags.NOFOLLOW_SYMLINKS,
-    null,
-  )) {
-    if (file_info.get_file_type() === Gio.FileType.DIRECTORY) continue;
-    const child = source.get_child(file_info.get_name());
-    child.copy(
-      destination.get_child(child.get_basename()),
-      Gio.FileCopyFlags.NONE,
-      null,
-      null,
-    );
-  }
-}
-
 export async function deleteSession(session) {
   // There is no method to recursively delete a folder so we trash instead
   // https://github.com/flatpak/xdg-desktop-portal/issues/630 :/

src/util.js

@@ -177,9 +177,30 @@ export const demos_dir = Gio.File.new_for_path(
   pkg.pkgdatadir,
 ).resolve_relative_path("demos");
 
-export const rust_template_dir = Gio.File.new_for_path(
-  pkg.pkgdatadir,
-).resolve_relative_path("langs/rust/template");
+// There is no copy directory function
+export function copyDirectory(source, destination) {
+  for (const file_info of source.enumerate_children(
+    "",
+    Gio.FileQueryInfoFlags.NOFOLLOW_SYMLINKS,
+    null,
+  )) {
+    if (file_info.get_file_type() === Gio.FileType.DIRECTORY) continue;
+    const child = source.get_child(file_info.get_name());
+
+    try {
+      child.copy(
+        destination.get_child(child.get_basename()),
+        Gio.FileCopyFlags.NONE,
+        null,
+        null,
+      );
+    } catch (err) {
+      if (!err.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS)) {
+        throw err;
+      }
+    }
+  }
+}
 
 export function getNowForFilename() {
   return new GLib.DateTime().format("%Y-%m-%d %H-%M-%S");