Add batch del files RPC (#694)

* Add batch del files RPC * Add pack multi-level files * Go add pack multi-level files * Use change set to batch del files * Improve args --------- Co-authored-by: 杨赫然 <[email protected]>
haiwen · Sep 13, 2024 · c80bf17 · c80bf17
1 parent b2bde11
commit c80bf17
Show file tree

Hide file tree

Showing 15 changed files with 756 additions and 25 deletions.
diff --git a/common/rpc-service.c b/common/rpc-service.c
@@ -2812,6 +2812,46 @@ seafile_del_file (const char *repo_id, const char *parent_dir,
     return ret;
 }
 
+int
+seafile_batch_del_files (const char *repo_id,
+                         const char *filepaths,
+                         const char *user,
+                         GError **error)
+{
+    char *norm_file_list = NULL, *rpath = NULL;
+    int ret = 0;
+
+    if (!repo_id || !filepaths || !user) {
+        g_set_error (error, 0, SEAF_ERR_BAD_ARGS, "Argument should not be null");
+        return -1;
+    }
+
+    if (!is_uuid_valid (repo_id)) {
+        g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_BAD_ARGS, "Invalid repo id");
+        return -1;
+    }
+
+
+    norm_file_list = normalize_utf8_path (filepaths);
+    if (!norm_file_list) {
+        g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_BAD_ARGS,
+                     "Path is in valid UTF8 encoding");
+        ret = -1;
+        goto out;
+    }
+
+    if (seaf_repo_manager_batch_del_files (seaf->repo_mgr, repo_id,
+                                           norm_file_list,
+                                           user, error) < 0) {
+        ret = -1;
+    }
+
+out:
+    g_free (norm_file_list);
+
+    return ret;
+}
+
 GObject *
 seafile_copy_file (const char *src_repo_id,
                    const char *src_dir,

diff --git a/fileserver/fileop.go b/fileserver/fileop.go
@@ -943,14 +943,28 @@ func parseDirFilelist(repo *repomgr.Repo, obj map[string]interface{}) ([]fsmgr.S
 			err := fmt.Errorf("invalid download multi data")
 			return nil, err
 		}
-
-		v, ok := direntHash[name]
-		if !ok {
-			err := fmt.Errorf("invalid download multi data")
+		if name == "" {
+			err := fmt.Errorf("invalid download file name")
 			return nil, err
 		}
 
-		direntList = append(direntList, v)
+		if strings.Contains(name, "/") {
+			rpath := filepath.Join(parentDir, name)
+			dent, err := fsmgr.GetDirentByPath(repo.StoreID, repo.RootID, rpath)
+			if err != nil {
+				err := fmt.Errorf("failed to get path %s for repo %s: %v", rpath, repo.StoreID, err)
+				return nil, err
+			}
+			direntList = append(direntList, *dent)
+		} else {
+			v, ok := direntHash[name]
+			if !ok {
+				err := fmt.Errorf("invalid download multi data")
+				return nil, err
+			}
+
+			direntList = append(direntList, v)
+		}
 	}
 
 	return direntList, nil

diff --git a/fileserver/fsmgr/fsmgr.go b/fileserver/fsmgr/fsmgr.go
@@ -908,3 +908,31 @@ func getFileCountInfo(repoID, dirID string) (*FileCountInfo, error) {
 
 	return info, nil
 }
+
+func GetDirentByPath(repoID, rootID, rpath string) (*SeafDirent, error) {
+	parentDir := filepath.Dir(rpath)
+	fileName := filepath.Base(rpath)
+
+	var dir *SeafDir
+	var err error
+
+	if parentDir == "." {
+		dir, err = GetSeafdir(repoID, rootID)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		dir, err = GetSeafdirByPath(repoID, rootID, parentDir)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	for _, de := range dir.Entries {
+		if de.Name == fileName {
+			return de, nil
+		}
+	}
+
+	return nil, ErrPathNoExist
+}
diff --git a/include/seafile-rpc.h b/include/seafile-rpc.h
@@ -754,6 +754,12 @@ seafile_del_file (const char *repo_id,
                   const char *user,
                   GError **error);
 
+int
+seafile_batch_del_files (const char *repo_id,
+                         const char *file_list,
+                         const char *user,
+                         GError **error);
+
 /**
  * copy a file/directory from a repo to another on server.
  */

diff --git a/python/seafile/rpcclient.py b/python/seafile/rpcclient.py
@@ -126,6 +126,11 @@ def seafile_del_file(repo_id, parent_dir, filename, user):
         pass
     del_file = seafile_del_file
 
+    @searpc_func("int", ["string", "string", "string"])
+    def seafile_batch_del_files(repo_id, filepaths, user):
+        pass
+    batch_del_files = seafile_batch_del_files
+
     @searpc_func("object", ["string", "string", "string", "string", "string", "string", "string", "int", "int"])
     def seafile_copy_file(src_repo, src_dir, src_filename, dst_repo, dst_dir, dst_filename, user, need_progress, synchronous):
         pass

diff --git a/python/seaserv/api.py b/python/seaserv/api.py
@@ -300,6 +300,9 @@ def put_file(self, repo_id, tmp_file_path, parent_dir, filename,
     def del_file(self, repo_id, parent_dir, filename, username):
         return seafserv_threaded_rpc.del_file(repo_id, parent_dir, filename, username)
 
+    def batch_del_files(self, repo_id, filepaths, username):
+        return seafserv_threaded_rpc.batch_del_files(repo_id, filepaths, username)
+
     '''
     If you want to move or copy multiple files in a batch, @src_filename and @dst_filename
     should be json array, make sure the number of files

diff --git a/server/Makefile.am b/server/Makefile.am
@@ -36,7 +36,8 @@ noinst_HEADERS = web-accesstoken-mgr.h  seafile-session.h \
 	../common/org-mgr.h \
 	index-blocks-mgr.h \
 	http-tx-mgr.h \
-	notif-mgr.h
+	notif-mgr.h \
+	change-set.h
 
 seaf_server_SOURCES = \
 	seaf-server.c \
@@ -58,6 +59,7 @@ seaf_server_SOURCES = \
 	fileserver-config.c \
 	http-tx-mgr.c \
 	notif-mgr.c \
+	change-set.c \
 	../common/seaf-db.c \
 	../common/branch-mgr.c ../common/fs-mgr.c \
 	../common/config-mgr.c \