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

cargo fmt

Browse Source
This commit is contained in:
B. Petersen
2019-10-03 17:41:09 +02:00
parent dca9afa10b
commit a953b494cb
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/job.rs
View File

@@ -225,7 +225,9 @@ impl Job {
{ {
inbox.configure_folders(context, 0x1i32); inbox.configure_folders(context, 0x1i32);
} }
let dest_folder = context.sql.get_raw_config(context, "configured_mvbox_folder"); let dest_folder = context
.sql
.get_raw_config(context, "configured_mvbox_folder");
if let Some(dest_folder) = dest_folder { if let Some(dest_folder) = dest_folder {
let server_folder = msg.server_folder.as_ref().unwrap(); let server_folder = msg.server_folder.as_ref().unwrap();
@@ -333,7 +335,9 @@ impl Job {
{ {
inbox.configure_folders(context, 0x1i32); inbox.configure_folders(context, 0x1i32);
} }
let dest_folder = context.sql.get_raw_config(context, "configured_mvbox_folder"); let dest_folder = context
.sql
.get_raw_config(context, "configured_mvbox_folder");
if let Some(dest_folder) = dest_folder { if let Some(dest_folder) = dest_folder {
let mut dest_uid = 0; let mut dest_uid = 0;
if ImapResult::RetryLater if ImapResult::RetryLater

10
src/sql.rs
View File

@@ -262,7 +262,8 @@ impl Sql {
} }
pub fn get_raw_config_int(&self, context: &Context, key: impl AsRef<str>) -> Option<i32> { pub fn get_raw_config_int(&self, context: &Context, key: impl AsRef<str>) -> Option<i32> {
self.get_raw_config(context, key).and_then(|s| s.parse().ok()) self.get_raw_config(context, key)
.and_then(|s| s.parse().ok())
} }
pub fn get_raw_config_bool(&self, context: &Context, key: impl AsRef<str>) -> bool { pub fn get_raw_config_bool(&self, context: &Context, key: impl AsRef<str>) -> bool {
@@ -289,7 +290,8 @@ impl Sql {
} }
pub fn get_raw_config_int64(&self, context: &Context, key: impl AsRef<str>) -> Option<i64> { pub fn get_raw_config_int64(&self, context: &Context, key: impl AsRef<str>) -> Option<i64> {
self.get_raw_config(context, key).and_then(|r| r.parse().ok()) self.get_raw_config(context, key)
.and_then(|r| r.parse().ok())
} }
fn start_stmt(&self, stmt: impl AsRef<str>) { fn start_stmt(&self, stmt: impl AsRef<str>) {
@@ -481,7 +483,9 @@ fn open(
} }
} else { } else {
exists_before_update = 1; exists_before_update = 1;
dbversion_before_update = sql.get_raw_config_int(context, "dbversion").unwrap_or_default(); dbversion_before_update = sql
.get_raw_config_int(context, "dbversion")
.unwrap_or_default();
} }
// (1) update low-level database structure. // (1) update low-level database structure.