@xuda.io/drive_module 1.1.1249 → 1.1.1250

package/index.mjs

@@ -58,7 +58,7 @@ const get_studio_path = (raw_path, ref, file_name) => {
 
 export const get_drive_files = async (req) => {
   try {
-    const { from = 0, to = 99999, drive_type, app_id, uid, type, date, search_string, sort_by = 'name', sort_dir = 'desc' } = req;
+    const { from = 0, to = 99999, drive_type, app_id, uid, type, date, search_string, sort_by = 'name', sort_dir = 'desc', path: file_path } = req;
 
     let { tags = [] } = req;
 
@@ -92,8 +92,8 @@ export const get_drive_files = async (req) => {
       sort,
     };
 
-    if (req.path) {
-      opt.selector.file_path = req.path;
+    if (file_path) {
+      opt.selector.file_path = file_path;
     }
 
     if (search_string) {
@@ -191,11 +191,12 @@ export const get_drive_files = async (req) => {
 
     const fetch_drive_files = async (ret, file_doc, app_id_reference, uid, datasource_id, domain = process.env.XUDA_HOSTNAME, app_obj) => {
       let files = {
-        path: req.path || '/',
+        path: file_path || '/',
         name: file_doc?.data?.folder_name || '/',
-        file_path: req.path || '/',
+        file_path: file_path || '/',
         sizeInBytes: 0,
         children: [],
+        path: file_path,
       };
 
       for await (let doc of ret.docs) {
@@ -230,7 +231,7 @@ export const get_drive_files = async (req) => {
         }
         if (doc.type === 'directory') {
           try {
-            const sizeInBytes = await get_folder_size(req.path, drive_type, app_id_reference, uid);
+            const sizeInBytes = await get_folder_size(file_path, drive_type, app_id_reference, uid);
             files.sizeInBytes += sizeInBytes;
             files.children.push({
               sizeInBytes,
@@ -259,7 +260,7 @@ export const get_drive_files = async (req) => {
 
       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 file_doc = await db_module.get_app_couch_doc(app_id, path.basename(file_path) || '/');
 
       const { data: app_obj } = await db_module.get_app_obj(app_id);
 
@@ -273,7 +274,7 @@ export const get_drive_files = async (req) => {
       opt.selector.docType = 'user_drive';
       opt.selector.uid = uid;
       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) || '/');
+      const file_doc = await db_module.get_couch_doc('xuda_drive', path.basename(file_path) || '/');
       return {
         code: 1,
         data: await fetch_drive_files(ret, file_doc, null, uid),
@@ -285,7 +286,7 @@ export const get_drive_files = async (req) => {
         opt.selector.docType = 'studio_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 file_doc = await db_module.get_app_couch_doc(app_id, path.basename(file_path) || '/');
 
         return {
           code: 1,
@@ -295,7 +296,7 @@ export const get_drive_files = async (req) => {
 
       const app_id_master = await _common.get_project_app_id(app_id, true);
 
-      let directoryPath = path.join(_conf.studio_drive_path, app_id_master, req.path || '/');
+      let directoryPath = path.join(_conf.studio_drive_path, app_id_master, file_path || '/');
 
       const options = {
         stat: true,
@@ -682,13 +683,13 @@ export const create_drive_folder = async (req, job_id, headers) => {
       case 'studio': {
         folder_id = req.folder_name;
         const app_id_master = await _common.get_project_app_id(app_id, true);
-        if (!req.path.includes(app_id_master)) {
+        if (!file_path.includes(app_id_master)) {
           return {
             code: -1,
             data: 'error - file path unauthorized',
           };
         }
-        target_dir = req.path + '/' + folder_id;
+        target_dir = file_path + '/' + folder_id;
         folder_exist = await file_exists(target_dir);
         if (folder_exist) {
           throw new Error('folder exist');
@@ -1011,7 +1012,7 @@ export const delete_file_bulk = async (req) => {
 
 export const upload_drive_file = async (req, job_id, headers, file_obj) => {
   try {
-    const { drive_type, app_id, uid, make_public, tags = '', reserve } = req;
+    const { drive_type, app_id, uid, make_public, tags = '', reserve, path: file_path } = req;
 
     /// validations
     validate_drive_type(drive_type);
@@ -1054,7 +1055,7 @@ export const upload_drive_file = async (req, job_id, headers, file_obj) => {
       mime: file_obj.mimetype,
       ocr_stat: ['image', 'application', 'text'].includes(file_obj.mimetype.split('/')[0]) ? 1 : 0,
       target_file,
-      file_path: req.path || '/',
+      file_path: file_path || '/',
       size: stat.isFile() ? stat.size : 0,
       public: make_public,
       tags: tags_arr,
@@ -1103,7 +1104,7 @@ export const upload_drive_file = async (req, job_id, headers, file_obj) => {
       case 'studio': {
         ref = await _common.get_project_app_id(req.app_id, true);
         const target_dir = path.join(_conf[`studio_drive_path`], ref);
-        file_name = path.join(req.path, doc.originalname);
+        file_name = path.join(file_path, doc.originalname);
 
         target_file = path.join(target_dir, file_name);
 

package/package.json

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