zet-lib 1.4.27 → 1.5.0

package/lib/zAppRouter.js

@@ -1873,72 +1873,33 @@ router.post(
   zDropbox.handleTokenRefresh,
   async (req, res) => {
     let datas = {};
-    const room = res.locals.token;
-    const { fileName, table, field } = req.body;
-    let dir = `/${table}/${field}`;
-    let pathFile = `${dir}/${fileName}`;
-    console.log(pathFile);
     try {
-      const metadata = await dbx.filesGetMetadata({
-        path: pathFile,
-      });
-      let link = ``;
-      try {
-        const response = await dbx.filesGetTemporaryLink({
-          path: pathFile,
-        });
-        link = response.result.link;
-      } catch (error) {
+      const room = res.locals.token;
+      const index = req.params.index;
+      const { fileName, table, field } = req.body;
+      let dir = `/${table}/${field}`;
+      let pathFile = `${dir}/${fileName}`;
+      console.log(pathFile);
+      let jsonMessage = await zDropbox.file(fileName, table, field, index);
+      if (jsonMessage.status == 1) {
+        res.json(jsonMessage.datas);
+      } else {
         setTimeout(async () => {
-          try {
-            const response = await dbx.filesGetTemporaryLink({
-              path: pathFile,
-            });
-            link = response.result.link;
-            const mockFile = {
-              name: metadata.result.name,
-              id: metadata.result,
-              path: metadata.result.path_display,
-              link: link,
-              isImage: metadata.result.name.match(/\.(jpg|jpeg|png|gif)$/i),
-              size: metadata.result.size,
-              modified: metadata.result.server_modified,
-              accepted: true,
-              index: req.params.index,
-            };
-            //console.log(mockFile)
-            datas = mockFile;
-            res.json(datas);
-          } catch (e) {
-            console.error("Error getting temporary link:", error);
+          jsonMessage = await zDropbox.file(fileName, table, field, index);
+          if (jsonMessage.status == 1) {
+            res.json(jsonMessage.datas);
+          } else {
             io.to(room).emit(
               "errormessage",
-              `Please reload your browser, Error getting temporary link:  ${error.message}`
+              `Please reload your browser !! Error ${pathFile} not exist in dropbox, `
             );
           }
-        }, 2000);
+        }, 4000);
       }
-      const mockFile = {
-        name: metadata.result.name,
-        id: metadata.result,
-        path: metadata.result.path_display,
-        link: link,
-        isImage: metadata.result.name.match(/\.(jpg|jpeg|png|gif)$/i),
-        size: metadata.result.size,
-        modified: metadata.result.server_modified,
-        accepted: true,
-        index: req.params.index,
-      };
-      //console.log(mockFile)
-      datas = mockFile;
     } catch (e) {
       console.log(e);
-      io.to(room).emit(
-        "errormessage",
-        `${e.message} Error ${pathFile} not exist in dropbox, Please reload your browser !!`
-      );
+      res.json(datas);
     }
-    res.json(datas);
   }
 );
 

package/lib/zDropbox.js

@@ -131,4 +131,43 @@ zDropbox.deleteFolder = async (dir) => {
   }
 };
 
+zDropbox.file = async (fileName, table, field, index) => {
+  let jsonMessage = Util.flashError("Error");
+  let datas = {};
+  jsonMessage.datas = datas;
+  let dir = `/${table}/${field}`;
+  let pathFile = `${dir}/${fileName}`;
+  try {
+    const metadata = await dbx.filesGetMetadata({
+      path: pathFile,
+    });
+    let link = ``;
+    try {
+      const response = await dbx.filesGetTemporaryLink({
+        path: pathFile,
+      });
+      link = response.result.link;
+      const mockFile = {
+        name: metadata.result.name,
+        id: metadata.result,
+        path: metadata.result.path_display,
+        link: link,
+        isImage: metadata.result.name.match(/\.(jpg|jpeg|png|gif)$/i),
+        size: metadata.result.size,
+        modified: metadata.result.server_modified,
+        accepted: true,
+        index: index,
+      };
+      //console.log(mockFile)
+      jsonMessage = Util.jsonSuccess("Success");
+      jsonMessage.datas = mockFile;
+    } catch (error) {
+      console.log(error);
+    }
+  } catch (e) {
+    console.log(e);
+  }
+
+  return jsonMessage;
+};
 module.exports = zDropbox;

package/lib/zRoute.js

@@ -4898,17 +4898,7 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
         //console.log('has dropbox')
         let dir1 = `/${MYMODEL.table}/${key}`;
         let dir2 = `/temps/${MYMODEL.table}/${key}/${userId}`;
-        try {
-          await dbx.filesCreateFolderV2({
-            path: dir1,
-            autorename: false,
-          });
-        } catch (error) {
-          if (error.status !== 409) {
-            // 409 means folder already exists
-            //throw error;
-          }
-        }
+        await zDropbox.ensureFolder(dir1);
         let name = `dropbox__${userId}__${MYMODEL.table}__${key}__${whereData.id}`;
         if (myCache.has(name)) {
           let arr = myCache.get(name) || [];
@@ -4936,11 +4926,17 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
                 const finalPath = metadata.result.path_display;
                 if (finalPath) {
                   let newItem = Util.cleanString(time + item);
-                  newArr.push(newItem);
                   movDropboxArr.push({
                     from_path: `${dir2}/${item}`,
+                    from_dir: dir2,
                     to_path: `${dir1}/${newItem}`,
+                    to_dir: dir1,
                   });
+                  newArr.push(newItem);
+                  /*movDropboxArr.push({
+                    from_path: `${dir2}/${item}`,
+                    to_path: `${dir1}/${newItem}`,
+                  });*/
                 }
               } catch (e) {
                 console.log(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.4.27",
+  "version": "1.5.0",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"