@xuda.io/drive_module 1.1.922 → 1.1.924

package/index.js

@@ -40,7 +40,7 @@ const fs = require("fs");
   "rename_drive_folder",
   "update_drive_file_sharing_mode",
   "delete_file_bulk",
-  "search_drive_files",
+
   "check_drive_file",
   "update_drive_file_tags",
 ].forEach((method) => {
@@ -58,7 +58,7 @@ const fs = require("fs");
         ![
           "get_drive_files",
           "get_drive_file_info",
-          "search_drive_files",
+
           "check_drive_file",
         ].includes(method)
       ) {
@@ -1976,7 +1976,7 @@ exports.run_drive_pending_ocr = async function (req) {
       const app_drive_res = await db_module.find_app_couch_query(app._id, opt);
       for await (let doc of app_drive_res.docs) {
         console.log(doc);
-        await ocr_drive_file(doc);
+        await ocr_drive_file(opt, doc);
       }
     }
   } catch (err) {
@@ -1984,277 +1984,277 @@ 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:"];
-  debugger;
-  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;
-    }
+// 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 (date_from || date_to) {
-      if (date_to < date_from) {
-        throw new Error("invalid date_from and date_to range");
-      }
+//           if (tagKey === "name") {
+//             // ret.$or.push(
+//             //   {
+//             //     ocr: {
+//             //       $regex: `(?i)${new_search}`,
+//             //     },
+//             //   },
+//             //   {
+//             //     originalname: {
+//             //       $regex: `(?i)${new_search}`,
+//             //     },
+//             //   }
+//             // );
+//             ret.$or.push({ originalname: { $regex: `(?i)${tagVal}` } });
+//           }
 
-      selector.$and.push({
-        date_created: {
-          $lte: date_to,
-          $gte: date_from,
-        },
-      });
-    }
+//           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) {
-      selector.originalname = {
-        $regex: `(i)^${req.search_string}`,
-      };
-    }
+//     if (!search_name && !search_string && !tags?.length) {
+//       // throw new Error("search too broad");
+//       limit = 25;
+//     }
 
-    if (mime_type) {
-      selector.mime = mime_type;
-    }
+//     var search_results = [];
 
-    if (file_ext) {
-      selector.file_ext = file_ext;
-    }
+//     let selector = {
+//       docType: `${drive_type}_drive`,
+//       stat: 3,
+//       $and: [],
+//       file_path: path,
+//       ...tags_query,
+//     };
 
-    // if (req.search_string) {
-    //   selector = {
-    //     ...selector,
-    //     $or: [
-    //       {
-    //         ocr: {
-    //           $regex: `(?i)${req.search_string}`,
-    //         },
-    //       },
-    //       {
-    //         originalname: {
-    //           $regex: `(?i)${req.search_string}`,
-    //         },
-    //       },
-    //     ],
-    //   };
-    // }
+//     if (type) {
+//       selector.type = type;
+//     }
 
-    if (tags?.length) {
-      selector.tags = {
-        $in: tags,
-      };
-    }
+//     if (date_from || date_to) {
+//       if (date_to < date_from) {
+//         throw new Error("invalid date_from and date_to range");
+//       }
 
-    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 }],
-    };
+//       selector.$and.push({
+//         date_created: {
+//           $lte: date_to,
+//           $gte: date_from,
+//         },
+//       });
+//     }
 
-    console.log("opt", opt);
+//     if (search_name) {
+//       selector.originalname = {
+//         $regex: `(i)^${req.search_string}`,
+//       };
+//     }
 
-    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,
-        };
-      });
-    };
+//     if (mime_type) {
+//       selector.mime = mime_type;
+//     }
 
-    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;
-      }
+//     if (file_ext) {
+//       selector.file_ext = file_ext;
+//     }
 
-      case "user": {
-        ref = uid;
-        search_results = alias_results(
-          (await db_module.find_couch_query("xuda_drive", opt)).docs
-        );
-        break;
-      }
+//     // 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,
+//       };
+//     }
 
-      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;
+//     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;
+//       }
 
-        function findInName(obj, maxResults = limit) {
-          let results = [];
+//       case "user": {
+//         ref = uid;
+//         search_results = alias_results(
+//           (await db_module.find_couch_query("xuda_drive", opt)).docs
+//         );
+//         break;
+//       }
 
-          // 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);
-              }
-            }
-          }
+//       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;
-        }
+//           searchInObject(obj);
+//           return results;
+//         }
 
-        search_results = findInName(tree);
+//         search_results = findInName(tree);
 
-        break;
-      }
+//         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,
-    };
-  }
-};
+//       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 {

package/package.json

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