arnekeller/inboxid
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/inboxid.git synced 2024-11-22 08:55:00 +00:00
Code Issues Projects Releases Wiki Activity

sync: delete mails after hardlinking

Browse Source 
(to avoid fetching mails already downloaded)
This commit is contained in:
FliegendeWurst 2021-03-29 11:49:12 +02:00 committed by Arne Keller
parent 9e746fb7d7
commit 15819138f9
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/fetch.rs
View File

@ -75,7 +75,7 @@ fn fetch_inbox_top(
println!("mail {:?}", uid); println!("mail {:?}", uid);
let id = gen_id(uid_validity, uid); let id = gen_id(uid_validity, uid);
let uid = ((uid_validity as u64) << 32) | uid as u64; let uid = ((uid_validity as u64) << 32) | uid as u64;
if !maildir.exists(&id).unwrap_or(false) { if !maildir.exists(&id) {
let mail_data = mail.body().unwrap_or_default(); let mail_data = mail.body().unwrap_or_default();
maildir.store_new_with_id(&id, mail_data)?; maildir.store_new_with_id(&id, mail_data)?;

32
src/bin/sync.rs
View File

@ -66,6 +66,7 @@ fn sync(
let mut all_mail = db.prepare("SELECT uid, message_id FROM mail WHERE mailbox = ?")?; let mut all_mail = db.prepare("SELECT uid, message_id FROM mail WHERE mailbox = ?")?;
let mut save_mail = db.prepare("INSERT INTO mail VALUES (?,?,?)")?; let mut save_mail = db.prepare("INSERT INTO mail VALUES (?,?,?)")?;
let mut maildirs: HashMap<&str, Maildir> = names.iter().map(|&x| (x, get_maildir(x).unwrap())).collect(); let mut maildirs: HashMap<&str, Maildir> = names.iter().map(|&x| (x, get_maildir(x).unwrap())).collect();
let mut to_remove: HashMap<&str, _> = HashMap::new();
for &mailbox in &names { for &mailbox in &names {
let remote_mails = &remote[mailbox]; let remote_mails = &remote[mailbox];
@ -105,7 +106,7 @@ fn sync(
let uid = mail.uid.unwrap(); let uid = mail.uid.unwrap();
println!("fetching: {}/{}", mailbox, uid); println!("fetching: {}/{}", mailbox, uid);
let id = gen_id(uid_validity, uid); let id = gen_id(uid_validity, uid);
if !maildir.exists(&id).unwrap_or(false) { if !maildir.exists(&id) {
let mail_data = mail.body().unwrap_or_default(); let mail_data = mail.body().unwrap_or_default();
maildir.store_new_with_id(&id, mail_data)?; maildir.store_new_with_id(&id, mail_data)?;
@ -121,22 +122,31 @@ fn sync(
let mails = all_mail.query_map(params![mailbox], |row| let mails = all_mail.query_map(params![mailbox], |row|
Ok((load_i64(row.get::<_, i64>(0)?), row.get::<_, String>(1)?)))? Ok((load_i64(row.get::<_, i64>(0)?), row.get::<_, String>(1)?)))?
.map(|x| x.unwrap()).collect_vec(); .map(|x| x.unwrap()).collect_vec();
let mut removed = Vec::new();
for (uid, message_id) in mails { for (uid, message_id) in mails {
let uid1 = (uid >> 32) as u32; let uid1 = (uid >> 32) as u32;
let uid2 = ((uid << 32) >> 32) as u32; let uid2 = ((uid << 32) >> 32) as u32;
if !remote_mails.contains_key(&message_id) { if !remote_mails.contains_key(&message_id) {
let uid_name = gen_id(uid1, uid2); removed.push((uid1, uid2, uid));
println!("removing: {}/{}", mailbox, uid_name);
if !maildirs.contains_key(".gone") {
maildirs.insert(".gone", get_maildir(".gone")?);
}
let maildir = &maildirs[mailbox];
let name = maildir.find_filename(&uid_name).unwrap();
maildirs[".gone"].store_new_from_path(&format!("{}_{}", mailbox, uid_name), name)?;
maildir.delete(&uid_name)?;
delete_mail.execute(params![mailbox, uid])?;
} }
} }
if !removed.is_empty() {
to_remove.insert(mailbox, removed);
}
}
for mailbox in to_remove.keys() {
for &(uid1, uid2, uid) in &to_remove[mailbox] {
let uid_name = gen_id(uid1, uid2);
println!("removing: {}/{}", mailbox, uid_name);
if !maildirs.contains_key(".gone") {
maildirs.insert(".gone", get_maildir(".gone")?);
}
let maildir = &maildirs[mailbox];
let name = maildir.find_filename(&uid_name).unwrap();
maildirs[".gone"].store_new_from_path(&format!("{}_{}", mailbox, uid_name), name)?;
maildir.delete(&uid_name)?;
delete_mail.execute(params![mailbox, uid])?;
}
} }
// be nice to the server and log out // be nice to the server and log out