clean things up somewhat

Cargo.lock

@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "anyhow"
+version = "1.0.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704"
+
 [[package]]
 name = "ascii"
 version = "1.0.0"
@@ -79,6 +85,7 @@ checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
 name = "crow"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "base64-url",
  "blake2",
  "lmdb-zero",

Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0.58"
 base64-url = "1.4.13"
 blake2 = "0.10.4"
 lmdb-zero = "0.4.4"

src/main.rs

@@ -2,7 +2,7 @@ extern crate multipart;
 extern crate tiny_http;
 
 use blake2::{Blake2s256, Digest};
-use lmdb::LmdbResultExt;
+use lmdb::{Database, Environment, LmdbResultExt};
 use lmdb_zero as lmdb;
 use multipart::server::Multipart;
 use std::{
@@ -12,17 +12,52 @@ use std::{
 };
 use tiny_http::{Request, Response};
 
-fn main() {
+#[derive(Clone)]
+pub struct DatabaseContext {
+    env: Arc<Environment>,
+    binary_store: Arc<Database<'static>>,
+    image_store: Arc<Database<'static>>,
+}
+
+impl DatabaseContext {
+    pub fn create(path: &str) -> anyhow::Result<DatabaseContext> {
         let env = Arc::new(unsafe {
-        lmdb::EnvBuilder::new()
+            let mut builder = lmdb::EnvBuilder::new()?;
-            .unwrap()
+            builder.set_maxdbs(2)?;
-            .open("./db", lmdb::open::Flags::empty(), 0o600)
+            builder.open(path, lmdb::open::NOTLS, 0o600)?
-            .unwrap()
         });
 
-    let db = Arc::new(
+        let binary_store = Arc::new(lmdb::Database::open(
-        lmdb::Database::open(env.clone(), None, &lmdb::DatabaseOptions::defaults()).unwrap(),
+            env.clone(),
-    );
+            Some("binary"),
+            &lmdb::DatabaseOptions::new(lmdb::db::CREATE),
+        )?);
+        let image_store = Arc::new(lmdb::Database::open(
+            env.clone(),
+            Some("image"),
+            &lmdb::DatabaseOptions::new(lmdb::db::CREATE),
+        )?);
+
+        Ok(DatabaseContext {
+            env,
+            binary_store,
+            image_store,
+        })
+    }
+
+    #[inline]
+    pub fn write_txn(&self) -> anyhow::Result<lmdb::WriteTransaction<'static>> {
+        lmdb::WriteTransaction::new(self.env.clone()).map_err(anyhow::Error::from)
+    }
+
+    #[inline]
+    pub fn read_txn(&self) -> anyhow::Result<lmdb::ReadTransaction<'static>> {
+        lmdb::ReadTransaction::new(self.env.clone()).map_err(anyhow::Error::from)
+    }
+}
+
+fn main() -> anyhow::Result<()> {
+    let database_context = DatabaseContext::create("./db")?;
 
     let server =
         Arc::new(tiny_http::Server::http("localhost:8000").expect("Could not bind localhost:8000"));
@@ -31,23 +66,17 @@ fn main() {
 
     for _ in 0..4 {
         let server = server.clone();
-        let db = db.clone();
+        let db = database_context.clone();
-        let env = env.clone();
 
         let guard = thread::spawn(move || loop {
             let request = server.recv().unwrap();
 
             match request.url() {
                 "/upload" => {
-                    let mut txn = lmdb::WriteTransaction::new(env.clone()).unwrap();
+                    process_upload(request, &db).unwrap();
-
-                    process_upload(request, &mut txn, db.clone()).unwrap();
-
-                    txn.commit().unwrap();
                 }
                 s if s.starts_with("/get/") => {
-                    let mut txn = lmdb::ReadTransaction::new(env.clone()).unwrap();
+                    process_get(request, &db).unwrap();
-                    process_get(request, &mut txn, db.clone()).unwrap();
                 }
                 _ => todo!(),
             }
@@ -59,61 +88,65 @@ fn main() {
     for guard in guards {
         guard.join().unwrap();
     }
+
+    Ok(())
 }
 
-fn process_upload(
+fn process_upload(mut request: Request, db_context: &DatabaseContext) -> anyhow::Result<()> {
-    mut request: Request,
+    if let Some(mut entry) = Multipart::from_request(&mut request)
-    txn: &mut lmdb::WriteTransaction<'_>,
+        .ok()
-    db: Arc<lmdb::Database<'_>>,
+        .and_then(|v| v.into_entry().into_result().ok())
-) -> io::Result<()> {
+        .flatten()
-    if let Ok(form) = Multipart::from_request(&mut request) {
+    {
-        if let Some(mut entry) = form.into_entry().into_result()? {
         let mut data: Vec<u8> = Vec::with_capacity(20000);
         entry.data.read_to_end(&mut data)?;
 
         let data_hash = Blake2s256::digest(&data);
 
+        let txn = db_context.write_txn()?;
+
         let mut accessor = txn.access();
+
         if accessor
-                .get::<[u8], [u8]>(&db, data_hash.as_slice())
+            .get::<[u8], [u8]>(&db_context.binary_store, data_hash.as_slice())
-                .to_opt()
+            .to_opt()?
-                .unwrap()
             .is_some()
         {
-                println!("found dupe!");
             request.respond(Response::from_string(base64_url::encode(&data_hash)))?;
             return Ok(());
         }
 
-            accessor
+        accessor.put(
-                .put(&db, data_hash.as_slice(), &data, lmdb::put::Flags::empty())
+            &db_context.binary_store,
-                .unwrap();
+            data_hash.as_slice(),
+            &data,
+            lmdb::put::Flags::empty(),
+        )?;
 
         request.respond(Response::from_string(base64_url::encode(&data_hash)))?;
-        }
+
+        drop(accessor);
+
+        txn.commit()?;
     }
 
     Ok(())
 }
 
-fn process_get(
+fn process_get(request: Request, db_context: &DatabaseContext) -> anyhow::Result<()> {
-    request: Request,
+    if let Some(get_id) = request.url().strip_prefix("/get/").and_then(|s| {
-    txn: &mut lmdb::ReadTransaction<'_>,
-    db: Arc<lmdb::Database<'_>>,
-) -> io::Result<()> {
-    let get_id = request
-        .url()
-        .strip_prefix("/get/")
-        .and_then(|s| {
         let mut out: [u8; 32] = [0; 32];
         base64_url::decode_to_slice(s, &mut out).ok()?;
         Some(out)
-        })
+    }) {
-        .unwrap();
+        let read = db_context.read_txn()?;
+        let access = read.access();
 
-    let access = txn.access();
+        if let Some(data) = access
-
+            .get::<[u8], [u8]>(&db_context.binary_store, &get_id)
-    if let Some(data) = access.get::<[u8], [u8]>(&db, &get_id).to_opt().unwrap() {
+            .to_opt()
+            .unwrap()
+        {
             request.respond(Response::new(
                 200.into(),
                 vec![],
@@ -124,6 +157,9 @@ fn process_get(
         } else {
             request.respond(Response::empty(404))?;
         }
+    } else {
+        request.respond(Response::empty(400))?;
+    }
 
     Ok(())
 }