Improve .zip support

mbloch · Dec 22, 2022 · 3705f7c · 3705f7c
1 parent b09620d
commit 3705f7c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/gui/gui-zip-reader.mjs b/src/gui/gui-zip-reader.mjs
@@ -37,7 +37,7 @@ GUI.readZipFile = function(file, cb) {
     function readEntry(entry) {
       var filename = entry.filename,
           isValid = !entry.directory && GUI.isReadableFileType(filename) &&
-              !/^__MACOSX/.test(filename); // ignore "resource-force" files
+              !/^__MACOSX/.test(filename); // ignore "resource-fork" files
       if (isValid) {
         entry.getData(new zip.BlobWriter(), function(file) {
           file.name = filename; // Give the Blob a name, like a File object

diff --git a/src/io/mapshaper-zip.mjs b/src/io/mapshaper-zip.mjs
@@ -25,7 +25,7 @@ export function extractFiles(input, cache) {
       // don't import .dbf separately if .shp is present
       if (replaceFileExtension(file, 'shp') in cache) return false;
     }
-    return type == 'text' || type == 'json' || type == 'shp' || type == 'dbf';
+    return type == 'text' || type == 'json' || type == 'shp' || type == 'dbf' || type == 'kml';
   });
 }
 

diff --git a/test/data/features/zip/zip-in-zip.zip b/test/data/features/zip/zip-in-zip.zip
diff --git a/test/zip-test.mjs b/test/zip-test.mjs
@@ -42,4 +42,14 @@ describe('zip i/o', function () {
     assert.deepEqual(data, target);
   });
 
+  it('Unable to import zip in zip', async function() {
+    var file = 'test/data/features/zip/zip-in-zip.zip';
+    var cmd = `-i ${file} -o data.zip`;
+    try {
+      await api.applyCommands(cmd);
+    } catch(e) {
+      assert.equal(e.name, 'UserError');
+    }
+  })
+
 });