Skip to content

Commit 72ae505

Browse files
committed
Add "client_version" attribute to commit object.
1 parent 24158df commit 72ae505

File tree

5 files changed

+10
-0
lines changed

5 files changed

+10
-0
lines changed

common/commit-mgr.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ seaf_commit_free (SeafCommit *commit)
165165
if (commit->repo_name) g_free (commit->repo_name);
166166
if (commit->repo_desc) g_free (commit->repo_desc);
167167
if (commit->device_name) g_free (commit->device_name);
168+
g_free (commit->client_version);
168169
g_free (commit->magic);
169170
g_free (commit->random_key);
170171
g_free (commit);
@@ -623,6 +624,8 @@ commit_to_json_object (SeafCommit *commit)
623624
commit->repo_category);
624625
if (commit->device_name)
625626
json_object_set_string_member (object, "device_name", commit->device_name);
627+
if (commit->client_version)
628+
json_object_set_string_member (object, "client_version", commit->client_version);
626629

627630
if (commit->encrypted)
628631
json_object_set_string_member (object, "encrypted", "true");
@@ -663,6 +666,7 @@ commit_from_json_object (const char *commit_id, json_t *object)
663666
const char *repo_desc;
664667
const char *repo_category;
665668
const char *device_name;
669+
const char *client_version;
666670
const char *encrypted = NULL;
667671
int enc_version = 0;
668672
const char *magic = NULL;
@@ -692,6 +696,7 @@ commit_from_json_object (const char *commit_id, json_t *object)
692696
repo_desc = "";
693697
repo_category = json_object_get_string_or_null_member (object, "repo_category");
694698
device_name = json_object_get_string_or_null_member (object, "device_name");
699+
client_version = json_object_get_string_or_null_member (object, "client_version");
695700

696701
if (json_object_has_member (object, "encrypted"))
697702
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)
763768
if (repo_category)
764769
commit->repo_category = g_strdup(repo_category);
765770
commit->device_name = g_strdup(device_name);
771+
commit->client_version = g_strdup(client_version);
766772

767773
if (commit->encrypted) {
768774
commit->enc_version = enc_version;

common/commit-mgr.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ struct _SeafCommit {
2929
char *repo_desc;
3030
char *repo_category;
3131
char *device_name;
32+
char *client_version;
3233

3334
gboolean encrypted;
3435
int enc_version;

common/rpc-service.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,7 @@ convert_to_seafile_commit (SeafCommit *c)
11341134
"new_merge", c->new_merge,
11351135
"conflict", c->conflict,
11361136
"device_name", c->device_name,
1137+
"client_version", c->client_version,
11371138
NULL);
11381139
return commit;
11391140
}

lib/commit.vala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public class Commit : Object {
6565
public string rev_renamed_old_path { get; set; }
6666

6767
public string device_name { get; set; }
68+
public string client_version { get; set; }
6869
}
6970

7071
} // namespace

server/repo-op.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4364,6 +4364,7 @@ convert_to_seafile_commit (SeafCommit *c)
43644364
"new_merge", c->new_merge,
43654365
"conflict", c->conflict,
43664366
"device_name", c->device_name,
4367+
"client_version", c->client_version,
43674368
NULL);
43684369
return commit;
43694370
}

0 commit comments

Comments
 (0)