mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 21:35:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make sure to write the errors in the DB as well.

Browse source 
If a file can't be uploaded, we still need to write it into the DB if it
was in the DB before, with the old timestamp.
This commit is contained in:
Olivier Goffart 2013-07-02 22:58:50 +02:00
parent 1c9fa48d60
commit f8fdff885e
1 changed files with 52 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/csync_util.c
View file

@ -34,6 +34,7 @@
#define CSYNC_LOG_CATEGORY_NAME "csync.util"
#include "csync_log.h"
#include "csync_statedb.h"
typedef struct {
const char *instr_str;
@ -257,6 +258,48 @@ out:
return rc;
}
static int _fix_errors_visitor(void *obj, void *data) {
csync_file_stat_t *fs = NULL;
csync_file_stat_t *tfs = NULL;
CSYNC *ctx = NULL;
int rc = -1;
fs = (csync_file_stat_t *) obj;
ctx = (CSYNC *) data;
/* search for ERROR */
if (fs->instruction != CSYNC_INSTRUCTION_ERROR) {
rc = 0;
goto out;
}
/* check if the file is new or has been synced */
tfs = csync_statedb_get_stat_by_hash(ctx, fs->phash);
if (tfs == NULL) {
rc = 0;
goto out;
}
/* update file stat */
fs->inode = tfs->inode;
fs->modtime = tfs->modtime;
fs->instruction = CSYNC_INSTRUCTION_UPDATED;
rc = 0;
out:
csync_file_stat_free(tfs);
if (rc != 0) {
fs->instruction = CSYNC_INSTRUCTION_ERROR;
}
return rc;
}
/*
* merge the local tree with the new files from remote and update the
* inode numbers
@ -264,6 +307,15 @@ out:
int csync_merge_file_trees(CSYNC *ctx) {
int rc = -1;
/* walk over the local tree, in case of error take the value from the database */
ctx->current = REMOTE_REPLICA;
ctx->replica = ctx->remote.type;
rc = c_rbtree_walk(ctx->local.tree, ctx, _fix_errors_visitor);
if (rc < 0) {
goto out;
}
/* walk over remote tree, stat on local system */
ctx->current = LOCAL_REPLICA;
ctx->replica = ctx->local.type;
@ -272,20 +324,6 @@ int csync_merge_file_trees(CSYNC *ctx) {
if (rc < 0) {
goto out;
}
#if 0
/* We don't have to merge the remote tree atm. */
/* walk over local tree, stat on remote system */
ctx->current = REMOTE_REPLICA;
ctx->replica = ctx->remote.type;
rc = c_rbtree_walk(ctx->local.tree, ctx, _merge_file_trees_visitor);
if (rc < 0) {
goto out;
}
#endif
out:
return rc;
}