haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-08 18:59:03 +00:00
Code Issues Releases Wiki Activity

Add "client_version" attribute to commit object.

Browse Source
This commit is contained in:
Jiaqiang Xu
2016-09-22 10:52:07 +08:00
parent 24158df163
commit 72ae505def
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/commit-mgr.c
View File

@@ -165,6 +165,7 @@ seaf_commit_free (SeafCommit *commit)
if (commit->repo_name) g_free (commit->repo_name); if (commit->repo_name) g_free (commit->repo_name);
if (commit->repo_desc) g_free (commit->repo_desc); if (commit->repo_desc) g_free (commit->repo_desc);
if (commit->device_name) g_free (commit->device_name); if (commit->device_name) g_free (commit->device_name);
g_free (commit->client_version);
g_free (commit->magic); g_free (commit->magic);
g_free (commit->random_key); g_free (commit->random_key);
g_free (commit); g_free (commit);
@@ -623,6 +624,8 @@ commit_to_json_object (SeafCommit *commit)
commit->repo_category); commit->repo_category);
if (commit->device_name) if (commit->device_name)
json_object_set_string_member (object, "device_name", commit->device_name); json_object_set_string_member (object, "device_name", commit->device_name);
if (commit->client_version)
json_object_set_string_member (object, "client_version", commit->client_version);
if (commit->encrypted) if (commit->encrypted)
json_object_set_string_member (object, "encrypted", "true"); json_object_set_string_member (object, "encrypted", "true");
@@ -663,6 +666,7 @@ commit_from_json_object (const char *commit_id, json_t *object)
const char *repo_desc; const char *repo_desc;
const char *repo_category; const char *repo_category;
const char *device_name; const char *device_name;
const char *client_version;
const char *encrypted = NULL; const char *encrypted = NULL;
int enc_version = 0; int enc_version = 0;
const char *magic = NULL; const char *magic = NULL;
@@ -692,6 +696,7 @@ commit_from_json_object (const char *commit_id, json_t *object)
repo_desc = ""; repo_desc = "";
repo_category = json_object_get_string_or_null_member (object, "repo_category"); repo_category = json_object_get_string_or_null_member (object, "repo_category");
device_name = json_object_get_string_or_null_member (object, "device_name"); device_name = json_object_get_string_or_null_member (object, "device_name");
client_version = json_object_get_string_or_null_member (object, "client_version");
if (json_object_has_member (object, "encrypted")) if (json_object_has_member (object, "encrypted"))
encrypted = json_object_get_string_or_null_member (object, "encrypted"); encrypted = json_object_get_string_or_null_member (object, "encrypted");
@@ -763,6 +768,7 @@ commit_from_json_object (const char *commit_id, json_t *object)
if (repo_category) if (repo_category)
commit->repo_category = g_strdup(repo_category); commit->repo_category = g_strdup(repo_category);
commit->device_name = g_strdup(device_name); commit->device_name = g_strdup(device_name);
commit->client_version = g_strdup(client_version);
if (commit->encrypted) { if (commit->encrypted) {
commit->enc_version = enc_version; commit->enc_version = enc_version;

1
common/commit-mgr.h
View File

@@ -29,6 +29,7 @@ struct _SeafCommit {
char *repo_desc; char *repo_desc;
char *repo_category; char *repo_category;
char *device_name; char *device_name;
char *client_version;
gboolean encrypted; gboolean encrypted;
int enc_version; int enc_version;

1
common/rpc-service.c
View File

@@ -1134,6 +1134,7 @@ convert_to_seafile_commit (SeafCommit *c)
"new_merge", c->new_merge, "new_merge", c->new_merge,
"conflict", c->conflict, "conflict", c->conflict,
"device_name", c->device_name, "device_name", c->device_name,
"client_version", c->client_version,
NULL); NULL);
return commit; return commit;
} }

1
lib/commit.vala
View File

@@ -65,6 +65,7 @@ public class Commit : Object {
public string rev_renamed_old_path { get; set; } public string rev_renamed_old_path { get; set; }
public string device_name { get; set; } public string device_name { get; set; }
public string client_version { get; set; }
} }
} // namespace } // namespace

1
server/repo-op.c
View File

@@ -4364,6 +4364,7 @@ convert_to_seafile_commit (SeafCommit *c)
"new_merge", c->new_merge, "new_merge", c->new_merge,
"conflict", c->conflict, "conflict", c->conflict,
"device_name", c->device_name, "device_name", c->device_name,
"client_version", c->client_version,
NULL); NULL);
return commit; return commit;
} }