Introduce MaybeError type
This commit is contained in:
1 parent
d836b57d2a
commit
a60ed37cd4
16 files changed
+127
-93
No files matched your search
@@ -1,4 +1,4 @@
|
||||
use crate::notification::NotificationData;
|
||||
use crate::notification::{MaybeError, NotificationData};
|
||||
use crate::notification::NotificationData::{DbLoadError, DbSaveError};
|
||||
use iced::futures::StreamExt;
|
||||
use rusqlite::Connection;
|
||||
@@ -22,7 +22,7 @@ pub fn set_setting(
|
||||
key: String,
|
||||
value: String,
|
||||
connection: &Connection,
|
||||
) -> Result<(), NotificationData> {
|
||||
) -> MaybeError {
|
||||
let current = get_settings_list(connection)?;
|
||||
if current.contains(&key) {
|
||||
update_settings(key, value, connection)?;
|
||||
@@ -33,7 +33,7 @@ pub fn set_setting(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn delete_settings(key: String, connection: &Connection) -> Result<(), NotificationData> {
|
||||
pub fn delete_settings(key: String, connection: &Connection) -> MaybeError {
|
||||
connection
|
||||
.execute("DELETE FROM settings WHERE id = ?1", (&key,))
|
||||
.map_err(|_| DbSaveError)?;
|
||||
@@ -44,7 +44,7 @@ fn create_settings(
|
||||
key: String,
|
||||
value: String,
|
||||
connection: &Connection,
|
||||
) -> Result<(), NotificationData> {
|
||||
) -> MaybeError {
|
||||
connection
|
||||
.execute(
|
||||
"INSERT into settings (id, value) VALUES (?1, ?2)",
|
||||
@@ -58,7 +58,7 @@ fn update_settings(
|
||||
key: String,
|
||||
value: String,
|
||||
connection: &Connection,
|
||||
) -> Result<(), NotificationData> {
|
||||
) -> MaybeError {
|
||||
connection
|
||||
.execute(
|
||||
"update settings
|
||||
|
||||
Reference in new issue
Block a user