[RPC] Add 'delta' parameter to check_quota RPC.

Author: killing

common/rpc-service.c

@@ -4056,14 +4056,19 @@ seafile_get_user_quota (const char *user, GError **error)
 }
 
 int
-seafile_check_quota (const char *repo_id, GError **error)
+seafile_check_quota (const char *repo_id, gint64 delta, GError **error)
 {
+    int rc;
+
     if (!repo_id) {
         g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_BAD_ARGS, "Bad arguments");
         return -1;
     }
 
-    return seaf_quota_manager_check_quota (seaf->quota_mgr, repo_id);
+    rc = seaf_quota_manager_check_quota_with_delta (seaf->quota_mgr, repo_id, delta);
+    if (rc == 1)
+        return -1;
+    return rc;
 }
 
 static char *

include/seafile-rpc.h

@@ -802,7 +802,7 @@ gint64
 seafile_get_user_quota (const char *user, GError **error);
 
 int
-seafile_check_quota (const char *repo_id, GError **error);
+seafile_check_quota (const char *repo_id, gint64 delta, GError **error);
 
 char *
 seafile_get_file_id_by_path (const char *repo_id, const char *path,

lib/seafile-rpc-wrapper.c

@@ -391,10 +391,11 @@ seafile_set_org_user_quota (SearpcClient *client,
 int
 seafile_check_quota (SearpcClient *client,
                      const char *repo_id,
+                     gint64 delta,
                      GError **error)
 {
     return searpc_client_call__int (client, "check_quota", error,
-                                    1, "string", repo_id);
+                                    2, "string", repo_id, "int64", delta);
 }
 
 int

python/seafile/rpcclient.py

@@ -753,8 +753,8 @@ def set_org_user_quota(org_id, user, quota):
     def get_org_user_quota(org_id, user):
         pass
 
-    @searpc_func("int", ["string"])
-    def check_quota(repo_id):
+    @searpc_func("int", ["string", "int64"])
+    def check_quota(repo_id, delta):
         pass
 
     # password management

python/seaserv/api.py

@@ -575,8 +575,8 @@ def get_user_share_quota(self, username):
     def set_user_share_quota(self, username, quota):
         pass
 
-    def check_quota(self, repo_id):
-        pass
+    def check_quota(self, repo_id, delta=0):
+        return seafserv_threaded_rpc.check_quota(repo_id, delta)
 
     # encrypted repo password management
     def check_passwd(self, repo_id, magic):

python/seaserv/service.py

@@ -881,9 +881,9 @@ def get_related_users_by_org_repo(org_id, repo_id):
     return users
 
 # quota
-def check_quota(repo_id):
+def check_quota(repo_id, delta=0):
     try:
-        ret = seafserv_threaded_rpc.check_quota(repo_id)
+        ret = seafserv_threaded_rpc.check_quota(repo_id, delta)
     except SearpcError, e:
         logger.error(e)
         ret = -1

server/seaf-server.c

@@ -610,7 +610,7 @@ static void start_rpc_service (CcnetClient *client, int cloud_mode)
     searpc_server_register_function ("seafserv-threaded-rpcserver",
                                      seafile_check_quota,
                                      "check_quota",
-                                     searpc_signature_int__string());
+                                     searpc_signature_int__string_int64());
 
     /* repo permission */
     searpc_server_register_function ("seafserv-threaded-rpcserver",