aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2023-11-02 11:51:03 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2023-11-02 11:51:03 +0100
commit553ea25f1854706b60ce6f087545968533ef6140 (patch)
tree9affda3665b1cbc6a7aca82cdc789555788321ba /src
parent1f28832deaff3a2319cc88d5a83ffe506b784fc8 (diff)
downloadaerogramme-553ea25f1854706b60ce6f087545968533ef6140.tar.gz
aerogramme-553ea25f1854706b60ce6f087545968533ef6140.zip
gradually implement our interface
Diffstat (limited to 'src')
-rw-r--r--src/login/mod.rs2
-rw-r--r--src/mail/mailbox.rs9
-rw-r--r--src/storage/garage.rs8
-rw-r--r--src/storage/in_memory.rs10
-rw-r--r--src/storage/mod.rs61
5 files changed, 65 insertions, 25 deletions
diff --git a/src/login/mod.rs b/src/login/mod.rs
index 6c948cc..afade28 100644
--- a/src/login/mod.rs
+++ b/src/login/mod.rs
@@ -109,7 +109,7 @@ impl Region {
impl Credentials {
- pub fn k2v_client(&self) -> Result<RowStore, Error> {
+ pub fn k2v_client(&self) -> Result<RowStore> {
self.storage.row.row_store()
}
pub fn s3_client(&self) -> Result<S3Client> {
diff --git a/src/mail/mailbox.rs b/src/mail/mailbox.rs
index d92140d..614382e 100644
--- a/src/mail/mailbox.rs
+++ b/src/mail/mailbox.rs
@@ -14,6 +14,7 @@ use crate::login::Credentials;
use crate::mail::uidindex::*;
use crate::mail::unique_ident::*;
use crate::mail::IMF;
+use crate::storage::{RowStore, BlobStore};
use crate::time::now_msec;
pub struct Mailbox {
@@ -50,8 +51,8 @@ impl Mailbox {
id,
bucket: creds.bucket().to_string(),
encryption_key: creds.keys.master.clone(),
- k2v: creds.k2v_client()?,
- s3: creds.s3_client()?,
+ k2v: creds.storage.builders.row_store()?,
+ s3: creds.storage.builders.blob_store()?,
uid_index,
mail_path,
});
@@ -186,8 +187,8 @@ struct MailboxInternal {
mail_path: String,
encryption_key: Key,
- k2v: K2vClient,
- s3: S3Client,
+ k2v: RowStore,
+ s3: BlobStore,
uid_index: Bayou<UidIndex>,
}
diff --git a/src/storage/garage.rs b/src/storage/garage.rs
index c2ca1d3..dfee88d 100644
--- a/src/storage/garage.rs
+++ b/src/storage/garage.rs
@@ -6,8 +6,12 @@ pub struct GrgStore {}
pub struct GrgRef {}
pub struct GrgValue {}
-impl IRowBuilder for GrgCreds {
- fn row_store(&self) -> Result<RowStore, Error> {
+impl IBuilder for GrgCreds {
+ fn row_store(&self) -> Result<RowStore, StorageError> {
+ unimplemented!();
+ }
+
+ fn blob_store(&self) -> Result<BlobStore, StorageError> {
unimplemented!();
}
}
diff --git a/src/storage/in_memory.rs b/src/storage/in_memory.rs
index 6fa8138..80e7fdf 100644
--- a/src/storage/in_memory.rs
+++ b/src/storage/in_memory.rs
@@ -2,13 +2,17 @@ use futures::FutureExt;
use crate::storage::*;
#[derive(Clone, Debug)]
-pub struct MemCreds {}
+pub struct FullMem {}
pub struct MemStore {}
pub struct MemRef {}
pub struct MemValue {}
-impl IRowBuilder for MemCreds {
- fn row_store(&self) -> Result<RowStore, Error> {
+impl IBuilder for FullMem {
+ fn row_store(&self) -> Result<RowStore, StorageError> {
+ unimplemented!();
+ }
+
+ fn blob_store(&self) -> Result<BlobStore, StorageError> {
unimplemented!();
}
}
diff --git a/src/storage/mod.rs b/src/storage/mod.rs
index c20853b..a2bdd43 100644
--- a/src/storage/mod.rs
+++ b/src/storage/mod.rs
@@ -25,20 +25,30 @@ pub enum Alternative {
type ConcurrentValues = Vec<Alternative>;
#[derive(Debug)]
-pub enum Error {
+pub enum StorageError {
NotFound,
Internal,
}
+impl std::fmt::Display for StorageError {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ f.write_str("Storage Error: ");
+ match self {
+ Self::NotFound => f.write_str("Item not found"),
+ Self::Internal => f.write_str("An internal error occured"),
+ }
+ }
+}
+impl std::error::Error for StorageError {}
pub struct Engine {
pub bucket: String,
- pub row: RowBuilder,
+ pub builders: Builder,
}
impl Clone for Engine {
fn clone(&self) -> Self {
Engine {
bucket: "test".into(),
- row: Box::new(in_memory::MemCreds{})
+ builders: Box::new(in_memory::FullMem{})
}
}
}
@@ -48,24 +58,22 @@ impl std::fmt::Debug for Engine {
}
}
-// A result
-pub type AsyncResult<'a, T> = BoxFuture<'a, Result<T, Error>>;
+// Utils
+pub type AsyncResult<'a, T> = BoxFuture<'a, Result<T, StorageError>>;
-// ------ Row Builder
-pub trait IRowBuilder
-{
- fn row_store(&self) -> Result<RowStore, Error>;
+pub trait IBuilder {
+ fn row_store(&self) -> Result<RowStore, StorageError>;
+ fn blob_store(&self) -> Result<BlobStore, StorageError>;
}
-pub type RowBuilder = Box<dyn IRowBuilder + Send + Sync>;
+pub type Builder = Box<dyn IBuilder + Send + Sync>;
-// ------ Row Store
+// ------ Row
pub trait IRowStore
{
fn new_row(&self, partition: &str, sort: &str) -> RowRef;
}
-pub type RowStore = Box<dyn IRowStore>;
+pub type RowStore = Box<dyn IRowStore + Sync + Send>;
-// ------- Row Item
pub trait IRowRef
{
fn set_value(&self, content: Vec<u8>) -> RowValue;
@@ -73,7 +81,7 @@ pub trait IRowRef
fn rm(&self) -> AsyncResult<()>;
fn poll(&self) -> AsyncResult<Option<RowValue>>;
}
-type RowRef = Box<dyn IRowRef>;
+pub type RowRef = Box<dyn IRowRef>;
pub trait IRowValue
{
@@ -81,4 +89,27 @@ pub trait IRowValue
fn content(&self) -> ConcurrentValues;
fn push(&self) -> AsyncResult<()>;
}
-type RowValue = Box<dyn IRowValue>;
+pub type RowValue = Box<dyn IRowValue>;
+
+// ------- Blob
+pub trait IBlobStore
+{
+ fn new_blob(&self, key: &str) -> BlobRef;
+ fn list(&self) -> AsyncResult<Vec<BlobRef>>;
+}
+pub type BlobStore = Box<dyn IBlobStore + Send + Sync>;
+
+pub trait IBlobRef
+{
+ fn set_value(&self, content: Vec<u8>) -> BlobValue;
+ fn fetch(&self) -> AsyncResult<BlobValue>;
+ fn copy(&self, dst: &BlobRef) -> AsyncResult<()>;
+ fn rm(&self) -> AsyncResult<()>;
+}
+pub type BlobRef = Box<dyn IBlobRef>;
+
+pub trait IBlobValue {
+ fn to_ref(&self) -> BlobRef;
+ fn push(&self) -> AsyncResult<()>;
+}
+pub type BlobValue = Box<dyn IBlobValue>;