@xuda.io/drive_module 1.1.811 → 1.1.813

package/index.js

@@ -1433,11 +1433,6 @@ exports.extract_drive_file = async function (req, job_id, headers) {
             ext;
         }
 
-        // const folder_name = fileName.replaceAll("/", "");
-        // doc.drive_type === "studio"
-        //   ? fileName
-        //   : "drive_folder_" + crypto.randomUUID();
-
         const folder_name =
           "drive_folder_" +
           (doc.drive_type === "studio"
@@ -1774,6 +1769,7 @@ exports.upload_drive_file = async function (req, job_id, headers, file_obj) {
 };
 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)) {
@@ -1784,10 +1780,7 @@ exports.check_drive_file = async function (req, job_id, headers, file_obj) {
     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
-      );
+      target_file = path.join(target_dir, file_path);
 
       if (await fs_module.file_exists(target_file)) {
         return {
@@ -1804,8 +1797,8 @@ exports.check_drive_file = async function (req, job_id, headers, file_obj) {
         {
           selector: {
             docType: "workspace_drive",
-            originalname: file_name,
-            file_path,
+            originalname: path.basename(file_path),
+            file_path:path.dirname(file_path);,
             stat: 3,
           },
           limit: 99,
@@ -1856,6 +1849,91 @@ 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;

package/package.json

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