sipp11
/
mbsync
mirror of https://git.code.sf.net/p/isync/isync
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

*** implement message move detection 

*** this is actually just some scavenged code from the first
(less effcient) implementation of uidvalidity recovery, plus some
placeholders here and there.
wip/movedetect
Oswald Buddenhagen 8 years ago
parent
dd1f337e64
commit
2a1ae5e9c9
5 changed files with 125 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/config.c
  2. 1
      src/driver.h
  3. 12
      src/mbsync.1
  4. 115
      src/sync.c
  5. 1
      src/sync.h

4
src/config.c
Unescape View File

@ -206,6 +206,8 @@ getopt_helper( conffile_t *cfile, int *cops, channel_conf_t *conf )
conf->max_messages = parse_int( cfile );
else if (!strcasecmp( "ExpireUnread", cfile->cmd ))
conf->expire_unread = parse_bool( cfile );
else if (!strcasecmp( "MoveDetect", cfile->cmd ))
conf->move_detect = parse_bool( cfile );
else {
for (i = 0; i < as(boxOps); i++) {
if (!strcasecmp( boxOps[i].name, cfile->cmd )) {
@ -346,6 +348,7 @@ load_config( const char *where, int pseudo )
gcops = 0;
global_conf.expire_unread = -1;
// global_conf.move_detect = 1;
reloop:
while (getcline( &cfile )) {
if (!cfile.cmd)
@ -368,6 +371,7 @@ load_config( const char *where, int pseudo )
channel->max_messages = global_conf.max_messages;
channel->expire_unread = global_conf.expire_unread;
channel->use_internal_date = global_conf.use_internal_date;
channel->move_detect = global_conf.move_detect;
cops = 0;
max_size = -1;
while (getcline( &cfile ) && cfile.cmd) {

1
src/driver.h
Unescape View File

@ -82,6 +82,7 @@ typedef struct message {
#define OPEN_APPEND (1<<7)
#define OPEN_FIND (1<<8)
#define OPEN_OLD_IDS (1<<9)
#define OPEN_NEW_IDS (1<<10)
#define UIDVAL_BAD ((uint)-1)

12
src/mbsync.1
Unescape View File

@ -578,6 +578,16 @@ Note that for safety, non-empty mailboxes are never deleted.
(Global default: \fBNone\fR)
..
.TP
\fBMoveDetect\fR \fByes\fR|\fBno\fR
Detect message moves between folders.
When this option is enabled, \fBmbsync\fR queries and stores Message-Ids
in addition to UIDs, and uses them to identify messages which were
previously seen in other folders. This adds some minor overhead to the
overall synchronization process, but can save a lot of bandwith when
messages are often moved between folders.
(Default: \fBTBD\fR).
..
.TP
\fBExpunge\fR {\fBNone\fR|\fBMaster\fR|\fBSlave\fR|\fBBoth\fR}
Permanently remove all messages [on the Master/Slave] marked for deletion.
See \fBRECOMMENDATIONS\fR below.
@ -595,7 +605,7 @@ date\fR) is actually the arrival time, but it is usually close enough.
..
.P
\fBSync\fR, \fBCreate\fR, \fBRemove\fR, \fBExpunge\fR,
\fBMaxMessages\fR, and \fBCopyArrivalDate\fR
\fBMoveDetect\fR, \fBMaxMessages\fR, and \fBCopyArrivalDate\fR
can be used before any section for a global effect.
The global settings are overridden by Channel-specific options,
which in turn are overridden by command line switches.

115
src/sync.c
Unescape View File

@ -143,6 +143,7 @@ typedef struct sync_rec {
/* string_list_t *keywords; */
uint uid[2];
message_t *msg[2];
char *msgid;
uchar status, wstate, flags, aflags[2], dflags[2];
char tuid[TUIDL];
} sync_rec_t;
@ -335,10 +336,12 @@ copy_msg_bytes( char **out_ptr, const char *in_buf, int *in_idx, int in_len, int
static int
copy_msg_convert( int in_cr, int out_cr, copy_vars_t *vars )
{
DECL_INIT_SVARS(vars->aux);
char *in_buf = vars->data.data;
int in_len = vars->data.len;
int idx = 0, sbreak = 0, ebreak = 0;
int lines = 0, hdr_crs = 0, bdy_crs = 0, app_cr = 0, extra = 0;
int lines = 0, hdr_crs = 0, bdy_crs = 0, app_cr = 0, extra = 0, in_msgid = 0;
int want_msgid = svars->recover_uidval && !vars->msg->msgid;
if (vars->srec) {
nloop: ;
int start = idx;
@ -348,18 +351,47 @@ copy_msg_convert( int in_cr, int out_cr, copy_vars_t *vars )
if (c == '\r') {
line_crs++;
} else if (c == '\n') {
if (starts_with_upper( in_buf + start, in_len - start, "X-TUID: ", 8 )) {
int rle = idx - line_crs - 1;
if (!ebreak && starts_with_upper( in_buf + start, rle - start, "X-TUID: ", 8 )) {
extra = (sbreak = start) - (ebreak = idx);
if (want_msgid) {
in_msgid = 0;
goto nloop;
}
goto oke;
}
lines++;
hdr_crs += line_crs;
if (idx - line_crs - 1 == start) {
if (start == rle) {
if (!ebreak)
sbreak = ebreak = start;
goto oke;
}
if (want_msgid && starts_with_upper( in_buf + start, rle - start, "MESSAGE-ID:", 11 )) {
start += 11;
} else if (in_msgid) {
if (!isspace( in_buf[start] )) {
in_msgid = 0;
goto nloop;
}
start++;
} else {
goto nloop;
}
while (start < rle && isspace( in_buf[start] ))
start++;
if (start == rle) {
in_msgid = 1;
goto nloop;
}
vars->msg->msgid = nfstrndup( in_buf + start, rle - start );
if (!ebreak) {
want_msgid = 0;
in_msgid = 0;
goto nloop;
}
goto oke;
}
}
/* invalid message */
free( in_buf );
@ -668,9 +700,18 @@ save_state( sync_vars_t *svars )
for (srec = svars->srecs; srec; srec = srec->next) {
if (srec->status & S_DEAD)
continue;
make_flags( srec->flags, fbuf );
Fprintf( svars->nfp, "%u %u %s%s\n", srec->uid[M], srec->uid[S],
(srec->status & S_SKIPPED) ? "^" : (srec->status & S_PENDING) ? "!" : (srec->status & S_EXPIRED) ? "~" : "", fbuf );
char *fptr = fbuf;
if (srec->status & S_SKIPPED)
*fptr++ = '^';
else if (srec->status & S_PENDING)
*fptr++ = '!';
else if (srec->status & S_EXPIRED)
*fptr++ = '~';
else if (!srec->flags && svars->chan->move_detect)
*fptr++ = '-';
make_flags( srec->flags, fptr );
Fprintf( svars->nfp, svars->chan->move_detect ? "%u %u %s %s\n" : "%u %u %s\n",
srec->uid[M], srec->uid[S], fbuf, srec->msgid );
}
Fclose( svars->nfp, 1 );
@ -695,7 +736,7 @@ load_state( sync_vars_t *svars )
char c;
struct stat st;
char fbuf[16]; /* enlarge when support for keywords is added */
char buf[128], buf1[64], buf2[64];
char buf[256], buf1[64], buf2[64];
if ((jfp = fopen( svars->dname, "r" ))) {
if (!lock_state( svars ))
@ -755,7 +796,8 @@ load_state( sync_vars_t *svars )
buf[ll] = 0;
fbuf[0] = 0;
uint t1, t2;
if (sscanf( buf, "%u %u %15s", &t1, &t2, fbuf ) < 2) {
int t3 = 0;
if (sscanf( buf, "%u %u %15s %n", &t1, &t2, fbuf, &t3 ) < 2) {
error( "Error: invalid sync state entry at %s:%d\n", svars->dname, line );
goto jbail;
}
@ -787,9 +829,17 @@ load_state( sync_vars_t *svars )
} else
srec->status = 0;
srec->wstate = 0;
if (*s != '-')
srec->flags = parse_flags( s );
debug( " entry (%u,%u,%u,%s)\n", srec->uid[M], srec->uid[S], srec->flags,
(srec->status & S_SKIPPED) ? "SKIP" : (srec->status & S_PENDING) ? "FAIL" : (srec->status & S_EXPIRED) ? "XPIRE" : "" );
else
srec->flags = 0;
if (t3 && t3 != ll)
srec->msgid = nfstrndup( buf + t3, ll - t3 );
else
srec->msgid = 0;
debug( " entry (%u,%u,%u,%s,%s)\n", srec->uid[M], srec->uid[S], srec->flags,
(srec->status & S_SKIPPED) ? "SKIP" : (srec->status & S_PENDING) ? "FAIL" : (srec->status & S_EXPIRED) ? "XPIRE" : "",
srec->msgid );
srec->msg[M] = srec->msg[S] = 0;
srec->tuid[0] = 0;
srec->next = 0;
@ -869,6 +919,8 @@ load_state( sync_vars_t *svars )
(sscanf( buf + 2, "%u", &t1 ) != 1) :
c == 'F' || c == 'T' || c == '+' || c == '&' || c == '-' || c == '=' || c == '|' ?
(sscanf( buf + 2, "%u %u", &t1, &t2 ) != 2) :
c == '@' ?
(tn = 0, (sscanf( buf + 2, "%u %u %n", &t1, &t2, &tn ) < 2) || !tn || ll - tn == 2) :
(sscanf( buf + 2, "%u %u %u", &t1, &t2, &t3 ) != 3))
{
error( "Error: malformed journal entry at %s:%d\n", svars->jname, line );
@ -899,6 +951,7 @@ load_state( sync_vars_t *svars )
srec->wstate = 0;
srec->flags = 0;
srec->tuid[0] = 0;
srec->msgid = 0;
srec->next = 0;
*svars->srecadd = srec;
svars->srecadd = &srec->next;
@ -933,6 +986,10 @@ load_state( sync_vars_t *svars )
srec->flags = 0;
srec->tuid[0] = 0;
break;
case '@':
srec->msgid = nfstrndup( buf + 2 + tn, ll - tn - 2 );
debug( "message-id now %s\n", srec->msgid );
break;
case '<':
debug( "master now %u\n", t3 );
srec->uid[M] = t3;
@ -1225,6 +1282,7 @@ box_opened2( sync_vars_t *svars, int t )
}
if (!(svars->jfp = fopen( svars->jname, "a" ))) {
sys_error( "Error: cannot create journal %s", svars->jname );
nbail:
fclose( svars->nfp );
goto bail;
}
@ -1233,7 +1291,9 @@ box_opened2( sync_vars_t *svars, int t )
jFprintf( svars, JOURNAL_VERSION "\n" );
opts[M] = opts[S] = 0;
if (fails)
if (chan->move_detect)
opts[M] = opts[S] = OPEN_OLD|OPEN_OLD_IDS|OPEN_NEW|OPEN_NEW_IDS;
else if (fails)
opts[M] = opts[S] = OPEN_OLD|OPEN_OLD_IDS;
for (t = 0; t < 2; t++) {
if (chan->ops[t] & (OP_DELETE|OP_FLAGS)) {
@ -1439,6 +1499,27 @@ box_loaded( int sts, message_t *msgs, int total_msgs, int recent_msgs, void *aux
if (!(svars->state[1-t] & ST_LOADED))
return;
/* Amend legacy sync state without Message-Ids. */
for (t = 0; t < 2; t++) {
if ((svars->ctx[t]->opts & OPEN_OLD_IDS) && svars->uidval[t] == svars->ctx[t]->uidvalidity) {
debug( "amending state with message-ids from %s\n", str_ms[t] );
for (srec = svars->srecs; srec; srec = srec->next) {
if (srec->status & S_DEAD)
continue;
if (!srec->msgid && srec->msg[t]) {
if (srec->msg[t]->msgid) {
srec->msgid = srec->msg[t]->msgid;
srec->msg[t]->msgid = 0;
} else {
srec->msgid = nfstrdup( "<>" );
}
debug( " -> set msgid on (%d,%d): %s\n", srec->uid[M], srec->uid[S], srec->msgid );
Fprintf( svars->jfp, "@ %d %d %s\n", srec->uid[M], srec->uid[S], srec->msgid );
}
}
}
}
for (t = 0; t < 2; t++) {
if (svars->uidval[t] != UIDVAL_BAD && svars->uidval[t] != svars->newuidval[t]) {
unsigned need = 0, got = 0;
@ -1607,6 +1688,7 @@ box_loaded( int sts, message_t *msgs, int total_msgs, int recent_msgs, void *aux
srec->uid[t] = 0;
srec->msg[1-t] = tmsg;
srec->msg[t] = 0;
srec->msgid = 0;
tmsg->srec = srec;
if (svars->newmaxuid[1-t] < tmsg->uid)
svars->newmaxuid[1-t] = tmsg->uid;
@ -1844,6 +1926,16 @@ msg_copied( int sts, uint uid, copy_vars_t *vars )
vars->srec->status &= ~S_PENDING;
vars->srec->tuid[0] = 0;
}
if (svars->chan->move_detect) {
if (vars->msg->msgid) {
vars->srec->msgid = vars->msg->msgid;
vars->msg->msgid = 0;
} else {
vars->srec->msgid = nfstrdup( "<>" );
}
debug( " -> set msgid on (%u,%u): %s\n", vars->srec->uid[M], vars->srec->uid[S], vars->srec->msgid );
Fprintf( svars->jfp, "@ %u %u %s\n", vars->srec->uid[M], vars->srec->uid[S], vars->srec->msgid );
}
break;
case SYNC_NOGOOD:
debug( " -> killing (%u,%u)\n", vars->srec->uid[M], vars->srec->uid[S] );
@ -2202,6 +2294,7 @@ sync_bail( sync_vars_t *svars )
free( svars->trashed_msgs[S].array.data );
for (srec = svars->srecs; srec; srec = nsrec) {
nsrec = srec->next;
free( srec->msgid );
free( srec );
}
if (svars->lfd >= 0) {

1
src/sync.h
Unescape View File

@ -55,6 +55,7 @@ typedef struct channel_conf {
uint max_messages; /* for slave only */
signed char expire_unread;
char use_internal_date;
char move_detect;
} channel_conf_t;
typedef struct group_conf {

Write Preview
Loading…
Cancel
Save