Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 12:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

more fetch progress

Browse Source
This commit is contained in:
dignifiedquire
2019-05-04 12:40:21 +02:00
committed by Lars-Magnus Skog
parent 67809957cd
commit 424e9db112
2 changed files with 132 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/simple.rs
View File

@@ -84,6 +84,7 @@ fn main() {
dc_open(&ctx, dbfile.as_ptr(), std::ptr::null()); dc_open(&ctx, dbfile.as_ptr(), std::ptr::null());
println!("configuring"); println!("configuring");
let pw = std::env::args().collect::<Vec<String>>()[1].clone();
dc_set_config( dc_set_config(
&ctx, &ctx,
CString::new("addr").unwrap().as_ptr(), CString::new("addr").unwrap().as_ptr(),
@@ -92,7 +93,7 @@ fn main() {
dc_set_config( dc_set_config(
&ctx, &ctx,
CString::new("mail_pw").unwrap().as_ptr(), CString::new("mail_pw").unwrap().as_ptr(),
CString::new("***").unwrap().as_ptr(), CString::new(pw).unwrap().as_ptr(),
); );
dc_configure(&ctx); dc_configure(&ctx);

345
src/dc_imap.rs
View File

@@ -137,6 +137,21 @@ impl Session {
Session::Insecure(i) => i.select(mailbox_name), Session::Insecure(i) => i.select(mailbox_name),
} }
} }
pub fn fetch<S1, S2>(
&mut self,
sequence_set: S1,
query: S2,
) -> imap::error::Result<imap::types::ZeroCopy<Vec<imap::types::Fetch>>>
where
S1: AsRef<str>,
S2: AsRef<str>,
{
match self {
Session::Secure(i) => i.fetch(sequence_set, query),
Session::Insecure(i) => i.fetch(sequence_set, query),
}
}
} }
pub struct ImapConfig { pub struct ImapConfig {
@@ -149,15 +164,13 @@ pub struct ImapConfig {
pub connected: i32, pub connected: i32,
pub idle_set_up: i32, pub idle_set_up: i32,
pub selected_folder: Option<String>, pub selected_folder: Option<String>,
pub selected_mailbox: Option<imap::types::Mailbox>,
pub selected_folder_needs_expunge: bool, pub selected_folder_needs_expunge: bool,
pub should_reconnect: i32, pub should_reconnect: i32,
pub can_idle: i32, pub can_idle: i32,
pub has_xlist: i32, pub has_xlist: i32,
pub imap_delimiter: char, pub imap_delimiter: char,
pub watch_folder: Option<String>, pub watch_folder: Option<String>,
pub fetch_type_prefetch: *mut mailimap_fetch_type,
pub fetch_type_body: *mut mailimap_fetch_type,
pub fetch_type_flags: *mut mailimap_fetch_type,
pub log_connect_errors: i32, pub log_connect_errors: i32,
pub skip_log_capabilities: i32, pub skip_log_capabilities: i32,
} }
@@ -174,44 +187,21 @@ impl Default for ImapConfig {
connected: 0, connected: 0,
idle_set_up: 0, idle_set_up: 0,
selected_folder: None, selected_folder: None,
selected_mailbox: None,
selected_folder_needs_expunge: false, selected_folder_needs_expunge: false,
should_reconnect: 0, should_reconnect: 0,
can_idle: 0, can_idle: 0,
has_xlist: 0, has_xlist: 0,
imap_delimiter: '.', imap_delimiter: '.',
watch_folder: None, watch_folder: None,
fetch_type_prefetch: unsafe { mailimap_fetch_type_new_fetch_att_list_empty() },
fetch_type_body: unsafe { mailimap_fetch_type_new_fetch_att_list_empty() },
fetch_type_flags: unsafe { mailimap_fetch_type_new_fetch_att_list_empty() },
log_connect_errors: 1, log_connect_errors: 1,
skip_log_capabilities: 0, skip_log_capabilities: 0,
}; };
unsafe { // prefetch: UID, Envelope,
mailimap_fetch_type_new_fetch_att_list_add( // new: body, body_peek_section
cfg.fetch_type_prefetch, // flags: flags
mailimap_fetch_att_new_uid(),
);
mailimap_fetch_type_new_fetch_att_list_add(
cfg.fetch_type_prefetch,
mailimap_fetch_att_new_envelope(),
);
mailimap_fetch_type_new_fetch_att_list_add(
cfg.fetch_type_body,
mailimap_fetch_att_new_flags(),
);
mailimap_fetch_type_new_fetch_att_list_add(
cfg.fetch_type_body,
mailimap_fetch_att_new_body_peek_section(mailimap_section_new(
0 as *mut mailimap_section_spec,
)),
);
mailimap_fetch_type_new_fetch_att_list_add(
cfg.fetch_type_flags,
mailimap_fetch_att_new_flags(),
);
}
cfg cfg
} }
} }
@@ -435,7 +425,9 @@ impl dc_imap_t {
if let Some(folder) = folder { if let Some(folder) = folder {
if let Some(ref mut session) = *self.session.lock().unwrap() { if let Some(ref mut session) = *self.session.lock().unwrap() {
match session.select(folder) { match session.select(folder) {
Ok(_) => {} Ok(mailbox) => {
self.config.write().unwrap().selected_mailbox = Some(mailbox);
}
Err(err) => { Err(err) => {
eprintln!("select error: {:?}", err); eprintln!("select error: {:?}", err);
unsafe { unsafe {
@@ -460,7 +452,7 @@ impl dc_imap_t {
&self, &self,
context: &dc_context_t, context: &dc_context_t,
folder: S, folder: S,
) -> (usize, usize) { ) -> (u32, u32) {
let key = format!("imap.mailbox.{}", folder.as_ref()); let key = format!("imap.mailbox.{}", folder.as_ref());
let val1 = unsafe { let val1 = unsafe {
self.get_config.expect("non-null function pointer")( self.get_config.expect("non-null function pointer")(
@@ -513,168 +505,101 @@ impl dc_imap_t {
println!("selected folder {}", folder.as_ref()); println!("selected folder {}", folder.as_ref());
let (uid_validity, last_seen_uid) = self.get_config_last_seen_uid(context, &folder); let (mut uid_validity, mut last_seen_uid) = self.get_config_last_seen_uid(context, &folder);
println!("got validity: {} - {}", uid_validity, last_seen_uid); println!("got validity: {} - {}", uid_validity, last_seen_uid);
0 let config = self.config.read().unwrap();
// } else if select_folder(context, imap, folder) == 0 { let mailbox = config.selected_mailbox.as_ref().expect("just selected");
// dc_log_warning(
// context, if mailbox.uid_validity.is_none() {
// 0, unsafe {
// b"Cannot select folder %s for fetching.\x00" as *const u8 as *const libc::c_char, dc_log_error(
// folder, context,
// ); 0,
// } else { b"Cannot get UIDVALIDITY for folder \"%s\".\x00" as *const u8
// println!( as *const libc::c_char,
// "fetching from folder {}", CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(),
// std::ffi::CStr::from_ptr(folder).to_str().unwrap() )
// ); };
// get_config_lastseenuid(context, imap, folder, &mut uidvalidity, &mut lastseenuid); return 0;
// if uidvalidity != (*(*imap.etpan).imap_selection_info).sel_uidvalidity { }
// /* first time this folder is selected or UIDVALIDITY has changed, init lastseenuid and save it to config */
// if (*(*imap.etpan).imap_selection_info).sel_uidvalidity <= 0 as libc::c_uint { if mailbox.uid_validity.unwrap() != uid_validity {
// dc_log_error( // first time this folder is selected or UIDVALIDITY has changed, init lastseenuid and save it to config
// context,
// 0, if mailbox.exists == 0 {
// b"Cannot get UIDVALIDITY for folder \"%s\".\x00" as *const u8 unsafe {
// as *const libc::c_char, dc_log_info(
// folder, context,
// ); 0,
// current_block = 17288151659885296046; b"Folder \"%s\" is empty.\x00" as *const u8 as *const libc::c_char,
// } else { CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(),
// if 0 != (*(*imap.etpan).imap_selection_info).sel_has_exists() { )
// if (*(*imap.etpan).imap_selection_info).sel_exists <= 0 as libc::c_uint { };
// dc_log_info(
// context, // set lastseenuid=0 for empty folders.
// 0, // id we do not do this here, we'll miss the first message
// b"Folder \"%s\" is empty.\x00" as *const u8 as *const libc::c_char, // as we will get in here again and fetch from lastseenuid+1 then
// folder,
// ); // TODO.
// if (*(*imap.etpan).imap_selection_info).sel_exists == 0 as libc::c_uint // self.set_config_last_seen_uid(context, &folder, mailbox.exists, 0);
// { return 0;
// set_config_lastseenuid( }
// context,
// imap, if let Some(ref mut session) = *self.session.lock().unwrap() {
// folder, // `FETCH <message sequence number> (UID)`
// (*(*imap.etpan).imap_selection_info).sel_uidvalidity, let set = format!("{}", mailbox.exists);
// 0 as uint32_t, let query = "(UID ENVELOPE)";
// ); println!("fetching: {} {}", set, query);
// } match session.fetch(set, query) {
// current_block = 17288151659885296046; Ok(list) => {
// } else { println!("fetched {} messages", list.len());
// set = mailimap_set_new_single(
// (*(*imap.etpan).imap_selection_info).sel_exists, last_seen_uid = list[0].uid.unwrap_or_else(|| 0);
// );
// current_block = 11057878835866523405; // if the UIDVALIDITY has _changed_, decrease lastseenuid by one to avoid gaps (well add 1 below
// } if uid_validity > 0 && last_seen_uid > 1 {
// } else { last_seen_uid -= 1;
// dc_log_info( }
// context,
// 0, uid_validity = mailbox.uid_validity.unwrap();
// b"EXISTS is missing for folder \"%s\", using fallback.\x00" as *const u8 self.set_config_last_seen_uid(
// as *const libc::c_char, context,
// folder, &folder,
// ); uid_validity,
// set = mailimap_set_new_single(0 as uint32_t); last_seen_uid,
// current_block = 11057878835866523405; );
// } unsafe {
// match current_block { dc_log_info(
// 17288151659885296046 => {} context,
// _ => { 0,
// r = mailimap_fetch( b"lastseenuid initialized to %i for %s@%i\x00" as *const u8
// imap.etpan, as *const libc::c_char,
// set, last_seen_uid as libc::c_int,
// imap.fetch_type_prefetch, CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(),
// &mut fetch_result, uid_validity as libc::c_int,
// ); );
// if !set.is_null() { }
// mailimap_set_free(set); }
// set = 0 as *mut mailimap_set Err(err) => {
// } eprintln!("fetch error: {:?}", err);
// if 0 != dc_imap_is_error(context, imap, r) || fetch_result.is_null() { unsafe {
// fetch_result = 0 as *mut clist; dc_log_info(
// dc_log_info( context,
// context, 0,
// 0, b"No result returned for folder \"%s\".\x00" as *const u8
// b"No result returned for folder \"%s\".\x00" as *const u8 as *const libc::c_char,
// as *const libc::c_char, CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(),
// folder, )
// ); };
// /* this might happen if the mailbox is empty an EXISTS does not work */ }
// current_block = 17288151659885296046; }
// } else { }
// cur = (*fetch_result).first; }
// if cur.is_null() {
// dc_log_info( let mut read_cnt = 0;
// context,
// 0,
// b"Empty result returned for folder \"%s\".\x00" as *const u8
// as *const libc::c_char,
// folder,
// );
// /* this might happen if the mailbox is empty an EXISTS does not work */
// current_block = 17288151659885296046;
// } else {
// let mut msg_att: *mut mailimap_msg_att = (if !cur.is_null() {
// (*cur).data
// } else {
// 0 as *mut libc::c_void
// })
// as *mut mailimap_msg_att;
// lastseenuid = peek_uid(msg_att);
// if !fetch_result.is_null() {
// mailimap_fetch_list_free(fetch_result);
// fetch_result = 0 as *mut clist
// }
// if lastseenuid <= 0 as libc::c_uint {
// dc_log_error(
// context,
// 0,
// b"Cannot get largest UID for folder \"%s\"\x00"
// as *const u8
// as *const libc::c_char,
// folder,
// );
// current_block = 17288151659885296046;
// } else {
// if uidvalidity > 0 as libc::c_uint
// && lastseenuid > 1 as libc::c_uint
// {
// lastseenuid = (lastseenuid as libc::c_uint)
// .wrapping_sub(1 as libc::c_uint)
// as uint32_t
// as uint32_t
// }
// uidvalidity =
// (*(*imap.etpan).imap_selection_info).sel_uidvalidity;
// set_config_lastseenuid(
// context,
// imap,
// folder,
// uidvalidity,
// lastseenuid,
// );
// dc_log_info(
// context,
// 0,
// b"lastseenuid initialized to %i for %s@%i\x00"
// as *const u8
// as *const libc::c_char,
// lastseenuid as libc::c_int,
// folder,
// uidvalidity as libc::c_int,
// );
// current_block = 2516253395664191498;
// }
// }
// }
// }
// }
// }
// } else {
// current_block = 2516253395664191498;
// }
// match current_block { // match current_block {
// 17288151659885296046 => {} // 17288151659885296046 => {}
// _ => { // _ => {
@@ -772,40 +697,30 @@ impl dc_imap_t {
// } // }
// } // }
// /* done */ unsafe {
// if 0 != read_errors { dc_log_info(
// dc_log_warning( context,
// context, 0i32,
// 0, b"%i mails read from \"%s\".\x00" as *const u8 as *const libc::c_char,
// b"%i mails read from \"%s\" with %i errors.\x00" as *const u8 read_cnt as libc::c_int,
// as *const libc::c_char, folder,
// read_cnt as libc::c_int, )
// folder, };
// read_errors as libc::c_int,
// );
// } else {
// dc_log_info(
// context,
// 0i32,
// b"%i mails read from \"%s\".\x00" as *const u8 as *const libc::c_char,
// read_cnt as libc::c_int,
// folder,
// );
// } // }
// if !fetch_result.is_null() { // if !fetch_result.is_null() {
// mailimap_fetch_list_free(fetch_result); // mailimap_fetch_list_free(fetch_result);
// fetch_result = 0 as *mut clist // fetch_result = 0 as *mut clist
// } // }
// read_cnt as libc::c_int read_cnt
} }
fn set_config_lastseenuid( fn set_config_last_seen_uid<S: AsRef<str>>(
&self, &self,
context: &dc_context_t, context: &dc_context_t,
folder: *const libc::c_char, folder: S,
uidvalidity: uint32_t, uidvalidity: u32,
lastseenuid: uint32_t, lastseenuid: u32,
) { ) {
unimplemented!() unimplemented!()
} }