@xuda.io/drive_module 1.1.1013 → 1.1.1015

package/index.js

@@ -158,21 +158,22 @@ exports.get_drive_files = async function (req) {
         .filter((e) => !e.includes(":"))
         .filter((e) => e)
         .join(" ");
-
-      tags_query.$or = [
-        ...tags_query.$or,
-        {
-          ocr: {
-            $regex: `(?i)${new_search}`,
+      if (mix_conditions) {
+        tags_query.$or = [
+          ...tags_query.$or,
+          {
+            ocr: {
+              $regex: `(?i)${new_search}`,
+            },
           },
-        },
-        {
-          originalname: {
-            $regex: `(?i)${new_search}`,
+          {
+            originalname: {
+              $regex: `(?i)${new_search}`,
+            },
           },
-        },
-      ];
-      opt.selector = { ...opt.selector, ...tags_query };
+        ];
+        opt.selector = { ...opt.selector, ...tags_query };
+      }
     }
 
     if (tags?.length) {
@@ -646,150 +647,6 @@ exports.get_drive_file_info = async function (req, job_id, headers) {
     };
   }
 };
-// exports.delete_drive_files = async function (req) {
-//   try {
-//     const { drive_type, app_id, files_arr } = req;
-//     validate_drive_type(drive_type);
-
-//     if (!Array.isArray(files_arr)) {
-//       return {
-//         code: -400,
-//         data: "error - files_arr must be Array",
-//       };
-//     }
-
-//     let doc_ret;
-//     for await (const file of files_arr) {
-
-//       let doc = await get_drive_doc(
-//         "file",
-//         drive_type,
-//         app_id,
-//         uid,
-//         file.file_path,
-//         headers
-//       );
-
-//       switch (drive_type) {
-//         case "studio": {
-//           const app_id_master = await _common.get_project_app_id(app_id);
-//           doc_ret = await db_module.get_app_couch_doc(
-//             app_id_master,
-//             path.basename(file.path)
-//           );
-
-//           const ret = rimraf.sync(file.path); // delete the file
-//           if (doc_ret.code > -1) {
-//             if (doc_ret.data.type === "directory") {
-//               const docs = await get_folder_docs(
-//                 path.basename(file.path),
-//                 drive_type,
-//                 app_id_master
-//               );
-//               for await (let doc of docs) {
-//                 doc._deleted = true;
-//                 await db_module.save_app_couch_doc(app_id_master, doc);
-//               }
-//             }
-
-//             doc_ret.data._deleted = true;
-//             save_ret = await db_module.save_app_couch_doc(
-//               app_id_master,
-//               doc_ret.data
-//             );
-//           }
-
-//           misc_module.rsync_drive_resources_to_remote_servers(
-//             "studio",
-//             app_id_master
-//           );
-//           break;
-//         }
-
-//         case "workspace": {
-//           const app_id_reference = await _common.get_project_app_id(app_id);
-
-//           doc_ret = await db_module.get_app_couch_doc(
-//             app_id_reference,
-//             path.basename(file.path)
-//           );
-
-//           if (doc_ret.data.type === "file") {
-//             await module.exports.delete_file_from_bucket(doc_ret.data.bucket);
-//           }
-//           if (doc_ret.data.type === "directory") {
-//             const docs = await get_folder_docs(
-//               path.basename(file.path),
-//               drive_type,
-//               app_id_reference
-//             );
-//             for await (let doc of docs) {
-//               if (doc.type === "file") {
-//                 await module.exports.delete_file_from_bucket(doc.bucket);
-//               }
-//               doc.ts = Date.now();
-//               doc.stat = 4;
-//               await db_module.save_app_couch_doc(app_id_reference, doc);
-//             }
-//           }
-
-//           doc_ret.data.ts = Date.now();
-//           doc_ret.data.stat = 4;
-//           save_ret = await db_module.save_app_couch_doc(
-//             app_id_reference,
-//             doc_ret.data
-//           );
-
-//           misc_module.rsync_drive_resources_to_remote_servers(
-//             "workspace",
-//             app_id_reference
-//           );
-//           break;
-//         }
-
-//         case "user": {
-//           doc_ret = await db_module.get_couch_doc("xuda_drive", file.name);
-//           if (doc_ret.data.type === "file") {
-//             await module.exports.delete_file_from_bucket(doc_ret.data.bucket);
-//           }
-//           if (doc_ret.data.type === "directory") {
-//             const docs = await get_folder_docs(
-//               path.basename(file.path),
-//               drive_type,
-//               null
-//             );
-//             for await (let doc of docs) {
-//               if (doc.type === "file") {
-//                 await module.exports.delete_file_from_bucket(doc.bucket);
-//               }
-//               doc.ts = Date.now();
-//               doc.stat = 4;
-//               await db_module.save_couch_doc("xuda_drive", doc);
-//             }
-//           }
-//           doc_ret.data.ts = Date.now();
-//           doc_ret.data.stat = 4;
-//           save_ret = await db_module.save_couch_doc("xuda_drive", doc_ret.data);
-
-//           misc_module.rsync_drive_resources_to_remote_servers(
-//             "user",
-//             doc_ret.data.uid
-//           );
-//           break;
-//         }
-//         default:
-//           break;
-//       }
-//     }
-
-//     return {
-//       code: 200,
-//       data: req.files_arr,
-//     };
-//   } catch (err) {
-//     return { code: -1, data: err.message };
-//   }
-// };
 
 exports.delete_drive_files = async function (req, job_id, headers) {
   try {
@@ -2021,291 +1878,12 @@ exports.run_drive_pending_ocr = async function (req) {
   }
 };
 
-// exports.search_drive_files = async function (req) {
-//   const {
-//     drive_type,
-//     app_id,
-//     search_name,
-//     search_string,
-//     date_from,
-//     date_to,
-//     mime_type,
-//     file_ext,
-//     type,
-
-//     sort_by = "name",
-//     sort_dir = "desc",
-//     path = "/",
-//   } = req;
-
-//   let { tags = [] } = req;
-
-//   let { limit = 100 } = req;
-//   let tags_query = {};
-//   const sort_by_obj = { name: "originalname", date: "date_created" };
-
-//   // const protected_tags = ["tag:", "name:"];
-
-//   if (search_string) {
-//     // var og_search = ""
-//     tags_query = search_string
-//       .split(" ")
-//       .filter((e) => e.includes(":"))
-//       .reduce(
-//         (ret, val) => {
-//           var tagKey = val.split(":")[0];
-//           var tagVal = val.split(":")[1];
-
-//           if (tagKey === "tag") {
-//             tags.push(tagVal);
-//           }
-
-//           if (tagKey === "name") {
-//             // ret.$or.push(
-//             //   {
-//             //     ocr: {
-//             //       $regex: `(?i)${new_search}`,
-//             //     },
-//             //   },
-//             //   {
-//             //     originalname: {
-//             //       $regex: `(?i)${new_search}`,
-//             //     },
-//             //   }
-//             // );
-//             ret.$or.push({ originalname: { $regex: `(?i)${tagVal}` } });
-//           }
-
-//           return ret;
-//         },
-//         {
-//           $or: [],
-//         }
-//       );
-
-//     var new_search = search_string
-//       .split(" ")
-//       .filter((e) => !e.includes(":"))
-//       .filter((e) => e)
-//       .join(" ");
-
-//     tags_query.$or = [
-//       ...tags_query.$or,
-//       {
-//         ocr: {
-//           $regex: `(?i)${new_search}`,
-//         },
-//       },
-//       {
-//         originalname: {
-//           $regex: `(?i)${new_search}`,
-//         },
-//       },
-//     ];
-//   }
-//   try {
-//     validate_drive_type(drive_type);
-
-//     if (!search_name && !search_string && !tags?.length) {
-//       // throw new Error("search too broad");
-//       limit = 25;
-//     }
-
-//     var search_results = [];
-
-//     let selector = {
-//       docType: `${drive_type}_drive`,
-//       stat: 3,
-//       $and: [],
-//       file_path: path,
-//       ...tags_query,
-//     };
-
-//     if (type) {
-//       selector.type = type;
-//     }
-
-//     if (date_from || date_to) {
-//       if (date_to < date_from) {
-//         throw new Error("invalid date_from and date_to range");
-//       }
-
-//       selector.$and.push({
-//         date_created: {
-//           $lte: date_to,
-//           $gte: date_from,
-//         },
-//       });
-//     }
-
-//     if (search_name) {
-//       selector.originalname = {
-//         $regex: `(i)^${req.search_string}`,
-//       };
-//     }
-
-//     if (mime_type) {
-//       selector.mime = mime_type;
-//     }
-
-//     if (file_ext) {
-//       selector.file_ext = file_ext;
-//     }
-
-//     // if (req.search_string) {
-//     //   selector = {
-//     //     ...selector,
-//     //     $or: [
-//     //       {
-//     //         ocr: {
-//     //           $regex: `(?i)${req.search_string}`,
-//     //         },
-//     //       },
-//     //       {
-//     //         originalname: {
-//     //           $regex: `(?i)${req.search_string}`,
-//     //         },
-//     //       },
-//     //     ],
-//     //   };
-//     // }
-
-//     if (tags?.length) {
-//       selector.tags = {
-//         $in: tags,
-//       };
-//     }
-
-//     var opt = {
-//       selector,
-//       limit,
-//       fields: [
-//         "originalname",
-//         "date_created",
-//         "server_file_name",
-//         "is_folder",
-//         "file_ext",
-//         "mime",
-//         "size",
-//       ],
-//       sort: [{ [sort_by_obj[sort_by]]: sort_dir }],
-//     };
-
-//     console.log("opt", opt);
-
-//     const alias_results = (docs) => {
-//       return docs.map((doc) => {
-//         return {
-//           name: doc.originalname,
-//           path: doc.server_file_name,
-//           type: doc.is_folder ? "directory" : "file", //type ||
-//           file_url: get_file_url(drive_type, doc.server_file_name, ref),
-//           mime: doc.mime,
-//           file_ext: doc?.file_ext?.substr(1),
-//           size: doc.size,
-//           date: doc.date_created,
-//         };
-//       });
-//     };
-
-//     var ref;
-//     switch (drive_type) {
-//       case "workspace": {
-//         ref = app_id;
-//         const app_id_reference = await _common.get_project_app_id(app_id);
-//         search_results = alias_results(
-//           (await db_module.find_app_couch_query(app_id_reference, opt)).docs
-//         );
-//         break;
-//       }
-
-//       case "user": {
-//         ref = uid;
-//         search_results = alias_results(
-//           (await db_module.find_couch_query("xuda_drive", opt)).docs
-//         );
-//         break;
-//       }
-
-//       case "studio": {
-//         ref = app_id;
-//         const directoryPath = path.join(_conf[`studio_drive_path`], app_id);
-
-//         const options = {
-//           stat: false,
-//           symbolicLinks: false,
-//           size: true,
-//           hash: false,
-//         };
-//         const dree_ret = await fs_module.dree_scan(directoryPath, options);
-//         var tree = dree_ret.data;
-
-//         function findInName(obj, maxResults = limit) {
-//           let results = [];
-
-//           // Function to search within an individual object
-//           function searchInObject(o) {
-//             // Stop the recursion if we already have maxResults
-//             if (results.length >= maxResults) {
-//               return;
-//             }
-//             if (
-//               o.name &&
-//               ((search_string && o.name.includes(search_string)) ||
-//                 (search_name && o.name.startsWith(search_name)))
-//             ) {
-//               results.push({ name: o.name, path: o.path, type: o.type });
-//             }
-//             if (o.children) {
-//               if (Array.isArray(o.children)) {
-//                 o.children.forEach((child) => searchInObject(child));
-//               } else {
-//                 searchInObject(o.children);
-//               }
-//             }
-//           }
-
-//           searchInObject(obj);
-//           return results;
-//         }
-
-//         search_results = findInName(tree);
-
-//         break;
-//       }
-
-//       default:
-//         throw new Error("drive_type error");
-//         break;
-//       // }
-//     }
-//     // console.log(search_results);
-//     return {
-//       code: 200,
-//       data: search_results,
-//     };
-//   } catch (err) {
-//     // return err.message;
-//     return {
-//       code: -200,
-//       data: err.message,
-//     };
-//   }
-// };
-
 exports.get_drive_size = async function (req) {
   try {
     const { drive_type, app_id, uid } = req;
     let size = 0;
     // validate_drive_type(drive_type);
 
-    // var ref;
-    // if (drive_type === "user") {
-    //   ref = uid;
-    // } else {
-    //   ref = await _common.get_project_app_id(app_id, true);
-    // }
-
     let app_id_master, directoryPath;
     switch (drive_type) {
       case "user":
@@ -2556,7 +2134,7 @@ const get_folder_docs = async function (dir, drive_type, app_id) {
 exports.update_drive_file_tags = async function (req, job_id, headers) {
   try {
     const { type, drive_type, app_id, uid, file_path, tags = [] } = req;
-    // const file_name = path.basename(file_path);
+
     validate_drive_type(drive_type);
 
     let doc = await get_drive_doc(

package/package.json

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