@xuda.io/drive_module 1.1.903 → 1.1.905

package/index.js

@@ -336,84 +336,99 @@ exports.get_drive_files = async function (req) {
     const get_user_files = async function () {
       opt.selector.docType = "user_drive";
       opt.selector.uid = uid;
-      // var opt = {
-      //   selector: {
-      //     docType: "user_drive",
-      //     stat: 3,
-      //     uid,
-      //     type,
-      //     file_path: req.path,
-      //   },
-      //   limit: to - from,
-      //   skip: from,
+      // // var opt = {
+      // //   selector: {
+      // //     docType: "user_drive",
+      // //     stat: 3,
+      // //     uid,
+      // //     type,
+      // //     file_path: req.path,
+      // //   },
+      // //   limit: to - from,
+      // //   skip: from,
+      // // };
+
+      // // if (date) {
+      // //   opt.sort = [{ date_created: "desc" }];
+      // // }
+
+      // const ret = await db_module.find_couch_query("xuda_drive", opt);
+      // const file_doc = await db_module.get_couch_doc(
+      //   "xuda_drive",
+      //   path.basename(req.path) || "/"
+      // );
+      // // console.log(file_doc);
+
+      // let files = {
+      //   name: file_doc.data.folder_name || "/",
+      //   path: req.path || "/",
+      //   file_path: req.path || "/",
+      //   sizeInBytes: 0,
+      //   children: [],
       // };
 
-      // if (date) {
-      //   opt.sort = [{ date_created: "desc" }];
+      // for await (let doc of ret.docs) {
+      //   if (doc.type === "file") {
+      //     try {
+      //       files.sizeInBytes += doc.size;
+      //       files.children.push({
+      //         name: doc.originalname,
+      //         sizeInBytes: doc.size,
+      //         size: formatBytes(doc.size),
+      //         extension: doc?.file_ext?.substr(1),
+      //         type: doc.type,
+      //         access_link: `https://${process.env.XUDA_HOSTNAME}/user-drive/${uid}/${doc._id}`,
+      //         is_archive: doc.is_archive,
+      //         public: doc.public,
+      //         path: doc.file_path, // "/" + doc._id,
+      //         date_created: doc.date_created,
+      //         file_path: path.join(doc.file_path, doc.originalname),
+      //       });
+      //     } catch (err) {
+      //       console.error(err.message);
+      //     }
+      //   }
+      //   if (doc.type === "directory") {
+      //     try {
+      //       const sizeInBytes = await get_folder_size(
+      //         req.path,
+      //         drive_type,
+      //         null,
+      //         uid
+      //       );
+      //       files.sizeInBytes += sizeInBytes;
+      //       files.children.push({
+      //         sizeInBytes,
+      //         size: formatBytes(sizeInBytes),
+      //         name: doc.folder_name,
+      //         path: "/" + doc._id,
+      //         file_path: "/" + doc._id,
+      //         date_created: doc.date_created,
+      //       });
+      //     } catch (err) {
+      //       console.error(err.message);
+      //     }
+      //   }
       // }
-
-      const ret = await db_module.find_couch_query("xuda_drive", opt);
-      const file_doc = await db_module.get_couch_doc(
-        "xuda_drive",
-        path.basename(req.path) || "/"
-      );
-      // console.log(file_doc);
-
-      let files = {
-        name: file_doc.data.folder_name || "/",
-        path: req.path || "/",
-        file_path: req.path || "/",
-        sizeInBytes: 0,
-        children: [],
+      // files.size = formatBytes(files.size);
+      // return { code: 1, data: files };
+      return {
+        code: 1,
+        data: await get_drive_files(ret, file_doc, null, uid),
       };
-
-      for await (let doc of ret.docs) {
-        if (doc.type === "file") {
-          try {
-            files.sizeInBytes += doc.size;
-            files.children.push({
-              name: doc.originalname,
-              sizeInBytes: doc.size,
-              size: formatBytes(doc.size),
-              extension: doc?.file_ext?.substr(1),
-              type: doc.type,
-              access_link: `https://${process.env.XUDA_HOSTNAME}/user-drive/${uid}/${doc._id}`,
-              is_archive: doc.is_archive,
-              public: doc.public,
-              path: doc.file_path, // "/" + doc._id,
-              date_created: doc.date_created,
-              file_path: path.join(doc.file_path, doc.originalname),
-            });
-          } catch (err) {
-            console.error(err.message);
-          }
-        }
-        if (doc.type === "directory") {
-          try {
-            const sizeInBytes = await get_folder_size(
-              req.path,
-              drive_type,
-              null,
-              uid
-            );
-            files.sizeInBytes += sizeInBytes;
-            files.children.push({
-              sizeInBytes,
-              size: formatBytes(sizeInBytes),
-              name: doc.folder_name,
-              path: "/" + doc._id,
-              file_path: "/" + doc._id,
-              date_created: doc.date_created,
-            });
-          } catch (err) {
-            console.error(err.message);
-          }
-        }
-      }
-      files.size = formatBytes(files.size);
-      return { code: 1, data: files };
     };
     const get_studio_files = async function () {
+      if (search_string) {
+        const app_id_reference = await _common.get_project_app_id(app_id);
+        opt.selector.docType = "workspace_drive";
+        const ret = await db_module.find_app_couch_query(app_id, opt);
+
+        const file_doc = await db_module.get_app_couch_doc(
+          app_id,
+          path.basename(req.path) || "/"
+        );
+      }
+
       const app_id_master = await _common.get_project_app_id(app_id, true);
 
       var directoryPath =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/drive_module",
-  "version": "1.1.903",
+  "version": "1.1.905",
   "description": "Xuda Drive Server Module",
   "main": "index.js",
   "dependencies": {