haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-16 23:29:25 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.1'

Browse Source
This commit is contained in:
Jonathan Xu
2017-07-07 11:19:27 +08:00
parent 548026895d e096ccdfa8
commit 0db8ef8f2d
17 changed files with 1020 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
common/rpc-service.c
View File

@@ -3717,11 +3717,19 @@ seafile_copy_file (const char *src_repo_id,
rsrc_dir = format_dir_path (norm_src_dir);
rdst_dir = format_dir_path (norm_dst_dir);
ret = (GObject *)seaf_repo_manager_copy_file (seaf->repo_mgr,
src_repo_id, rsrc_dir, norm_src_filename,
dst_repo_id, rdst_dir, norm_dst_filename,
user, need_progress, synchronous,
error);
if (strchr(norm_src_filename, '\t') && strchr(norm_dst_filename, '\t'))
ret = (GObject *)seaf_repo_manager_copy_multiple_files (seaf->repo_mgr,
src_repo_id, rsrc_dir, norm_src_filename,
dst_repo_id, rdst_dir, norm_dst_filename,
user, need_progress, synchronous,
error);
else
ret = (GObject *)seaf_repo_manager_copy_file (seaf->repo_mgr,
src_repo_id, rsrc_dir, norm_src_filename,
dst_repo_id, rdst_dir, norm_dst_filename,
user, need_progress, synchronous,
error);
out:
g_free (norm_src_dir);
@@ -3794,11 +3802,18 @@ seafile_move_file (const char *src_repo_id,
rsrc_dir = format_dir_path (norm_src_dir);
rdst_dir = format_dir_path (norm_dst_dir);
ret = (GObject *)seaf_repo_manager_move_file (seaf->repo_mgr,
src_repo_id, rsrc_dir, norm_src_filename,
dst_repo_id, rdst_dir, norm_dst_filename,
replace, user, need_progress, synchronous,
error);
if (strchr(norm_src_filename, '\t') && strchr(norm_dst_filename, '\t'))
ret = (GObject *)seaf_repo_manager_move_multiple_files (seaf->repo_mgr,
src_repo_id, rsrc_dir, norm_src_filename,
dst_repo_id, rdst_dir, norm_dst_filename,
replace, user, need_progress, synchronous,
error);
else
ret = (GObject *)seaf_repo_manager_move_file (seaf->repo_mgr,
src_repo_id, rsrc_dir, norm_src_filename,
dst_repo_id, rdst_dir, norm_dst_filename,
replace, user, need_progress, synchronous,
error);
out:
g_free (norm_src_dir);
@@ -5055,4 +5070,34 @@ seafile_get_total_storage (GError **error)
return seaf_get_total_storage (error);
}
GObject *
seafile_get_file_count_info_by_path (const char *repo_id,
const char *path,
GError **error)
{
if (!repo_id || !path) {
g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_BAD_ARGS, "Argument should not be null");
return NULL;
}
GObject *ret = NULL;
SeafRepo *repo = NULL;
repo = seaf_repo_manager_get_repo (seaf->repo_mgr, repo_id);
if (!repo) {
seaf_warning ("Failed to get repo %.10s\n", repo_id);
g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_GENERAL,
"Library not exists");
return NULL;
}
ret = seaf_fs_manager_get_file_count_info_by_path (seaf->fs_mgr,
repo->store_id,
repo->version,
repo->root_id,
path, error);
seaf_repo_unref (repo);
return ret;
}
#endif /* SEAFILE_SERVER */