Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-25 01:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move more methods onto the sql struct

Browse Source
This commit is contained in:
dignifiedquire
2019-07-15 00:33:02 +02:00
parent 668c647fdd
commit cdfc8c6fa7
24 changed files with 562 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/dc_job.rs
View File

@@ -355,14 +355,15 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) {
dc_delete_file(context, filename);
if 0 != job.foreign_id {
dc_update_msg_state(context, job.foreign_id, 26i32);
let chat_id: i32 = sql::query_row(
context,
&context.sql,
"SELECT chat_id FROM msgs WHERE id=?",
params![job.foreign_id as i32],
0,
)
.unwrap_or_default();
let chat_id: i32 = context
.sql
.query_row_col(
context,
"SELECT chat_id FROM msgs WHERE id=?",
params![job.foreign_id as i32],
0,
)
.unwrap_or_default();
context.call_cb(
Event::MSG_DELIVERED,
chat_id as uintptr_t,
@@ -414,11 +415,12 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) {
match current_block {
2473556513754201174 => {
if dc_msg_load_from_db(msg, context, job.foreign_id) {
if sql::get_config_int(context, &context.sql, "folders_configured", 0) < 3 {
if context.sql.get_config_int(context, "folders_configured", 0) < 3 {
inbox.configure_folders(context, 0x1i32);
}
let dest_folder =
sql::get_config(context, &context.sql, "configured_mvbox_folder", None);
let dest_folder = context
.sql
.get_config(context, "configured_mvbox_folder", None);
if let Some(dest_folder) = dest_folder {
let server_folder = as_str((*msg).server_folder);
@@ -510,11 +512,12 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
}
if 0 != dc_param_get_int(job.param, 'M' as i32, 0i32) {
if sql::get_config_int(context, &context.sql, "folders_configured", 0) < 3 {
if context.sql.get_config_int(context, "folders_configured", 0) < 3 {
inbox.configure_folders(context, 0x1i32);
}
let dest_folder =
sql::get_config(context, &context.sql, "configured_mvbox_folder", None);
let dest_folder = context
.sql
.get_config(context, "configured_mvbox_folder", None);
if let Some(dest_folder) = dest_folder {
if 1 == inbox.mv(context, folder, uid, dest_folder, &mut dest_uid)
as libc::c_uint
@@ -559,12 +562,7 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_
}
_ => {
if 0 != dc_param_get_int((*msg).param, 'r' as i32, 0i32)
&& 0 != sql::get_config_int(
context,
&context.sql,
"mdns_enabled",
1,
)
&& 0 != context.sql.get_config_int(context, "mdns_enabled", 1)
{
let folder =
CStr::from_ptr((*msg).server_folder).to_str().unwrap();
@@ -615,12 +613,7 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_
}
_ => {
if 0 != dc_param_get_int((*msg).param, 'r' as i32, 0i32)
&& 0 != sql::get_config_int(
context,
&context.sql,
"mdns_enabled",
1,
)
&& 0 != context.sql.get_config_int(context, "mdns_enabled", 1)
{
let folder =
CStr::from_ptr((*msg).server_folder).to_str().unwrap();
@@ -909,7 +902,7 @@ pub unsafe fn dc_perform_imap_fetch(context: &Context) {
if 0 == connect_to_inbox(context, &inbox) {
return;
}
if sql::get_config_int(context, &context.sql, "inbox_watch", 1) == 0 {
if context.sql.get_config_int(context, "inbox_watch", 1) == 0 {
info!(context, 0, "INBOX-watch disabled.",);
return;
}
@@ -945,7 +938,7 @@ pub fn dc_perform_imap_idle(context: &Context) {
}
pub unsafe fn dc_perform_mvbox_fetch(context: &Context) {
let use_network = sql::get_config_int(context, &context.sql, "mvbox_watch", 1);
let use_network = context.sql.get_config_int(context, "mvbox_watch", 1);
dc_jobthread_fetch(
context,
&mut context.mvbox_thread.clone().write().unwrap(),
@@ -954,7 +947,7 @@ pub unsafe fn dc_perform_mvbox_fetch(context: &Context) {
}
pub unsafe fn dc_perform_mvbox_idle(context: &Context) {
let use_network = sql::get_config_int(context, &context.sql, "mvbox_watch", 1);
let use_network = context.sql.get_config_int(context, "mvbox_watch", 1);
dc_jobthread_idle(
context,
@@ -968,7 +961,7 @@ pub unsafe fn dc_interrupt_mvbox_idle(context: &Context) {
}
pub unsafe fn dc_perform_sentbox_fetch(context: &Context) {
let use_network = sql::get_config_int(context, &context.sql, "sentbox_watch", 1);
let use_network = context.sql.get_config_int(context, "sentbox_watch", 1);
dc_jobthread_fetch(
context,
&mut context.sentbox_thread.clone().write().unwrap(),
@@ -977,7 +970,7 @@ pub unsafe fn dc_perform_sentbox_fetch(context: &Context) {
}
pub unsafe fn dc_perform_sentbox_idle(context: &Context) {
let use_network = sql::get_config_int(context, &context.sql, "sentbox_watch", 1);
let use_network = context.sql.get_config_int(context, "sentbox_watch", 1);
dc_jobthread_idle(
context,
&context.sentbox_thread.clone().read().unwrap(),
@@ -1049,14 +1042,15 @@ pub unsafe fn dc_perform_smtp_idle(context: &Context) {
}
unsafe fn get_next_wakeup_time(context: &Context, thread: libc::c_int) -> Duration {
let t: i64 = sql::query_row(
context,
&context.sql,
"SELECT MIN(desired_timestamp) FROM jobs WHERE thread=?;",
params![thread],
0,
)
.unwrap_or_default();
let t: i64 = context
.sql
.query_row_col(
context,
"SELECT MIN(desired_timestamp) FROM jobs WHERE thread=?;",
params![thread],
0,
)
.unwrap_or_default();
let mut wakeup_time = Duration::new(10 * 60, 0);
let now = time();