use node-zipfile@0.5.5 with large file handling inprovements

CartoDB · Jan 14, 2015 · 39a7e48 · 39a7e48
1 parent d618774
commit 39a7e48
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/lib/millstone.js b/lib/millstone.js
@@ -443,26 +443,17 @@ function unzip(file, callback) {
                 path.basename(file, path.extname(file)) +
                 path.extname(name).toLowerCase()
             );
-            zf.readFile(name, function(err, buff) {
+            zf.copyFile(name, dest, function(err) {
                 if (err) return callback(err);
-                fs.open(dest, 'w', 0644, function(err, fd) {
-                    if (err) return callback(err);
-                    fs.write(fd, buff, 0, buff.length, null, function(err) {
-                        if (err) return callback(err);
-                        fs.close(fd, function(err) {
-                            if (err) return callback(err);
-                            remain--;
-                            if (!remain) {
-                                add_item_to_metafile(metafile,'unzipped_file',new_name,function(err) {
-                                    // ignore error from add_item_to_metafile
-                                    //if (err && env == 'development') console.error('[millstone] ' + err.message);
-                                    if (err) throw err;
-                                    callback(null, new_name);
-                                });
-                            }
-                        });
+                remain--;
+                if (!remain) {
+                    add_item_to_metafile(metafile,'unzipped_file',new_name,function(err) {
+                        // ignore error from add_item_to_metafile
+                        //if (err && env == 'development') console.error('[millstone] ' + err.message);
+                        if (err) throw err;
+                        callback(null, new_name);
                     });
-                });
+                }
             });
         }
     });

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
         "generic-pool": "~2.1.1",
         "request": "2.x",
         "srs": "~0.4.6",
-        "zipfile": "~0.5.4",
+        "zipfile": "~0.5.5",
         "sqlite3": "2.x || 3.x",
         "mime": "~1.2.11",
         "mkdirp": "~0.5.0",