@datatruck/cli 0.14.0 → 0.15.0

package/util/zip-util.js

@@ -73,10 +73,10 @@ async function listZip(data) {
         onExitCodeError: (data, error) => (data.exitCode > 2 ? error : false),
         stdout: {
             parseLines: true,
-            onData: (line) => {
+            onData: async (line) => {
                 const stream = parseListZipLine(line, buffer);
                 if (stream) {
-                    data.onStream?.(stream);
+                    await data.onStream?.(stream);
                 }
             },
         },
@@ -85,12 +85,13 @@ async function listZip(data) {
 exports.listZip = listZip;
 function parseZipLine(line) {
     let matches = null;
-    if (!line.trim().length)
+    line = line.trim();
+    if (!line.length)
         return;
-    if ((matches = /^\s*(\d+)% (\d+ )?\+/.exec(line))) {
+    if ((matches = /^(\d+)% (\d+ )?\+/.exec(line))) {
         const path = line.slice(line.indexOf("+") + 1).trim();
         const progress = Number(matches[1]);
-        const files = Number(matches[2]);
+        const files = matches[2] ? Number(matches[2]) : 1;
         return {
             type: "progress",
             data: { progress, path, files },
@@ -109,10 +110,16 @@ function parseZipLine(line) {
     }
 }
 async function zip(data) {
-    let result = {
+    let summary = {
         folders: 0,
         files: 0,
     };
+    await data.onProgress?.({
+        current: 0,
+        percent: 0,
+        total: 0,
+        type: "start",
+    });
     await (0, process_util_1.exec)(data.command ?? "7z", [
         "a",
         // https://sourceforge.net/p/sevenzip/bugs/2099/,
@@ -130,17 +137,34 @@ async function zip(data) {
         log: data.verbose ?? false,
         onExitCodeError: (data, error) => (data.exitCode > 2 ? error : false),
         stdout: {
-            onData: (line) => {
-                const stream = parseZipLine(line);
-                if (stream) {
-                    data.onStream?.(stream);
-                    if (stream.type === "summary")
-                        result = stream.data;
+            onData: async (lines) => {
+                for (const line of lines.split(/\r?\n/)) {
+                    const stream = parseZipLine(line);
+                    if (stream) {
+                        if (stream.type === "summary")
+                            summary = stream.data;
+                        if (stream.type === "progress") {
+                            const current = Math.max(0, stream.data.files - 1);
+                            await data.onProgress?.({
+                                total: summary.files,
+                                current,
+                                path: stream.data.path,
+                                percent: stream.data.progress,
+                            });
+                        }
+                        await data.onStream?.(stream);
+                    }
                 }
             },
         },
     });
-    return result;
+    await data.onProgress?.({
+        total: summary.files,
+        current: summary.files,
+        percent: 100,
+        type: "end",
+    });
+    return summary;
 }
 exports.zip = zip;
 function parseUnzipLine(line) {
@@ -151,12 +175,20 @@ function parseUnzipLine(line) {
         const path = line.slice(line.indexOf("-") + 1).trim();
         return {
             type: "progress",
-            data: { progress, path, files },
+            data: { percent: progress, path, files },
         };
     }
 }
 async function unzip(data) {
-    return await (0, process_util_1.exec)(data.command ?? "7z", [
+    let summary = {
+        files: 0,
+    };
+    await data.onProgress?.({
+        current: summary.files,
+        percent: 0,
+        type: "start",
+    });
+    const result = await (0, process_util_1.exec)(data.command ?? "7z", [
         "x",
         "-bsp1",
         (0, path_1.normalize)(data.input),
@@ -167,15 +199,34 @@ async function unzip(data) {
         log: data.verbose ?? false,
         stderr: { toExitCode: true },
         stdout: {
-            ...(data.onStream && {
+            ...((data.onStream || data.onProgress) && {
                 parseLines: true,
-                onData: (line) => {
+                onData: async (line) => {
                     const stream = parseUnzipLine(line);
-                    if (stream)
-                        data.onStream(stream);
+                    if (stream) {
+                        if (stream.type === "progress") {
+                            const current = Math.max(0, stream.data.files - 1);
+                            summary.files = stream.data.files;
+                            await data.onProgress?.({
+                                current,
+                                percent: stream.data.percent,
+                                path: stream.data.path,
+                            });
+                        }
+                        await data.onStream?.(stream);
+                    }
                 },
             }),
         },
     });
+    await data.onProgress?.({
+        current: summary.files,
+        percent: 100,
+        type: "end",
+    });
+    return {
+        ...result,
+        ...summary,
+    };
 }
 exports.unzip = unzip;