Ensure empty subdirectories are always removed

forkphorus · Jul 21, 2024 · 5a8ba9b · 5a8ba9b
1 parent 68e510a
commit 5a8ba9b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/src/downloader.js b/src/downloader.js
@@ -579,6 +579,7 @@ export const downloadProjectFromBuffer = async (data, options) => {
   for (const path of Object.keys(zip.files)) {
     if (path.includes('/')) {
       zip.remove(path);
+      needToReZip = true;
     }
   }
 

diff --git a/test/__snapshots__/sb3.test.js.snap b/test/__snapshots__/sb3.test.js.snap
@@ -4,6 +4,8 @@ exports[`downloads missing assets 1`] = `ArrayBuffer [SHA-256 bbded48ad46f4c1fa9
 
 exports[`downloads missing assets 2`] = `ArrayBuffer [SHA-256 4f25165fae50acf1ae0c05e19e0ecc363e3c93fb263ad84c67b1412ab53e5a4c]`;
 
+exports[`extra empty subdirectory is removed 1`] = `ArrayBuffer [SHA-256 4532296b54eb844a047bf07efa5ff4a21fcff07df64a91a344ca1a7a4a18a8fe]`;
+
 exports[`sb3 project from JSON 1`] = `
 {
   "arrayBuffer": ArrayBuffer [SHA-256 73f90aff8695ab18da8736f7a0b5054bed29cb2fc08fe59ab34da7d82c6a74d0],

diff --git a/test/fixtures/extra-empty-subdirectory.sb3 b/test/fixtures/extra-empty-subdirectory.sb3
diff --git a/test/sb3.test.js b/test/sb3.test.js
@@ -74,3 +74,11 @@ test('downloads missing assets', async () => {
     expect(await zip1.file(path).async('uint8array')).toStrictEqual(await zip2.file(path).async('uint8array'));
   }
 });
+
+test('extra empty subdirectory is removed', async () => {
+  const fixtureData = fs.readFileSync(getFixturePath('extra-empty-subdirectory.sb3'));
+  const project = await SBDL.downloadProjectFromBuffer(fixtureData);
+  const zip = await JSZip.loadAsync(project.arrayBuffer);
+  expect(zip.files['empty/']).toBe(undefined);
+  expect(project.arrayBuffer).toMatchSnapshot();
+});