lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set sync record's flags only after propagating new message

Browse Source 
this is semantically cleaner, and fixes storing the flags in the rare
case that flags are not being synced and the target is not being
expunged, as in this case flags are queried only during the actual
propagation.
This commit is contained in:
Oswald Buddenhagen 2019-12-29 12:34:36 +01:00
parent abdca388f6
commit 25b1c2b9e7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sync.c
View File

@ -262,7 +262,6 @@ match_tuids( sync_vars_t *svars, int t, message_t *msgs )
} }
debug( " -> TUID lost\n" ); debug( " -> TUID lost\n" );
jFprintf( svars, "& %u %u\n", srec->uid[M], srec->uid[S] ); jFprintf( svars, "& %u %u\n", srec->uid[M], srec->uid[S] );
srec->flags = 0;
// Note: status remains S_PENDING. // Note: status remains S_PENDING.
srec->tuid[0] = 0; srec->tuid[0] = 0;
num_lost++; num_lost++;
@ -942,7 +941,6 @@ load_state( sync_vars_t *svars )
break; break;
case '&': case '&':
debug( "TUID %." stringify(TUIDL) "s lost\n", srec->tuid ); debug( "TUID %." stringify(TUIDL) "s lost\n", srec->tuid );
srec->flags = 0;
srec->tuid[0] = 0; srec->tuid[0] = 0;
break; break;
case '<': case '<':
@ -1623,11 +1621,6 @@ box_loaded( int sts, message_t *msgs, int total_msgs, int recent_msgs, void *aux
debug( " -> pair(%u,%u) created\n", srec->uid[M], srec->uid[S] ); debug( " -> pair(%u,%u) created\n", srec->uid[M], srec->uid[S] );
} }
if ((tmsg->flags & F_FLAGGED) || tmsg->size <= svars->chan->stores[t]->max_size) { if ((tmsg->flags & F_FLAGGED) || tmsg->size <= svars->chan->stores[t]->max_size) {
if (tmsg->flags != srec->flags) {
srec->flags = tmsg->flags;
jFprintf( svars, "* %u %u %u\n", srec->uid[M], srec->uid[S], srec->flags );
debug( " -> updated flags to %u\n", tmsg->flags );
}
if (srec->status != S_PENDING) { if (srec->status != S_PENDING) {
debug( " -> not too big any more\n" ); debug( " -> not too big any more\n" );
srec->status = S_PENDING; srec->status = S_PENDING;
@ -1845,6 +1838,11 @@ msg_copied( int sts, uint uid, copy_vars_t *vars )
sync_rec_t *srec = vars->srec; sync_rec_t *srec = vars->srec;
switch (sts) { switch (sts) {
case SYNC_OK: case SYNC_OK:
if (vars->msg->flags != srec->flags) {
srec->flags = vars->msg->flags;
debug( " -> updated flags to %u\n", srec->flags );
jFprintf( svars, "* %u %u %u\n", srec->uid[M], srec->uid[S], srec->flags );
}
if (!uid) { // Stored to a non-UIDPLUS mailbox if (!uid) { // Stored to a non-UIDPLUS mailbox
svars->state[t] |= ST_FIND_NEW; svars->state[t] |= ST_FIND_NEW;
} else { } else {