feat: download zip for sb2gs

Author: faretek1

addons/goboscript/addon.json

@@ -19,7 +19,7 @@
   "versionAdded": "1.44.0",
   "userscripts": [
     {
-      "url": "sb2gs.js",
+      "url": "userscript.js",
       "matches": [
         "projects"
       ]

addons/goboscript/importet.js

@@ -1,25 +1,25 @@
 /* global chrome */
-import * as pyodidePkg from "./pyodide/pyodide.mjs";
+import downloadBlob from "../../libraries/common/cs/download-blob.js";
+
+
+export const sb2gsWhlName = "sb2gs-2.0.0-py3-none-any.whl";
 
 /**
  * @param addon {UserscriptAddon}
  * @param console
+ * @param pyodide
+ * @param decompileButton {HTMLButtonElement}
  * @returns {Promise<void>}
  */
-export default async function({ addon, console }) {
-  const decompileButton = document.createElement("button");
-  decompileButton.className = "button sa-decompile-button";
-  decompileButton.title = "decompile to goboscript code";
-  decompileButton.appendChild(document.createElement("span")).innerText = "Decompile";
-
-  const pyodide = await pyodidePkg.loadPyodide();
-  await pyodide.loadPackage("micropip");
+export async function decompile(addon, console, pyodide, decompileButton) {
+  const vm = addon.tab.traps.vm;
+  /**@type {Blob}*/
+  const project = await vm.saveProjectSb3();
+  const inputPath = "/input.sb3";
+  const outputDirPath = "/workdir";
+  const outputPath = "/output.zip";
 
-  // TESTING
-  pyodide.FS.writeFile("/input.sb3", await ((await fetch(`${addon.self.dir}/test.sb3`)).bytes()));
-
-  const sb2gsWhlName = "sb2gs-2.0.0-py3-none-any.whl";
-  pyodide.FS.writeFile(`/${sb2gsWhlName}`, await ((await fetch(`${addon.self.dir}/${sb2gsWhlName}`)).bytes()));
+  pyodide.FS.writeFile(inputPath, new Uint8Array(await project.arrayBuffer()));
 
   await pyodide.runPythonAsync(`
 import micropip
@@ -31,17 +31,32 @@ print(package_list)
 
 from pathlib import Path
 import sb2gs
+import shutil
+
+input_path = Path("${inputPath}")
+output_dir_path = Path("${outputDirPath}")
 
-sb2gs.decompile(Path("/input.sb3"), Path("/output"))
+sb2gs.decompile(input_path, output_dir_path)
+
+shutil.make_archive("${outputPath.slice(0, -4)}", "zip", "${outputDirPath}")
 `);
+  // This is the zip file provided by shutil.make_archive
+  const data = pyodide.FS.readFile(outputPath);
+  // for now, let's just download it instead of making an entire file viewing interface
+  const blob = new Blob([data]);
+
+  // We need to determine the title of the file.
+  // The logic for this is taken from download-button/userscript.js
+  const username = await addon.auth.fetchUsername();
+  const projectAuthor = addon.tab.redux.state.preview.projectInfo.author?.username;
+
+  const isOwn = username === projectAuthor;
+
+  const title = isOwn ? document.querySelector(".project-title input") : document.querySelector(".project-title");
+  const titleStr = isOwn ? title.value : title.innerText;
 
-  console.log(pyodide.FS.readdir("/output"));
-  // END TESTING
+  const projectId = window.location.pathname.split("/")[2]
 
-  while (true) {
-    const seeInside = await addon.tab.waitForElement(".see-inside-button", {
-      markAsSeen: true,
-    });
-    seeInside.parentElement.appendChild(decompileButton);
-  }
+  const beginFilenameWithId = true;
+  downloadBlob((beginFilenameWithId ? `${projectId} ` : "") + titleStr + '.zip', blob);
 }

addons/goboscript/sb2gs-2.0.0-py3-none-any.whl

@@ -0,0 +1,52 @@
+/* global chrome */
+import * as sb2gs from './sb2gs.js';
+import * as pyodidePkg from "./pyodide/pyodide.mjs";
+
+/**
+ * @param addon {UserscriptAddon}
+ * @param console
+ * @returns {Promise<void>}
+ */
+export default async function({ addon, console }) {
+  const decompileButton = document.createElement("button");
+  decompileButton.className = "button sa-decompile-button waiting";
+  decompileButton.title = "decompile to goboscript code";
+  decompileButton.appendChild(document.createElement("span")).innerText = "Decompile";
+
+  const pyodidePromise = pyodidePkg.loadPyodide();
+
+  const pyodidePackagingPromise = pyodidePromise.then(async (pyodide) => {
+    console.log("PYODIDE LOADED");
+
+    const loadMicropipPromise = pyodide.loadPackage("micropip");
+
+    const sb2gsWhlFile = await ((await
+      fetch(`${addon.self.dir}/${sb2gs.sb2gsWhlName}`)).bytes());
+
+    pyodide.FS.writeFile(`/${sb2gs.sb2gsWhlName}`, sb2gsWhlFile);
+
+    await loadMicropipPromise;
+
+    console.log("EXITING PYODIDE PACKAGING");
+    return pyodide;
+  });
+
+  decompileButton.onclick = async () => {
+    console.log("DECOMPILE BUTTON CLICKED");
+    const pyodide = await pyodidePackagingPromise;
+    console.log("AWAITED PYODIDE PACKAGING");
+
+    decompileButton.classList.remove("waiting");
+    decompileButton.classList.add("loading");
+    await sb2gs.decompile(addon, console, pyodide, decompileButton);
+    decompileButton.classList.remove("loading");
+    decompileButton.classList.add("waiting");
+  }
+
+  while (true) {
+    const seeInside = await addon.tab.waitForElement(".see-inside-button", {
+      markAsSeen: true,
+    });
+    seeInside.parentElement.appendChild(decompileButton);
+  }
+}