@xuda.io/drive_module 1.1.832 → 1.1.834

package/index.js

@@ -510,7 +510,14 @@ exports.get_drive_file_info = async function (req, job_id, headers) {
   try {
     const { type, drive_type, uid, app_id, file_path } = req;
 
-    let doc = await get_drive_doc(drive_type, app_id, uid, file_path, headers);
+    let doc = await get_drive_doc(
+      type,
+      drive_type,
+      app_id,
+      uid,
+      file_path,
+      headers
+    );
 
     delete doc._id;
     delete doc._rev;
@@ -860,7 +867,14 @@ exports.update_drive_file = async function (req, job_id, headers, file_obj) {
       return { code: -4, data: "file data missing" };
     }
 
-    let doc = await get_drive_doc(drive_type, app_id, uid, file_path, headers);
+    let doc = await get_drive_doc(
+      type,
+      drive_type,
+      app_id,
+      uid,
+      file_path,
+      headers
+    );
 
     var target_file = file_path;
     const master_id = await _common.get_project_app_id(app_id, true);
@@ -1102,7 +1116,14 @@ exports.rename_drive_file = async function (req, job_id, headers) {
     const { drive_type, app_id, file_name_to, file_path } = req;
     validate_drive_type(drive_type);
 
-    let doc = await get_drive_doc(drive_type, app_id, uid, file_path, headers);
+    let doc = await get_drive_doc(
+      "file",
+      drive_type,
+      app_id,
+      uid,
+      file_path,
+      headers
+    );
 
     if (drive_type === "studio") {
       await fs_module.rename(file_path, file_name_to);
@@ -1260,11 +1281,18 @@ exports.rename_drive_folder = async function (req) {
 };
 exports.update_drive_file_sharing_mode = async function (req, job_id, headers) {
   try {
-    const { drive_type, uid, app_id, file_path, is_public } = req;
+    const { type, drive_type, uid, app_id, file_path, is_public } = req;
 
     validate_drive_type(drive_type);
 
-    let doc = await get_drive_doc(drive_type, app_id, uid, file_path, headers);
+    let doc = await get_drive_doc(
+      type,
+      drive_type,
+      app_id,
+      uid,
+      file_path,
+      headers
+    );
 
     doc.ts = Date.now();
     doc.public = is_public;
@@ -1401,7 +1429,14 @@ exports.extract_drive_file = async function (req, job_id, headers) {
   const app_id_master = await _common.get_project_app_id(app_id, true);
   const app_id_reference = await _common.get_project_app_id(app_id);
 
-  let doc = await get_drive_doc(drive_type, app_id, uid, file_path, headers);
+  let doc = await get_drive_doc(
+    "file",
+    drive_type,
+    app_id,
+    uid,
+    file_path,
+    headers
+  );
 
   const ext = path.extname(file_path).toLowerCase();
 
@@ -1858,91 +1893,7 @@ exports.check_drive_file = async function (req, job_id, headers, file_obj) {
     data: "ok",
   };
 };
-// exports.check_drive_file = async function (req, job_id, headers, file_obj) {
-//   const { drive_type, app_id, uid, file_name, file_path } = req;
-//   var master_app_id;
-
-//   if (["studio", "workspace"].includes(drive_type)) {
-//     master_app_id = await _common.get_project_app_id(app_id, true);
-//   }
-//   let doc = await get_drive_doc(drive_type, app_id, uid, file_path, headers);
-
-//   switch (drive_type) {
-//     case "studio": {
-//       const target_dir = path.join(_conf[`studio_drive_path`], master_app_id);
-
-//       target_file = path.join(
-//         file_path !== "/" ? file_path : target_dir,
-//         file_name
-//       );
-
-//       if (await fs_module.file_exists(target_file)) {
-//         return {
-//           code: -764,
-//           data: "file exist",
-//         };
-//       }
-
-//       break;
-//     }
-//     case "workspace": {
-//       const workspace_drive_res = await db_module.find_app_couch_query(
-//         master_app_id,
-//         {
-//           selector: {
-//             docType: "workspace_drive",
-//             originalname: file_name,
-//             file_path,
-//             stat: 3,
-//           },
-//           limit: 99,
-//         }
-//       );
-//       if (workspace_drive_res.docs.length) {
-//         return {
-//           code: -764,
-//           data: "file exist",
-//           duplicates: workspace_drive_res.docs,
-//         };
-//       }
-
-//       break;
-//     }
-//     case "user": {
-//       const user_drive_res = await db_module.find_couch_query("xuda_drive", {
-//         selector: {
-//           docType: "user_drive",
-//           originalname: file_name,
-//           file_path,
-//           uid,
-//           stat: 3,
-//         },
-//         limit: 99,
-//       });
-//       if (user_drive_res.docs.length) {
-//         return {
-//           code: -764,
-//           data: "file exist",
-//           duplicates: user_drive_res.docs,
-//         };
-//       }
 
-//       break;
-//     }
-
-//     default:
-//       return {
-//         code: -764,
-//         data: "invalid method",
-//       };
-//       break;
-//   }
-
-//   return {
-//     code: 764,
-//     data: "ok",
-//   };
-// };
 const ocr_drive_file = async function (doc) {
   const { drive_type, target_file } = doc;
   var doc_ret;
@@ -2654,6 +2605,7 @@ const get_drive_doc = async function (
     uid,
     drive_type,
     file_path,
+    type,
   };
   const check_existing_file_ret = await module.exports.check_drive_file(
     check_req

package/package.json

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