@xuda.io/drive_module 1.1.816 → 1.1.818

package/index.js

@@ -869,8 +869,6 @@ exports.update_drive_file = async function (req, job_id, headers, file_obj) {
       fse.copyFileSync(tempPath, target_dir);
     }
 
-    let doc_ret;
-
     doc.date_modified = Date.now();
 
     const fs = require("fs").promises;
@@ -1598,7 +1596,8 @@ exports.upload_drive_file = async function (req, job_id, headers, file_obj) {
 
         let tmp_originalname = originalname + ` (${i})`;
 
-        check_req.file_name = tmp_originalname;
+        // check_req.file_name = tmp_originalname;
+        check_req.file_path = path.join(doc.file_path, tmp_originalname);
 
         const re_check_res = await module.exports.check_drive_file(check_req);
         if (re_check_res.code < 0) {
@@ -2588,101 +2587,19 @@ exports.update_drive_file_tags = async function (req, job_id, headers) {
     const file_name = path.basename(file_path);
     validate_drive_type(drive_type);
 
-    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 = await get_drive_doc(drive_type, app_id, uid, file_path, headers);
 
     var target_file = file_name;
     // const master_id = await _common.get_project_app_id(app_id, true);
 
     let doc_ret;
 
-    switch (drive_type) {
-      case "studio": {
-        const app_id_master = await _common.get_project_app_id(app_id, true);
-        doc_ret = await db_module.get_app_couch_doc(app_id_master, 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;
-    }
-    var doc = {};
-    if (doc_ret.code > -1) {
-      doc = doc_ret.data;
-      doc.date_modified = Date.now();
-    } else {
-      if (drive_type === "studio") {
-        const ext = path.extname(file_name).toLowerCase();
-        doc = {
-          _id: target_file,
-          docType: `${drive_type}_drive`,
-          stat: 3,
-          originalname: file_name,
-          uid,
-          type: "file",
-          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,
-        };
-      } else {
-        throw new Error("file not found");
-      }
-    }
+    doc = doc_ret.data;
+    doc.date_modified = Date.now();
 
     doc.tags = tags;
-    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;
-    }
-
-    if (save_ret.code < 0) {
-      throw new Error(save_ret.data);
-    }
-
-    return {
-      code: 200,
-      data: tags,
-    };
+    return await save_drive_doc(drive_type, app_id, doc);
   } catch (err) {
     return {
       code: -200,

package/package.json

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