fix(Keyboard): Fixes an issue where random sounds don't properly expo…

…rt. Closes #2965
Thorium-Sim · Jun 16, 2020 · 6fa74e0 · 6fa74e0
1 parent 0f506f4
commit 6fa74e0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/server/imports/addAsset.js b/server/imports/addAsset.js
@@ -2,7 +2,7 @@ import path from "path";
 import fs from "fs";
 import paths from "../helpers/paths";
 
-let assetDir = path.resolve("./");
+export let assetDir = path.resolve("./");
 
 if (process.env.NODE_ENV === "production") {
   assetDir = paths.userData;

diff --git a/server/imports/missions/export/playSound.js b/server/imports/missions/export/playSound.js
@@ -1,11 +1,22 @@
-import addAsset from "../../addAsset";
+import addAsset, {assetDir} from "../../addAsset";
+import fs from "fs";
 
 export default function buildExport(zip, i, type) {
   if (i.event === "playSound") {
     const args = typeof i.args === "string" ? JSON.parse(i.args) : i.args;
     if (!args.sound) return;
     const asset = args.sound.asset;
+
     if (asset) {
+      if (args.type === "random") {
+        // It's a folder full of stuff. Grab it
+        const objectLoc = `${assetDir}/assets/${asset}`.replace("//", "/");
+        if (fs.existsSync(objectLoc) && fs.lstatSync(objectLoc).isDirectory()) {
+          const files = fs.readdirSync(objectLoc);
+          files.forEach(file => addAsset(`${asset}/${file}`, zip, type));
+          return;
+        }
+      }
       addAsset(asset, zip, type);
     }
   }