@xuda.io/drive_module 1.1.800 → 1.1.802

package/index.js

@@ -1107,31 +1107,29 @@ exports.rename_drive_file = async function (req, job_id, headers) {
       delete doc._rev;
     }
 
-    if (doc_ret.code > -1) {
-      var doc = doc_ret.data;
-      doc.date_modified = Date.now();
-      doc.originalname = file_name_to;
-      let save_ret;
+    doc.date_modified = Date.now();
+    doc.originalname = file_name_to;
+    let save_ret;
 
-      switch (drive_type) {
-        case "workspace":
-        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);
-          break;
+    switch (drive_type) {
+      case "workspace":
+      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);
+        break;
 
-        case "user":
-          save_ret = await db_module.save_couch_doc("xuda_drive", doc);
-          break;
+      case "user":
+        save_ret = await db_module.save_couch_doc("xuda_drive", doc);
+        break;
 
-        default:
-          break;
-      }
+      default:
+        break;
+    }
 
-      if (save_ret.code < 0) {
-        throw new Error(save_ret.data);
-      }
+    if (save_ret.code < 0) {
+      throw new Error(save_ret.data);
     }
+
     return {
       code: 200,
       data: file_name_to,
@@ -1259,94 +1257,9 @@ exports.update_drive_file_sharing_mode = async function (req, job_id, headers) {
 
     validate_drive_type(drive_type);
 
-    const file_name = path.basename(file_path);
-
-    let check_req = {
-      app_id,
-      uid,
-      drive_type,
-      file_path,
-    };
-    const check_existing_file_ret = await module.exports.check_drive_file(
-      check_req
-    );
-
-    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,
-          file_path
-        );
-        break;
-      }
-      case "user":
-        doc_ret = await db_module.get_couch_doc(
-          "xuda_drive",
-          check_existing_file_ret.duplicates[0]._id
-        );
-        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;
-      }
-      default:
-        break;
-    }
-
-    var doc = doc_ret.data;
-
-    if (doc_ret.code < 0 && drive_type === "studio") {
-      const ext = path.extname(file_name).toLowerCase();
-      doc = {
-        _id: file_name,
-        docType: `${drive_type}_drive`,
-        stat: 3,
-        server_file_name: file_name,
-        originalname: file_name,
-        uid,
-        date_created: Date.now(),
-        ip: headers["cf-connecting-ip"],
-        country: headers["cf-ipcountry"],
-        file_ext: ext,
-        is_archive: _conf.archive_drive_ext.includes(ext) ? true : false,
-        drive_type,
-      };
-
-      // if (drive_type === "studio" || drive_type === "workspace") {
-      doc.app_id = await _common.get_project_app_id(app_id);
-      doc.app_id_reference = await _common.get_project_app_id(app_id, true);
-      // }
-
-      // let save_ret;
-
-      // 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);
-
-      // switch (drive_type) {
-      //   case "workspace":
-      //   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);
-      //     break;
-
-      //   case "user":
-      //     save_ret = await db_module.save_couch_doc("xuda_drive", doc);
-      //     break;
+    let doc = await get_drive_doc(drive_type, app_id, uid, file_path, headers);
 
-      //   default:
-      //     break;
-      // }
-      // return save_ret;
-    }
+    const file_name = path.basename(file_path);
 
     doc.ts = Date.now();
     doc.public = is_public;
@@ -1373,6 +1286,126 @@ exports.update_drive_file_sharing_mode = async function (req, job_id, headers) {
     return err.message;
   }
 };
+// exports.update_drive_file_sharing_mode = async function (req, job_id, headers) {
+//   try {
+//     const { drive_type, uid, app_id, file_path, is_public } = req;
+
+//     validate_drive_type(drive_type);
+
+//     const file_name = path.basename(file_path);
+
+//     let check_req = {
+//       app_id,
+//       uid,
+//       drive_type,
+//       file_path,
+//     };
+//     const check_existing_file_ret = await module.exports.check_drive_file(
+//       check_req
+//     );
+
+//     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,
+//           file_path
+//         );
+//         break;
+//       }
+//       case "user":
+//         doc_ret = await db_module.get_couch_doc(
+//           "xuda_drive",
+//           check_existing_file_ret.duplicates[0]._id
+//         );
+//         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;
+//       }
+//       default:
+//         break;
+//     }
+
+//     var doc = doc_ret.data;
+
+//     if (doc_ret.code < 0 && drive_type === "studio") {
+//       const ext = path.extname(file_name).toLowerCase();
+//       doc = {
+//         _id: file_name,
+//         docType: `${drive_type}_drive`,
+//         stat: 3,
+//         server_file_name: file_name,
+//         originalname: file_name,
+//         uid,
+//         date_created: Date.now(),
+//         ip: headers["cf-connecting-ip"],
+//         country: headers["cf-ipcountry"],
+//         file_ext: ext,
+//         is_archive: _conf.archive_drive_ext.includes(ext) ? true : false,
+//         drive_type,
+//       };
+
+//       // if (drive_type === "studio" || drive_type === "workspace") {
+//       doc.app_id = await _common.get_project_app_id(app_id);
+//       doc.app_id_reference = await _common.get_project_app_id(app_id, true);
+//       // }
+
+//       // let save_ret;
+
+//       // 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);
+
+//       // switch (drive_type) {
+//       //   case "workspace":
+//       //   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);
+//       //     break;
+
+//       //   case "user":
+//       //     save_ret = await db_module.save_couch_doc("xuda_drive", doc);
+//       //     break;
+
+//       //   default:
+//       //     break;
+//       // }
+//       // return save_ret;
+//     }
+
+//     doc.ts = Date.now();
+//     doc.public = is_public;
+
+//     let save_ret;
+
+//     switch (drive_type) {
+//       case "workspace":
+//       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);
+//         break;
+
+//       case "user":
+//         save_ret = await db_module.save_couch_doc("xuda_drive", doc);
+//         break;
+
+//       default:
+//         break;
+//     }
+
+//     return save_ret;
+//   } catch (err) {
+//     return err.message;
+//   }
+// };
 
 exports.extract_drive_file = async function (req, job_id, headers) {
   const { app_id, file_path, file_id, uid } = req;

package/package.json

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