@xuda.io/drive_module 1.1.851 → 1.1.853

package/index.js

@@ -1721,38 +1721,48 @@ exports.search_drive_files = async function (req) {
 
   const sort_by_obj = { name: "originalname", date: "date_created" };
 
-  const protected_tags = ["tag", "name"];
+  const protected_tags = ["tag:", "name:"];
 
   if (protected_tags.includes(search_string)) {
     // var og_search = ""
-    let search_obj = search_string.split(" ").reduce((ret, val) => {
+    let tags_query = search_string.split(" ").filter(e => e.includes(':')).reduce((ret, val) => {
       var tagKey = val.split(":")[0];
       var tagVal = val.split(":")[1];
 
       if (!ret[tagKey]) ret[tagKey] = [];
 
       if (tagVal) {
-        ret[tagKey].push({ $or: tagVal });
+        if(tagKey === 'tags'){
+
+          ret[tagKey].push({tags: { $in:tagVal} });
+        } 
+        else{ 
+          ret[tagKey].push({ $or: {$regex:tagVal} });
+        }
       } else {
         og_search += og_search;
       }
 
-      // $or: [
-      //   {
-      //     ocr: {
-      //       $regex: `(?i)${req.search_string}`,
-      //     },
-      //   },
-      //   {
-      //     originalname: {
-      //       $regex: `(?i)${req.search_string}`,
-      //     },
-      //   },
-      // ],
-      // };
 
       return ret;
     }, {});
+
+   var new_search =  search_string.split(" ").filter(e => !e.includes(':')).filter(e=>e).join(' ')
+   tags_query.$or=  [
+    {
+      ocr: {
+        $regex: `(?i)${new_search}`,
+      },
+    },
+    {
+      originalname: {
+        $regex: `(?i)${new_search}`,
+      },
+    },
+  ],
+       
+
+
   }
   try {
     validate_drive_type(drive_type);

package/package.json

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