Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 17:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from deltachat/fix-delete

Browse Source 
refactor(imap): use format! for warnings in deletion
This commit is contained in:
Friedel Ziegelmayer
2019-05-20 08:44:39 +02:00
committed by GitHub
parent 379fc72094 e9a42a3c56
commit d926b3536d
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/dc_imap.rs
View File

@@ -1500,18 +1500,22 @@ impl Imap {
info!( info!(
context, context,
0, 0,
"Marking message \"%s\", %s/%i for deletion...", format!(
&message_id, "Marking message \"{}\", {}/{} for deletion...",
CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(), message_id.as_ref(),
*server_uid as libc::c_int folder.as_ref(),
server_uid,
)
); );
if self.select_folder(context, Some(&folder)) == 0 { if self.select_folder(context, Some(&folder)) == 0 {
warn!( warn!(
context, context,
0, 0,
"Cannot select folder %s for deleting message.", format!(
CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(), "Cannot select folder {} for deleting message.",
folder.as_ref()
)
); );
} else { } else {
let set = format!("{}", server_uid); let set = format!("{}", server_uid);
@@ -1531,10 +1535,12 @@ impl Imap {
warn!( warn!(
context, context,
0, 0,
"Cannot delete on IMAP, %s/%i does not match %s.", format!(
CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(), "Cannot delete on IMAP, {}/{} does not match {}.",
*server_uid as libc::c_int, folder.as_ref(),
message_id, server_uid,
message_id.as_ref(),
)
); );
*server_uid = 0; *server_uid = 0;
} }
@@ -1545,9 +1551,11 @@ impl Imap {
warn!( warn!(
context, context,
0, 0,
"Cannot delete on IMAP, %s/%i not found.", format!(
CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(), "Cannot delete on IMAP, {}/{} not found.",
*server_uid as libc::c_int, folder.as_ref(),
server_uid,
)
); );
*server_uid = 0; *server_uid = 0;
} }

12
src/dc_sqlite3.rs
View File

@@ -1523,10 +1523,14 @@ pub unsafe fn dc_housekeeping(context: &dc_context_t) {
match std::fs::metadata(std::ffi::CStr::from_ptr(path).to_str().unwrap()) { match std::fs::metadata(std::ffi::CStr::from_ptr(path).to_str().unwrap()) {
Ok(stats) => { Ok(stats) => {
if stats.created().unwrap() > keep_files_newer_than let created =
|| stats.modified().unwrap() > keep_files_newer_than stats.created().is_ok() && stats.created().unwrap() > keep_files_newer_than;
|| stats.accessed().unwrap() > keep_files_newer_than let modified = stats.modified().is_ok()
{ && stats.modified().unwrap() > keep_files_newer_than;
let accessed = stats.accessed().is_ok()
&& stats.accessed().unwrap() > keep_files_newer_than;
if created || modified || accessed {
dc_log_info( dc_log_info(
context, context,
0, 0,