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

rename sql-config-setters to set_raw_config*()

Browse Source 
the rename is reasonable as the getter is called get_raw_config*()
and to make the functional difference to context.set|get_config() clearer.
This commit is contained in:
B. Petersen
2019-10-03 21:57:40 +02:00
committed by Floris Bruynooghe
parent 79b92727cc
commit 93f0f5ccae
8 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/repl/cmdline.rs
View File

@@ -122,7 +122,7 @@ fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int {
real_spec = to_string(spec); real_spec = to_string(spec);
context context
.sql .sql
.set_config(context, "import_spec", Some(&real_spec)) .set_raw_config(context, "import_spec", Some(&real_spec))
.unwrap(); .unwrap();
} else { } else {
let rs = context.sql.get_raw_config(context, "import_spec"); let rs = context.sql.get_raw_config(context, "import_spec");

12
src/config.rs
View File

@@ -115,20 +115,20 @@ impl Context {
Config::Selfavatar if value.is_some() => { Config::Selfavatar if value.is_some() => {
let rel_path = std::fs::canonicalize(value.unwrap())?; let rel_path = std::fs::canonicalize(value.unwrap())?;
self.sql self.sql
.set_config(self, key, Some(&rel_path.to_string_lossy())) .set_raw_config(self, key, Some(&rel_path.to_string_lossy()))
} }
Config::InboxWatch => { Config::InboxWatch => {
let ret = self.sql.set_config(self, key, value); let ret = self.sql.set_raw_config(self, key, value);
interrupt_imap_idle(self); interrupt_imap_idle(self);
ret ret
} }
Config::SentboxWatch => { Config::SentboxWatch => {
let ret = self.sql.set_config(self, key, value); let ret = self.sql.set_raw_config(self, key, value);
interrupt_sentbox_idle(self); interrupt_sentbox_idle(self);
ret ret
} }
Config::MvboxWatch => { Config::MvboxWatch => {
let ret = self.sql.set_config(self, key, value); let ret = self.sql.set_raw_config(self, key, value);
interrupt_mvbox_idle(self); interrupt_mvbox_idle(self);
ret ret
} }
@@ -140,9 +140,9 @@ impl Context {
value value
}; };
self.sql.set_config(self, key, val) self.sql.set_raw_config(self, key, val)
} }
_ => self.sql.set_config(self, key, value), _ => self.sql.set_raw_config(self, key, value),
} }
} }
} }

4
src/configure/mod.rs
View File

