@xuda.io/drive_module 1.1.796 → 1.1.798

package/index.js

@@ -679,6 +679,165 @@ exports.delete_drive_files = async function (req) {
   }
 };
 
+// exports.update_drive_file = async function (req, job_id, headers, file_obj) {
+//   try {
+//     const { drive_type, app_id, file_path, uid } = req;
+//     validate_drive_type(drive_type);
+
+//     const originalname = file_obj?.["originalname"];
+
+//     const file_name = path.basename(file_path);
+
+//     if (!originalname) {
+//       return { code: -4, data: "file data missing" };
+//     }
+
+//     let check_req = {
+//       app_id,
+//       uid,
+//       drive_type,
+
+//       file_path,
+//     };
+//     const check_existing_file_ret = await module.exports.check_drive_file(
+//       check_req
+//     );
+
+//     if (check_existing_file_ret.code > -1) {
+//       return { code: -5, data: "file not exit" };
+//     }
+
+//     var target_file = file_path;
+//     const master_id = await _common.get_project_app_id(app_id, true);
+//     const tempPath = file_obj.path;
+//     if (drive_type === "studio") {
+//       const target_dir = path.join(
+//         _conf[`studio_drive_path`],
+//         master_id,
+//         target_file
+//       );
+//       try {
+//         fse.unlinkSync(target_dir);
+//       } catch (error) {}
+
+//       fse.copyFileSync(tempPath, target_dir);
+//     }
+
+//     let doc_ret;
+
+//     switch (drive_type) {
+//       case "studio": {
+//         const app_id_reference = await _common.get_project_app_id(app_id);
+//         doc_ret = await db_module.get_app_couch_doc(
+//           app_id_reference,
+//           target_file
+//         );
+//         break;
+//       }
+//       case "workspace": {
+//         const app_id_reference = await _common.get_project_app_id(app_id);
+//         doc_ret = await db_module.get_app_couch_doc(
+//           app_id_reference,
+//           check_existing_file_ret.duplicates[0]._id
+//         );
+//         break;
+//       }
+//       case "user":
+//         doc_ret = await db_module.get_couch_doc(
+//           "xuda_drive",
+//           check_existing_file_ret.duplicates[0]._id
+//         );
+//         break;
+
+//       default:
+//         break;
+//     }
+
+//     if (doc_ret.code > -1) {
+//       var doc = doc_ret.data;
+//       doc.date_modified = Date.now();
+
+//       const fs = require("fs").promises;
+//       const stat = await fs.stat(tempPath);
+//       if (stat.isFile()) {
+//         doc.size = stat.size;
+//       }
+
+//       doc = { ...doc, ...(await get_file_info(tempPath)) };
+
+//       let save_ret;
+
+//       switch (drive_type) {
+//         case "studio": {
+//           const app_id_reference = await _common.get_project_app_id(app_id);
+//           save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
+
+//           misc_module.rsync_drive_resources_to_remote_servers(
+//             "studio",
+//             app_id_reference
+//           );
+//           break;
+//         }
+//         case "workspace": {
+//           const app_id_reference = await _common.get_project_app_id(app_id);
+//           const app_id_master = await _common.get_project_app_id(app_id, true);
+
+//           doc.bucket[`${process.env.XUDA_HOSTNAME}`] =
+//             await upload_file_to_spaces(
+//               tempPath,
+//               app_id_master,
+//               drive_type,
+//               file_name
+//             );
+
+//           save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
+//           misc_module.rsync_drive_resources_to_remote_servers(
+//             "workspace",
+//             app_id_master
+//           );
+//           break;
+//         }
+//         case "user": {
+//           doc.bucket[`${process.env.XUDA_HOSTNAME}`] =
+//             await upload_file_to_spaces(tempPath, uid, drive_type, file_name);
+//           save_ret = await db_module.save_couch_doc("xuda_drive", doc);
+//           misc_module.rsync_drive_resources_to_remote_servers("user", doc.uid);
+//           break;
+//         }
+//         default:
+//           break;
+//       }
+
+//       fse.unlinkSync(tempPath);
+
+//       if (save_ret.code < 0) {
+//         return save_ret;
+//       }
+//       const server_file_name = `https://${
+//         process.env.XUDA_HOSTNAME
+//       }/${drive_type}-drive${
+//         drive_type === "studio" ? `/${master_id}/${target_file}` : file_name
+//       }`;
+
+//       misc_module.purge_cloudflare_cache(false, server_file_name);
+//       return {
+//         code: 760,
+//         data: {
+//           server_file_name,
+//           filename: file_obj.originalname,
+//         },
+//       };
+//     } else {
+//       return {
+//         code: -760,
+//         data: "file not found",
+//       };
+//     }
+//   } catch (err) {
+//     return { code: -400, data: err };
+//   }
+// };
+
 exports.update_drive_file = async function (req, job_id, headers, file_obj) {
   try {
     const { drive_type, app_id, file_path, uid } = req;
@@ -692,20 +851,7 @@ exports.update_drive_file = async function (req, job_id, headers, file_obj) {
       return { code: -4, data: "file data missing" };
     }
 
-    let check_req = {
-      app_id,
-      uid,
-      drive_type,
-
-      file_path,
-    };
-    const check_existing_file_ret = await module.exports.check_drive_file(
-      check_req
-    );
-
-    if (check_existing_file_ret.code > -1) {
-      return { code: -5, data: "file not exit" };
-    }
+    let doc = await get_drive_doc(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);
@@ -714,7 +860,7 @@ exports.update_drive_file = async function (req, job_id, headers, file_obj) {
       const target_dir = path.join(
         _conf[`studio_drive_path`],
         master_id,
-        target_file
+        file_path
       );
       try {
         fse.unlinkSync(target_dir);
@@ -725,114 +871,78 @@ exports.update_drive_file = async function (req, job_id, headers, file_obj) {
 
     let doc_ret;
 
+    doc.date_modified = Date.now();
+
+    const fs = require("fs").promises;
+    const stat = await fs.stat(tempPath);
+    if (stat.isFile()) {
+      doc.size = stat.size;
+    }
+
+    doc = { ...doc, ...(await get_file_info(tempPath)) };
+
+    let save_ret;
+
     switch (drive_type) {
       case "studio": {
         const app_id_reference = await _common.get_project_app_id(app_id);
-        doc_ret = await db_module.get_app_couch_doc(
-          app_id_reference,
-          target_file
+        save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
+
+        misc_module.rsync_drive_resources_to_remote_servers(
+          "studio",
+          app_id_reference
         );
         break;
       }
       case "workspace": {
         const app_id_reference = await _common.get_project_app_id(app_id);
-        doc_ret = await db_module.get_app_couch_doc(
-          app_id_reference,
-          check_existing_file_ret.duplicates[0]._id
+        const app_id_master = await _common.get_project_app_id(app_id, true);
+
+        doc.bucket[`${process.env.XUDA_HOSTNAME}`] =
+          await upload_file_to_spaces(
+            tempPath,
+            app_id_master,
+            drive_type,
+            file_name
+          );
+
+        save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
+        misc_module.rsync_drive_resources_to_remote_servers(
+          "workspace",
+          app_id_master
         );
         break;
       }
-      case "user":
-        doc_ret = await db_module.get_couch_doc(
-          "xuda_drive",
-          check_existing_file_ret.duplicates[0]._id
-        );
+      case "user": {
+        doc.bucket[`${process.env.XUDA_HOSTNAME}`] =
+          await upload_file_to_spaces(tempPath, uid, drive_type, file_name);
+        save_ret = await db_module.save_couch_doc("xuda_drive", doc);
+        misc_module.rsync_drive_resources_to_remote_servers("user", doc.uid);
         break;
-
+      }
       default:
         break;
     }
 
-    if (doc_ret.code > -1) {
-      var doc = doc_ret.data;
-      doc.date_modified = Date.now();
-
-      const fs = require("fs").promises;
-      const stat = await fs.stat(tempPath);
-      if (stat.isFile()) {
-        doc.size = stat.size;
-      }
-
-      doc = { ...doc, ...(await get_file_info(tempPath)) };
-
-      let save_ret;
-
-      switch (drive_type) {
-        case "studio": {
-          const app_id_reference = await _common.get_project_app_id(app_id);
-          save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
-
-          misc_module.rsync_drive_resources_to_remote_servers(
-            "studio",
-            app_id_reference
-          );
-          break;
-        }
-        case "workspace": {
-          const app_id_reference = await _common.get_project_app_id(app_id);
-          const app_id_master = await _common.get_project_app_id(app_id, true);
-
-          doc.bucket[`${process.env.XUDA_HOSTNAME}`] =
-            await upload_file_to_spaces(
-              tempPath,
-              app_id_master,
-              drive_type,
-              file_name
-            );
-
-          save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
-          misc_module.rsync_drive_resources_to_remote_servers(
-            "workspace",
-            app_id_master
-          );
-          break;
-        }
-        case "user": {
-          doc.bucket[`${process.env.XUDA_HOSTNAME}`] =
-            await upload_file_to_spaces(tempPath, uid, drive_type, file_name);
-          save_ret = await db_module.save_couch_doc("xuda_drive", doc);
-          misc_module.rsync_drive_resources_to_remote_servers("user", doc.uid);
-          break;
-        }
-        default:
-          break;
-      }
-
-      fse.unlinkSync(tempPath);
+    fse.unlinkSync(tempPath);
 
-      if (save_ret.code < 0) {
-        return save_ret;
-      }
-      const server_file_name = `https://${
-        process.env.XUDA_HOSTNAME
-      }/${drive_type}-drive${
-        drive_type === "studio" ? `/${master_id}/${target_file}` : file_name
-      }`;
-
-      misc_module.purge_cloudflare_cache(false, server_file_name);
-      return {
-        code: 760,
-        data: {
-          server_file_name,
-          filename: file_obj.originalname,
-        },
-      };
-    } else {
-      return {
-        code: -760,
-        data: "file not found",
-      };
+    if (save_ret.code < 0) {
+      return save_ret;
     }
+    const server_file_name = `https://${
+      process.env.XUDA_HOSTNAME
+    }/${drive_type}-drive${
+      drive_type === "studio" ? `/${master_id}/${target_file}` : file_name
+    }`;
+
+    misc_module.purge_cloudflare_cache(false, server_file_name);
+    return {
+      code: 760,
+      data: {
+        server_file_name,
+        filename: file_obj.originalname,
+      },
+    };
   } catch (err) {
     return { code: -400, data: err };
   }
@@ -980,11 +1090,13 @@ exports.create_drive_folder = async function (req, job_id, headers) {
     };
   }
 };
-exports.rename_drive_file = async function (req) {
+exports.rename_drive_file = async function (req, job_id, headers) {
   try {
     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 check_req = {
       app_id,
       uid,

package/package.json

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