zet-lib 1.4.6 → 1.4.8

package/lib/Form.js

@@ -580,7 +580,7 @@ Form.field = (obj) => {
         countFiles == ""
           ? ""
           : `<div class="card-header">${countFiles} <div class="float-end"><span class="icon-small icons-light" title="Download"><img onclick="location.href= '/zdownloads-dropzone/${obj.routeName}/${obj.key}/${obj.dataId}'" class="icons-bg-black gridview icon-image" src="/assets/icons/download.svg"></span>  <span class="icon-small icons-light" title="Compress Images"><img onclick="if(window.confirm('Compress Images ?')) {ajaxPost('/zcompress-dropzone',{table:'${obj.routeName}',field:'${obj.key}',id:${obj.dataId}},(data) => toastrForm(data))}" class="icons-bg-black gridextract icon-image" src="/assets/icons/file-zip.svg"></span></div></div>`;
-      displayForm = `<div class="card">
+      displayForm = `<div id="div-progress"></div><div class="card">
           ${bodydropzoneview}
         <div class="card-body">`;
       if (obj.value && obj.value.length > 0) {

package/lib/zAppRouter.js

@@ -22,6 +22,7 @@ const zFunction = require("./zFunction");
 const qs = require("qs");
 const zip = require("express-zip");
 const sharp = require("sharp");
+const path = require("path");
 
 /*
  ajax Post
@@ -1750,41 +1751,107 @@ router.post("/zcompress-dropzone", async (req, res) => {
     let field = req.body.field;
     let id = req.body.id;
     const room = res.locals.token;
+    let userId = res.locals.userId;
     let result = await connection.result({
       table: table,
       where: {
         id: id,
       },
     });
+    //check for temp dir
+
     if (result.lock == 1) {
       let message = `Data has been locked, please unlock first to compress images `;
       io.to(room).emit("errormessage", message);
       res.json(Util.flashError(message));
     } else {
       const config = {
-        jpeg: { quality: 80 },
-        webp: { quality: 80 },
-        png: { compressionLevel: 8 },
+        jpeg: { quality: 50, compressionLevel: 5 },
+        webp: { quality: 50, compressionLevel: 5 },
+        png: { quality: 50, compressionLevel: 5 },
       };
-      let dir = `${dirRoot}/public/uploads/${table}/${field}/`;
+      const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+      const timeExcecute = 200;
+      const dir = path.join(dirRoot, "public", "uploads", table, field);
+      console.log(dir);
+      const timestamp = Date.now();
+      const tempDir = path.join(
+        dirRoot,
+        "public",
+        "temps",
+        `${table}___${field}___${id}___${userId}___${timestamp}`
+      );
+      if (!fs.existsSync(tempDir)) {
+        fs.mkdirSync(tempDir);
+      }
+      //let dir = `${dirRoot}/public/uploads/${table}/${field}/`;
       let arr = [];
       let files = result[field];
+      const count = files.length;
+      let i = 0;
       for (const file of files) {
-        if (Util.fileExist(dir + file)) {
-          let filename = file.substring(13);
-          //arr.push({ path: dir + file, name: filename })
-          let attributes = Util.fileAttribute(dir + file);
-          if (attributes.type == "image") {
-            const image = sharp(dir + file);
-            const meta = await image.metadata();
-            const { format } = meta;
-            await image[format](config[format]);
-            io.to(room).emit("message", `Compress file ${filename} Success...`);
+        let filename = file.substring(13);
+        let attributes = Util.fileAttribute(dir + file);
+        if (attributes.type == "image") {
+          const filePath = path.join(dir, file);
+          const tempPath = path.join(tempDir, file);
+          // Copy file to temp directory
+          fs.copyFileSync(filePath, tempPath);
+          await wait(timeExcecute); // Wait for file system
+          let image;
+          try {
+            image = sharp(tempPath);
+          } catch (error) {
+            console.log(`Skipping ${filename} - not a valid image file`);
+            io.to(room).emit(
+              "errormessage",
+              `Skipping ${filename} - not a valid image file`
+            );
+            continue;
+          }
+          const meta = await image.metadata();
+          const { format } = meta;
+          if (config[format]) {
+            try {
+              // Compress the image to a buffer
+              const compressedBuffer = await image[format](
+                config[format]
+              ).toBuffer();
+              await wait(timeExcecute); // Wait for file system
+              // Write the compressed buffer to the original file
+              fs.writeFileSync(filePath, compressedBuffer);
+              console.log(`Compressed ${filename} successfully`);
+              //io.to(room).emit('message',`Compressed ${filename} successfully`);
+              io.to(room).emit("progress", {
+                value: Math.round(((i + 1) / count) * 100),
+                style: `progress-bar progress-bar-striped bg-success`,
+                data: `Compressed ${filename} successfully`,
+              });
+            } catch (error) {
+              console.log(`Error compressing ${filename}: ${error.message}`);
+              //io.to(room).emit('errormessage',`Error compressing ${filename}: ${error.message}`);
+              io.to(room).emit("progress", {
+                value: Math.round(((i + 1) / count) * 100),
+                data: `Error compressing ${filename}: ${error.message}`,
+              });
+            }
+          } else {
+            console.log(`Error compressing ${filename}: ${error.message}`);
+            io.to(room).emit("progress", {
+              value: Math.round(((i + 1) / count) * 100),
+              data: `Skipping ${filename} - unsupported format: ${format}`,
+            });
+            //io.to(room).emit('errormessage',`Skipping ${filename} - unsupported format: ${format}`);
           }
         }
+        i++;
       }
-      io.to(room).emit("message", `Compress images completed...`);
-      res.json(Util.jsonSuccess("Compress images completed..."));
+      io.to(room).emit("progress", {
+        value: 100,
+        style: `progress-bar progress-bar-striped bg-success`,
+        data: `Compress all images complete...`,
+      });
+      res.json(Util.jsonSuccess("Compress all images completed..."));
     }
   } catch (e) {
     console.log(e);