Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-21 07:46:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #339 from deltachat/rm_goto_dc_job

Browse Source 
rm GOTO: dc job
This commit is contained in:
Jikstra
2019-08-13 02:10:08 +02:00
committed by GitHub
parent 2445b12898 9e30df4b43
commit 139c9f37b1
1 changed files with 170 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

237
src/dc_job.rs
View File

@@ -292,7 +292,7 @@ unsafe fn dc_suspend_smtp_thread(context: &Context, suspend: bool) {
#[allow(non_snake_case)] #[allow(non_snake_case)]
unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) { unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) {
let mut current_block: u64; let ok_to_continue;
let mut filename: *mut libc::c_char = 0 as *mut libc::c_char; let mut filename: *mut libc::c_char = 0 as *mut libc::c_char;
let mut buf: *mut libc::c_void = 0 as *mut libc::c_void; let mut buf: *mut libc::c_void = 0 as *mut libc::c_void;
let mut buf_bytes: size_t = 0i32 as size_t; let mut buf_bytes: size_t = 0i32 as size_t;
@@ -304,15 +304,14 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) {
if !connected { if !connected {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
current_block = 14216916617354591294; ok_to_continue = false;
} else { } else {
current_block = 13109137661213826276; ok_to_continue = true;
} }
} else { } else {
current_block = 13109137661213826276; ok_to_continue = true;
} }
match current_block { if ok_to_continue {
13109137661213826276 => {
let filename_s = job.param.get(Param::File).unwrap_or_default(); let filename_s = job.param.get(Param::File).unwrap_or_default();
filename = filename_s.strdup(); filename = filename_s.strdup();
if strlen(filename) == 0 { if strlen(filename) == 0 {
@@ -336,33 +335,29 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) {
/* if there is a msg-id and it does not exist in the db, cancel sending. /* if there is a msg-id and it does not exist in the db, cancel sending.
this happends if dc_delete_msgs() was called this happends if dc_delete_msgs() was called
before the generated mime was sent out */ before the generated mime was sent out */
let ok_to_continue1;
if 0 != job.foreign_id { if 0 != job.foreign_id {
if 0 == dc_msg_exists(context, job.foreign_id) { if 0 == dc_msg_exists(context, job.foreign_id) {
warn!( warn!(
context, context,
0, 0, "Message {} for job {} does not exist", job.foreign_id, job.job_id,
"Message {} for job {} does not exist",
job.foreign_id,
job.job_id,
); );
current_block = 14216916617354591294; ok_to_continue1 = false;
} else { } else {
current_block = 11194104282611034094; ok_to_continue1 = true;
} }
} else { } else {
current_block = 11194104282611034094; ok_to_continue1 = true;
} }
match current_block { if ok_to_continue1 {
14216916617354591294 => {}
_ => {
/* send message */ /* send message */
let body = let body = std::slice::from_raw_parts(buf as *const u8, buf_bytes).to_vec();
std::slice::from_raw_parts(buf as *const u8, buf_bytes).to_vec(); if 0 == context
if 0 == context.smtp.lock().unwrap().send( .smtp
context, .lock()
recipients_list, .unwrap()
body, .send(context, recipients_list, body)
) { {
context.smtp.lock().unwrap().disconnect(); context.smtp.lock().unwrap().disconnect();
dc_job_try_again_later( dc_job_try_again_later(
job, job,
@@ -372,11 +367,7 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) {
} else { } else {
dc_delete_file(context, filename_s); dc_delete_file(context, filename_s);
if 0 != job.foreign_id { if 0 != job.foreign_id {
dc_update_msg_state( dc_update_msg_state(context, job.foreign_id, DC_STATE_OUT_DELIVERED);
context,
job.foreign_id,
DC_STATE_OUT_DELIVERED,
);
let chat_id: i32 = context let chat_id: i32 = context
.sql .sql
.query_row_col( .query_row_col(
@@ -397,9 +388,6 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) {
} }
} }
} }
}
_ => {}
}
free(buf); free(buf);
free(filename as *mut libc::c_void); free(filename as *mut libc::c_void);
} }
@@ -417,7 +405,7 @@ pub unsafe fn dc_job_try_again_later(
#[allow(non_snake_case)] #[allow(non_snake_case)]
unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) { unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) {
let mut current_block: u64; let ok_to_continue;
let msg = dc_msg_new_untyped(context); let msg = dc_msg_new_untyped(context);
let mut dest_uid: uint32_t = 0i32 as uint32_t; let mut dest_uid: uint32_t = 0i32 as uint32_t;
@@ -427,15 +415,14 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) {
connect_to_inbox(context, &inbox); connect_to_inbox(context, &inbox);
if !inbox.is_connected() { if !inbox.is_connected() {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
current_block = 2238328302157162973; ok_to_continue = false;
} else { } else {
current_block = 2473556513754201174; ok_to_continue = true;
} }
} else { } else {
current_block = 2473556513754201174; ok_to_continue = true;
} }
match current_block { if ok_to_continue {
2473556513754201174 => {
if dc_msg_load_from_db(msg, context, job.foreign_id) { if dc_msg_load_from_db(msg, context, job.foreign_id) {
if context if context
.sql .sql
@@ -459,44 +446,16 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) {
) as libc::c_uint ) as libc::c_uint
{ {
1 => { 1 => {
current_block = 6379107252614456477;
match current_block {
12072121998757195963 => {
dc_update_server_uid(
context,
(*msg).rfc724_mid,
&dest_folder,
dest_uid,
);
}
_ => {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
} }
}
}
3 => { 3 => {
current_block = 12072121998757195963; dc_update_server_uid(context, (*msg).rfc724_mid, &dest_folder, dest_uid);
match current_block {
12072121998757195963 => {
dc_update_server_uid(
context,
(*msg).rfc724_mid,
&dest_folder,
dest_uid,
);
}
_ => {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
}
}
} }
0 | 2 | _ => {} 0 | 2 | _ => {}
} }
} }
} }
} }
_ => {}
}
dc_msg_unref(msg); dc_msg_unref(msg);
} }
@@ -514,7 +473,7 @@ fn connect_to_inbox(context: &Context, inbox: &Imap) -> libc::c_int {
#[allow(non_snake_case)] #[allow(non_snake_case)]
unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_job_t) { unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_job_t) {
let current_block: u64; let ok_to_continue;
let folder = job let folder = job
.param .param
.get(Param::ServerFolder) .get(Param::ServerFolder)
@@ -528,15 +487,14 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_
connect_to_inbox(context, &inbox); connect_to_inbox(context, &inbox);
if !inbox.is_connected() { if !inbox.is_connected() {
dc_job_try_again_later(job, 3, 0 as *const libc::c_char); dc_job_try_again_later(job, 3, 0 as *const libc::c_char);
current_block = 2670689566614003383; ok_to_continue = false;
} else { } else {
current_block = 11006700562992250127; ok_to_continue = true;
} }
} else { } else {
current_block = 11006700562992250127; ok_to_continue = true;
} }
match current_block { if ok_to_continue {
11006700562992250127 => {
if inbox.set_seen(context, &folder, uid) == 0 { if inbox.set_seen(context, &folder, uid) == 0 {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
} }
@@ -551,21 +509,17 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_
} }
let dest_folder = context.sql.get_config(context, "configured_mvbox_folder"); let dest_folder = context.sql.get_config(context, "configured_mvbox_folder");
if let Some(dest_folder) = dest_folder { if let Some(dest_folder) = dest_folder {
if 1 == inbox.mv(context, folder, uid, dest_folder, &mut dest_uid) if 1 == inbox.mv(context, folder, uid, dest_folder, &mut dest_uid) as libc::c_uint {
as libc::c_uint
{
dc_job_try_again_later(job, 3, 0 as *const libc::c_char); dc_job_try_again_later(job, 3, 0 as *const libc::c_char);
} }
} }
} }
} }
_ => {}
}
} }
#[allow(non_snake_case)] #[allow(non_snake_case)]
unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_job_t) { unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_job_t) {
let mut current_block: u64; let ok_to_continue;
let msg: *mut dc_msg_t = dc_msg_new_untyped(context); let msg: *mut dc_msg_t = dc_msg_new_untyped(context);
let inbox = context.inbox.read().unwrap(); let inbox = context.inbox.read().unwrap();
@@ -573,76 +527,19 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_
connect_to_inbox(context, &inbox); connect_to_inbox(context, &inbox);
if !inbox.is_connected() { if !inbox.is_connected() {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
current_block = 17792648348530113339; ok_to_continue = false;
} else { } else {
current_block = 15240798224410183470; ok_to_continue = true;
} }
} else { } else {
current_block = 15240798224410183470; ok_to_continue = true;
} }
match current_block { if ok_to_continue {
15240798224410183470 => {
if dc_msg_load_from_db(msg, context, job.foreign_id) { if dc_msg_load_from_db(msg, context, job.foreign_id) {
let server_folder = (*msg).server_folder.as_ref().unwrap(); let server_folder = (*msg).server_folder.as_ref().unwrap();
match inbox.set_seen(context, server_folder, (*msg).server_uid) as libc::c_uint { match inbox.set_seen(context, server_folder, (*msg).server_uid) as libc::c_uint {
0 => {} 0 => {}
1 => { 1 => {
current_block = 12392248546350854223;
match current_block {
12392248546350854223 => {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
}
_ => {
if 0 != (*msg).param.get_int(Param::WantsMdn).unwrap_or_default()
&& 0 != context
.sql
.get_config_int(context, "mdns_enabled")
.unwrap_or_else(|| 1)
{
let folder = (*msg).server_folder.as_ref().unwrap();
match inbox.set_mdnsent(context, folder, (*msg).server_uid)
as libc::c_uint
{
1 => {
current_block = 4016212065805849280;
match current_block {
6186957421461061791 => {
dc_send_mdn(context, (*msg).id);
}
_ => {
dc_job_try_again_later(
job,
3i32,
0 as *const libc::c_char,
);
}
}
}
3 => {
current_block = 6186957421461061791;
match current_block {
6186957421461061791 => {
dc_send_mdn(context, (*msg).id);
}
_ => {
dc_job_try_again_later(
job,
3i32,
0 as *const libc::c_char,
);
}
}
}
0 | 2 | _ => {}
}
}
}
}
}
_ => {
current_block = 7746791466490516765;
match current_block {
12392248546350854223 => {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
} }
_ => { _ => {
@@ -654,39 +551,14 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_
{ {
let folder = (*msg).server_folder.as_ref().unwrap(); let folder = (*msg).server_folder.as_ref().unwrap();
match inbox.set_mdnsent(context, folder, (*msg).server_uid) match inbox.set_mdnsent(context, folder, (*msg).server_uid) as libc::c_uint
as libc::c_uint
{ {
1 => { 1 => {
current_block = 4016212065805849280; dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
match current_block {
6186957421461061791 => {
dc_send_mdn(context, (*msg).id);
}
_ => {
dc_job_try_again_later(
job,
3i32,
0 as *const libc::c_char,
);
}
}
} }
3 => { 3 => {
current_block = 6186957421461061791;
match current_block {
6186957421461061791 => {
dc_send_mdn(context, (*msg).id); dc_send_mdn(context, (*msg).id);
} }
_ => {
dc_job_try_again_later(
job,
3i32,
0 as *const libc::c_char,
);
}
}
}
0 | 2 | _ => {} 0 | 2 | _ => {}
} }
} }
@@ -694,10 +566,6 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_
} }
} }
} }
}
}
_ => {}
}
dc_msg_unref(msg); dc_msg_unref(msg);
} }
unsafe fn dc_send_mdn(context: &Context, msg_id: uint32_t) { unsafe fn dc_send_mdn(context: &Context, msg_id: uint32_t) {
@@ -863,7 +731,6 @@ pub unsafe fn dc_interrupt_imap_idle(context: &Context) {
#[allow(non_snake_case)] #[allow(non_snake_case)]
unsafe fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(context: &Context, job: &mut dc_job_t) { unsafe fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(context: &Context, job: &mut dc_job_t) {
let mut current_block: u64;
let mut delete_from_server: libc::c_int = 1i32; let mut delete_from_server: libc::c_int = 1i32;
let msg: *mut dc_msg_t = dc_msg_new_untyped(context); let msg: *mut dc_msg_t = dc_msg_new_untyped(context);
let inbox = context.inbox.read().unwrap(); let inbox = context.inbox.read().unwrap();
@@ -872,6 +739,7 @@ unsafe fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(context: &Context, job: &mut dc_jo
|| (*msg).rfc724_mid.is_null() || (*msg).rfc724_mid.is_null()
|| *(*msg).rfc724_mid.offset(0isize) as libc::c_int == 0i32) || *(*msg).rfc724_mid.offset(0isize) as libc::c_int == 0i32)
{ {
let ok_to_continue1;
/* eg. device messages have no Message-ID */ /* eg. device messages have no Message-ID */
if dc_rfc724_mid_cnt(context, (*msg).rfc724_mid) != 1i32 { if dc_rfc724_mid_cnt(context, (*msg).rfc724_mid) != 1i32 {
info!( info!(
@@ -882,40 +750,37 @@ unsafe fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(context: &Context, job: &mut dc_jo
} }
/* if this is the last existing part of the message, we delete the message from the server */ /* if this is the last existing part of the message, we delete the message from the server */
if 0 != delete_from_server { if 0 != delete_from_server {
let ok_to_continue;
if !inbox.is_connected() { if !inbox.is_connected() {
connect_to_inbox(context, &inbox); connect_to_inbox(context, &inbox);
if !inbox.is_connected() { if !inbox.is_connected() {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
current_block = 8913536887710889399; ok_to_continue = false;
} else { } else {
current_block = 5399440093318478209; ok_to_continue = true;
} }
} else { } else {
current_block = 5399440093318478209; ok_to_continue = true;
} }
match current_block { if ok_to_continue {
8913536887710889399 => {}
_ => {
let mid = CStr::from_ptr((*msg).rfc724_mid).to_str().unwrap(); let mid = CStr::from_ptr((*msg).rfc724_mid).to_str().unwrap();
let server_folder = (*msg).server_folder.as_ref().unwrap(); let server_folder = (*msg).server_folder.as_ref().unwrap();
if 0 == inbox.delete_msg(context, mid, server_folder, &mut (*msg).server_uid) { if 0 == inbox.delete_msg(context, mid, server_folder, &mut (*msg).server_uid) {
dc_job_try_again_later(job, -1i32, 0 as *const libc::c_char); dc_job_try_again_later(job, -1i32, 0 as *const libc::c_char);
current_block = 8913536887710889399; ok_to_continue1 = false;
} else { } else {
current_block = 17407779659766490442; ok_to_continue1 = true;
}
}
} }
} else { } else {
current_block = 17407779659766490442; ok_to_continue1 = false;
} }
match current_block { } else {
8913536887710889399 => {} ok_to_continue1 = true;
_ => { }
if ok_to_continue1 {
dc_delete_msg_from_db(context, (*msg).id); dc_delete_msg_from_db(context, (*msg).id);
} }
} }
}
dc_msg_unref(msg); dc_msg_unref(msg);
} }