@@ -114,7 +114,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {
param.addr = oauth2_addr; param.addr = oauth2_addr;
context context
.sql .sql
.set_config(context, "addr", Some(param.addr.as_str())) .set_raw_config(context, "addr", Some(param.addr.as_str()))
.ok(); .ok();
} }
progress!(context, 20); progress!(context, 20);
@@ -501,7 +501,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) {
) )
.ok(); .ok();
context.sql.set_config_bool(context, "configured", true); context.sql.set_raw_config_bool(context, "configured", true);
true true
} }
18 => { 18 => {

8
src/imap.rs
View File

@@ -884,7 +884,7 @@ impl Imap {
let key = format!("imap.mailbox.{}", folder.as_ref()); let key = format!("imap.mailbox.{}", folder.as_ref());
let val = format!("{}:{}", uidvalidity, lastseenuid); let val = format!("{}:{}", uidvalidity, lastseenuid);
context.sql.set_config(context, &key, Some(&val)).ok(); context.sql.set_raw_config(context, &key, Some(&val)).ok();
} }
fn fetch_single_msg<S: AsRef<str>>( fn fetch_single_msg<S: AsRef<str>>(
@@ -1396,18 +1396,18 @@ impl Imap {
context context
.sql .sql
.set_config_int(context, "folders_configured", 3) .set_raw_config_int(context, "folders_configured", 3)
.ok(); .ok();
if let Some(ref mvbox_folder) = mvbox_folder { if let Some(ref mvbox_folder) = mvbox_folder {
context context
.sql .sql
.set_config(context, "configured_mvbox_folder", Some(mvbox_folder)) .set_raw_config(context, "configured_mvbox_folder", Some(mvbox_folder))
.ok(); .ok();
} }
if let Some(ref sentbox_folder) = sentbox_folder { if let Some(ref sentbox_folder) = sentbox_folder {
context context
.sql .sql
.set_config( .set_raw_config(
context, context,
"configured_sentbox_folder", "configured_sentbox_folder",
Some(sentbox_folder.name()), Some(sentbox_folder.name()),

4
src/imex.rs
View File

@@ -313,7 +313,7 @@ fn set_self_key(
}; };
context context
.sql .sql
.set_config_int(context, "e2ee_enabled", e2ee_enabled)?; .set_raw_config_int(context, "e2ee_enabled", e2ee_enabled)?;
} }
None => { None => {
if prefer_encrypt_required { if prefer_encrypt_required {
@@ -695,7 +695,7 @@ fn export_backup(context: &Context, dir: impl AsRef<Path>) -> Result<()> {
} }
if ok_to_continue { if ok_to_continue {
if sql if sql
.set_config_int(context, "backup_time", now as i32) .set_raw_config_int(context, "backup_time", now as i32)
.is_ok() .is_ok()
{ {
context.call_cb(Event::ImexFileWritten(dest_path_filename.clone())); context.call_cb(Event::ImexFileWritten(dest_path_filename.clone()));

24
src/login_param.rs
View File

@@ -129,40 +129,40 @@ impl LoginParam {
let sql = &context.sql; let sql = &context.sql;
let key = format!("{}addr", prefix); let key = format!("{}addr", prefix);
sql.set_config(context, key, Some(&self.addr))?; sql.set_raw_config(context, key, Some(&self.addr))?;
let key = format!("{}mail_server", prefix); let key = format!("{}mail_server", prefix);
sql.set_config(context, key, Some(&self.mail_server))?; sql.set_raw_config(context, key, Some(&self.mail_server))?;
let key = format!("{}mail_port", prefix); let key = format!("{}mail_port", prefix);
sql.set_config_int(context, key, self.mail_port)?; sql.set_raw_config_int(context, key, self.mail_port)?;
let key = format!("{}mail_user", prefix); let key = format!("{}mail_user", prefix);
sql.set_config(context, key, Some(&self.mail_user))?; sql.set_raw_config(context, key, Some(&self.mail_user))?;
let key = format!("{}mail_pw", prefix); let key = format!("{}mail_pw", prefix);
sql.set_config(context, key, Some(&self.mail_pw))?; sql.set_raw_config(context, key, Some(&self.mail_pw))?;
let key = format!("{}imap_certificate_checks", prefix); let key = format!("{}imap_certificate_checks", prefix);
sql.set_config_int(context, key, self.imap_certificate_checks as i32)?; sql.set_raw_config_int(context, key, self.imap_certificate_checks as i32)?;
let key = format!("{}send_server", prefix); let key = format!("{}send_server", prefix);
sql.set_config(context, key, Some(&self.send_server))?; sql.set_raw_config(context, key, Some(&self.send_server))?;
let key = format!("{}send_port", prefix); let key = format!("{}send_port", prefix);
sql.set_config_int(context, key, self.send_port)?; sql.set_raw_config_int(context, key, self.send_port)?;
let key = format!("{}send_user", prefix); let key = format!("{}send_user", prefix);
sql.set_config(context, key, Some(&self.send_user))?; sql.set_raw_config(context, key, Some(&self.send_user))?;
let key = format!("{}send_pw", prefix); let key = format!("{}send_pw", prefix);
sql.set_config(context, key, Some(&self.send_pw))?; sql.set_raw_config(context, key, Some(&self.send_pw))?;
let key = format!("{}smtp_certificate_checks", prefix); let key = format!("{}smtp_certificate_checks", prefix);
sql.set_config_int(context, key, self.smtp_certificate_checks as i32)?; sql.set_raw_config_int(context, key, self.smtp_certificate_checks as i32)?;
let key = format!("{}server_flags", prefix); let key = format!("{}server_flags", prefix);
sql.set_config_int(context, key, self.server_flags)?; sql.set_raw_config_int(context, key, self.server_flags)?;
Ok(()) Ok(())
} }

12
src/oauth2.rs
View File

@@ -50,7 +50,7 @@ pub fn dc_get_oauth2_url(
if let Some(oauth2) = Oauth2::from_address(addr) { if let Some(oauth2) = Oauth2::from_address(addr) {
if context if context
.sql .sql
.set_config( .set_raw_config(
context, context,
"oauth2_pending_redirect_uri", "oauth2_pending_redirect_uri",
Some(redirect_uri.as_ref()), Some(redirect_uri.as_ref()),
@@ -159,11 +159,11 @@ pub fn dc_get_oauth2_access_token(
if let Some(ref token) = response.refresh_token { if let Some(ref token) = response.refresh_token {
context context
.sql .sql
.set_config(context, "oauth2_refresh_token", Some(token)) .set_raw_config(context, "oauth2_refresh_token", Some(token))
.ok(); .ok();
context context
.sql .sql
.set_config(context, "oauth2_refresh_token_for", Some(code.as_ref())) .set_raw_config(context, "oauth2_refresh_token_for", Some(code.as_ref()))
.ok(); .ok();
} }
@@ -172,7 +172,7 @@ pub fn dc_get_oauth2_access_token(
if let Some(ref token) = response.access_token { if let Some(ref token) = response.access_token {
context context
.sql .sql
.set_config(context, "oauth2_access_token", Some(token)) .set_raw_config(context, "oauth2_access_token", Some(token))
.ok(); .ok();
let expires_in = response let expires_in = response
.expires_in .expires_in
@@ -181,13 +181,13 @@ pub fn dc_get_oauth2_access_token(
.unwrap_or_else(|| 0); .unwrap_or_else(|| 0);
context context
.sql .sql
.set_config_int64(context, "oauth2_timestamp_expires", expires_in) .set_raw_config_int64(context, "oauth2_timestamp_expires", expires_in)
.ok(); .ok();
if update_redirect_uri_on_success { if update_redirect_uri_on_success {
context context
.sql .sql
.set_config(context, "oauth2_redirect_uri", Some(redirect_uri.as_ref())) .set_raw_config(context, "oauth2_redirect_uri", Some(redirect_uri.as_ref()))
.ok(); .ok();
} }
} else { } else {

68
src/sql.rs
View File

@@ -193,14 +193,14 @@ impl Sql {
/// ///
/// Setting `None` deletes the value. On failure an error message /// Setting `None` deletes the value. On failure an error message
/// will already have been logged. /// will already have been logged.
pub fn set_config( pub fn set_raw_config(
&self, &self,
context: &Context, context: &Context,
key: impl AsRef<str>, key: impl AsRef<str>,
value: Option<&str>, value: Option<&str>,
) -> Result<()> { ) -> Result<()> {
if !self.is_open() { if !self.is_open() {
error!(context, "set_config(): Database not ready."); error!(context, "set_raw_config(): Database not ready.");
return Err(Error::SqlNoConnection); return Err(Error::SqlNoConnection);
} }
@@ -234,7 +234,7 @@ impl Sql {
match res { match res {
Ok(_) => Ok(()), Ok(_) => Ok(()),
Err(err) => { Err(err) => {
error!(context, "set_config(): Cannot change value. {:?}", &err); error!(context, "set_raw_config(): Cannot change value. {:?}", &err);
Err(err) Err(err)
} }
} }
@@ -252,13 +252,13 @@ impl Sql {
) )
} }
pub fn set_config_int( pub fn set_raw_config_int(
&self, &self,
context: &Context, context: &Context,
key: impl AsRef<str>, key: impl AsRef<str>,
value: i32, value: i32,
) -> Result<()> { ) -> Result<()> {
self.set_config(context, key, Some(&format!("{}", value))) self.set_raw_config(context, key, Some(&format!("{}", value)))
} }
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> {
@@ -272,21 +272,21 @@ impl Sql {
self.get_raw_config_int(context, key).unwrap_or_default() > 0 self.get_raw_config_int(context, key).unwrap_or_default() > 0
} }
pub fn set_config_bool<T>(&self, context: &Context, key: T, value: bool) -> Result<()> pub fn set_raw_config_bool<T>(&self, context: &Context, key: T, value: bool) -> Result<()>
where where
T: AsRef<str>, T: AsRef<str>,
{ {
let value = if value { Some("1") } else { None }; let value = if value { Some("1") } else { None };
self.set_config(context, key, value) self.set_raw_config(context, key, value)
} }
pub fn set_config_int64( pub fn set_raw_config_int64(
&self, &self,
context: &Context, context: &Context,
key: impl AsRef<str>, key: impl AsRef<str>,
value: i64, value: i64,
) -> Result<()> { ) -> Result<()> {
self.set_config(context, key, Some(&format!("{}", value))) self.set_raw_config(context, key, Some(&format!("{}", value)))
} }
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> {
@@ -479,7 +479,7 @@ fn open(
// cannot create the tables - maybe we cannot write? // cannot create the tables - maybe we cannot write?
return Err(Error::SqlFailedToOpen); return Err(Error::SqlFailedToOpen);
} else { } else {
sql.set_config_int(context, "dbversion", 0)?; sql.set_raw_config_int(context, "dbversion", 0)?;
} }
} else { } else {
exists_before_update = 1; exists_before_update = 1;
@@ -507,7 +507,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 1; dbversion = 1;
sql.set_config_int(context, "dbversion", 1)?; sql.set_raw_config_int(context, "dbversion", 1)?;
} }
if dbversion < 2 { if dbversion < 2 {
info!(context, "[migration] v2"); info!(context, "[migration] v2");
@@ -516,7 +516,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 2; dbversion = 2;
sql.set_config_int(context, "dbversion", 2)?; sql.set_raw_config_int(context, "dbversion", 2)?;
} }
if dbversion < 7 { if dbversion < 7 {
info!(context, "[migration] v7"); info!(context, "[migration] v7");
@@ -531,7 +531,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 7; dbversion = 7;
sql.set_config_int(context, "dbversion", 7)?; sql.set_raw_config_int(context, "dbversion", 7)?;
} }
if dbversion < 10 { if dbversion < 10 {
info!(context, "[migration] v10"); info!(context, "[migration] v10");
@@ -550,7 +550,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 10; dbversion = 10;
sql.set_config_int(context, "dbversion", 10)?; sql.set_raw_config_int(context, "dbversion", 10)?;
} }
if dbversion < 12 { if dbversion < 12 {
info!(context, "[migration] v12"); info!(context, "[migration] v12");
@@ -563,7 +563,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 12; dbversion = 12;
sql.set_config_int(context, "dbversion", 12)?; sql.set_raw_config_int(context, "dbversion", 12)?;
} }
if dbversion < 17 { if dbversion < 17 {
info!(context, "[migration] v17"); info!(context, "[migration] v17");
@@ -578,7 +578,7 @@ fn open(
)?; )?;
sql.execute("CREATE INDEX msgs_index5 ON msgs (starred);", params![])?; sql.execute("CREATE INDEX msgs_index5 ON msgs (starred);", params![])?;
dbversion = 17; dbversion = 17;
sql.set_config_int(context, "dbversion", 17)?; sql.set_raw_config_int(context, "dbversion", 17)?;
} }
if dbversion < 18 { if dbversion < 18 {
info!(context, "[migration] v18"); info!(context, "[migration] v18");
@@ -588,7 +588,7 @@ fn open(
)?; )?;
sql.execute("ALTER TABLE acpeerstates ADD COLUMN gossip_key;", params![])?; sql.execute("ALTER TABLE acpeerstates ADD COLUMN gossip_key;", params![])?;
dbversion = 18; dbversion = 18;
sql.set_config_int(context, "dbversion", 18)?; sql.set_raw_config_int(context, "dbversion", 18)?;
} }
if dbversion < 27 { if dbversion < 27 {
info!(context, "[migration] v27"); info!(context, "[migration] v27");
@@ -606,7 +606,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 27; dbversion = 27;
sql.set_config_int(context, "dbversion", 27)?; sql.set_raw_config_int(context, "dbversion", 27)?;
} }
if dbversion < 34 { if dbversion < 34 {
info!(context, "[migration] v34"); info!(context, "[migration] v34");
@@ -636,7 +636,7 @@ fn open(
)?; )?;
recalc_fingerprints = 1; recalc_fingerprints = 1;
dbversion = 34; dbversion = 34;
sql.set_config_int(context, "dbversion", 34)?; sql.set_raw_config_int(context, "dbversion", 34)?;
} }
if dbversion < 39 { if dbversion < 39 {
info!(context, "[migration] v39"); info!(context, "[migration] v39");
@@ -667,7 +667,7 @@ fn open(
)?; )?;
} }
dbversion = 39; dbversion = 39;
sql.set_config_int(context, "dbversion", 39)?; sql.set_raw_config_int(context, "dbversion", 39)?;
} }
if dbversion < 40 { if dbversion < 40 {
info!(context, "[migration] v40"); info!(context, "[migration] v40");
@@ -676,25 +676,25 @@ fn open(
params![], params![],
)?; )?;
dbversion = 40; dbversion = 40;
sql.set_config_int(context, "dbversion", 40)?; sql.set_raw_config_int(context, "dbversion", 40)?;
} }
if dbversion < 41 { if dbversion < 41 {
info!(context, "[migration] v41"); info!(context, "[migration] v41");
update_file_paths = 1; update_file_paths = 1;
dbversion = 41; dbversion = 41;
sql.set_config_int(context, "dbversion", 41)?; sql.set_raw_config_int(context, "dbversion", 41)?;
} }
if dbversion < 42 { if dbversion < 42 {
info!(context, "[migration] v42"); info!(context, "[migration] v42");
sql.execute("UPDATE msgs SET txt='' WHERE type!=10", params![])?; sql.execute("UPDATE msgs SET txt='' WHERE type!=10", params![])?;
dbversion = 42; dbversion = 42;
sql.set_config_int(context, "dbversion", 42)?; sql.set_raw_config_int(context, "dbversion", 42)?;
} }
if dbversion < 44 { if dbversion < 44 {
info!(context, "[migration] v44"); info!(context, "[migration] v44");
sql.execute("ALTER TABLE msgs ADD COLUMN mime_headers TEXT;", params![])?; sql.execute("ALTER TABLE msgs ADD COLUMN mime_headers TEXT;", params![])?;
dbversion = 44; dbversion = 44;
sql.set_config_int(context, "dbversion", 44)?; sql.set_raw_config_int(context, "dbversion", 44)?;
} }
if dbversion < 46 { if dbversion < 46 {
info!(context, "[migration] v46"); info!(context, "[migration] v46");
@@ -707,7 +707,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 46; dbversion = 46;
sql.set_config_int(context, "dbversion", 46)?; sql.set_raw_config_int(context, "dbversion", 46)?;
} }
if dbversion < 47 { if dbversion < 47 {
info!(context, "[migration] v47"); info!(context, "[migration] v47");
@@ -716,7 +716,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 47; dbversion = 47;
sql.set_config_int(context, "dbversion", 47)?; sql.set_raw_config_int(context, "dbversion", 47)?;
} }
if dbversion < 48 { if dbversion < 48 {
info!(context, "[migration] v48"); info!(context, "[migration] v48");
@@ -726,7 +726,7 @@ fn open(
)?; )?;
dbversion = 48; dbversion = 48;
sql.set_config_int(context, "dbversion", 48)?; sql.set_raw_config_int(context, "dbversion", 48)?;
} }
if dbversion < 49 { if dbversion < 49 {
info!(context, "[migration] v49"); info!(context, "[migration] v49");
@@ -735,15 +735,15 @@ fn open(
params![], params![],
)?; )?;
dbversion = 49; dbversion = 49;
sql.set_config_int(context, "dbversion", 49)?; sql.set_raw_config_int(context, "dbversion", 49)?;
} }
if dbversion < 50 { if dbversion < 50 {
info!(context, "[migration] v50"); info!(context, "[migration] v50");
if 0 != exists_before_update { if 0 != exists_before_update {
sql.set_config_int(context, "show_emails", 2)?; sql.set_raw_config_int(context, "show_emails", 2)?;
} }
dbversion = 50; dbversion = 50;
sql.set_config_int(context, "dbversion", 50)?; sql.set_raw_config_int(context, "dbversion", 50)?;
} }
if dbversion < 53 { if dbversion < 53 {
info!(context, "[migration] v53"); info!(context, "[migration] v53");
@@ -776,7 +776,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 53; dbversion = 53;
sql.set_config_int(context, "dbversion", 53)?; sql.set_raw_config_int(context, "dbversion", 53)?;
} }
if dbversion < 54 { if dbversion < 54 {
info!(context, "[migration] v54"); info!(context, "[migration] v54");
@@ -786,7 +786,7 @@ fn open(
)?; )?;
sql.execute("CREATE INDEX msgs_index6 ON msgs (location_id);", params![])?; sql.execute("CREATE INDEX msgs_index6 ON msgs (location_id);", params![])?;
dbversion = 54; dbversion = 54;
sql.set_config_int(context, "dbversion", 54)?; sql.set_raw_config_int(context, "dbversion", 54)?;
} }
if dbversion < 55 { if dbversion < 55 {
info!(context, "[migration] v55"); info!(context, "[migration] v55");
@@ -795,7 +795,7 @@ fn open(
params![], params![],
)?; )?;
sql.set_config_int(context, "dbversion", 55)?; sql.set_raw_config_int(context, "dbversion", 55)?;
} }
if 0 != recalc_fingerprints { if 0 != recalc_fingerprints {
@@ -842,7 +842,7 @@ fn open(
NO_PARAMS, NO_PARAMS,
)?; )?;
sql.set_config(context, "backup_for", None)?; sql.set_raw_config(context, "backup_for", None)?;
} }
} }