WindyMadman/seafile
1
0
Fork 0
mirror of https://github.com/haiwen/seafile.git synced 2025-01-08 11:57:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add 'id' field to FileSyncError RPC object.

Browse Source
This commit is contained in:
Jonathan Xu 2019-10-24 20:18:37 +08:00
parent 24e2eeb04b
commit a4e56b6588
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
daemon/repo-mgr.c
View File

@ -718,17 +718,19 @@ collect_file_sync_errors (sqlite3_stmt *stmt, void *data)
{
GList **pret = data;
const char *repo_id, *repo_name, *path;
int err_id;
int id, err_id;
gint64 timestamp;
SeafileFileSyncError *error;
repo_id = (const char *)sqlite3_column_text (stmt, 0);
repo_name = (const char *)sqlite3_column_text (stmt, 1);
path = (const char *)sqlite3_column_text (stmt, 2);
err_id = sqlite3_column_int (stmt, 3);
timestamp = sqlite3_column_int64 (stmt, 4);
id = sqlite3_column_int (stmt, 0);
repo_id = (const char *)sqlite3_column_text (stmt, 1);
repo_name = (const char *)sqlite3_column_text (stmt, 2);
path = (const char *)sqlite3_column_text (stmt, 3);
err_id = sqlite3_column_int (stmt, 4);
timestamp = sqlite3_column_int64 (stmt, 5);
error = g_object_new (SEAFILE_TYPE_FILE_SYNC_ERROR,
"id", id,
"repo_id", repo_id,
"repo_name", repo_name,
"path", path,
@ -748,7 +750,7 @@ seaf_repo_manager_get_file_sync_errors (SeafRepoManager *mgr, int offset, int li
pthread_mutex_lock (&mgr->priv->db_lock);
sql = sqlite3_mprintf ("SELECT repo_id, repo_name, path, err_id, timestamp FROM "
sql = sqlite3_mprintf ("SELECT id, repo_id, repo_name, path, err_id, timestamp FROM "
"FileSyncError ORDER BY id DESC LIMIT %d OFFSET %d",
limit, offset);
sqlite_foreach_selected_row (mgr->priv->db, sql,

1
lib/repo.vala
View File

@ -126,6 +126,7 @@ public class EncryptionInfo: Object {
}
public class FileSyncError: Object {
public int id { get; set; }
public string repo_id { get; set; }
public string repo_name { get; set; }
public string path { get; set; }