Rustic cleanups, dedups and making the code less hard to read in general (#251)

* typos :help_me:

* (part 1/?) massive cleanup to make the code more Rust-ic and cut down heap allocations.

* (part 2/?) massive cleanup to make the code more Rust-ic and cut down heap allocations.

* (part 3/?) cut down some pretty major heap allocations here - more Bytes and BytesMuts, less Vec<u8>s

also I don't really understand why you need to `to_vec` when you don't really use it again afterwards

* (part 4/?) deduplicate error handling in backblaze logic

* (part 5/?) fixes, cleanups, refactors, and reformatting

* (part 6/?) cleanups and refactors

* remove loads of `as_str` in types that already are `Display`

* Revert "remove loads of `as_str` in types that already are `Display`"

This reverts commit 4f974310cfb167ceba03001d81388db4f0fbb509.

* reformat and move routes util to the util module

* use streams

* Run prepare + formatting issues

Co-authored-by: Jai A <jaiagr+gpg@pm.me>
Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>

src/file_hosting/backblaze.rs

@@ -1,5 +1,8 @@
 use super::{DeleteFileData, FileHost, FileHostingError, UploadFileData};
 use async_trait::async_trait;
+use bytes::Bytes;
+use reqwest::Response;
+use serde::Deserialize;
 use sha2::Digest;
 
 mod authorization;
@@ -31,7 +34,7 @@ impl FileHost for BackblazeHost {
         &self,
         content_type: &str,
         file_name: &str,
-        file_bytes: Vec<u8>,
+        file_bytes: Bytes,
     ) -> Result<UploadFileData, FileHostingError> {
         let content_sha512 = format!("{:x}", sha2::Sha512::digest(&file_bytes));
 
@@ -79,3 +82,14 @@ impl FileHost for BackblazeHost {
         })
     }
 }
+
+pub async fn process_response<T>(response: Response) -> Result<T, FileHostingError>
+where
+    T: for<'de> Deserialize<'de>,
+{
+    if response.status().is_success() {
+        Ok(response.json().await?)
+    } else {
+        Err(FileHostingError::BackblazeError(response.json().await?))
+    }
+}

src/file_hosting/backblaze/authorization.rs

@@ -44,11 +44,7 @@ pub async fn authorize_account(
         .send()
         .await?;
 
-    if response.status().is_success() {
-        Ok(response.json().await?)
-    } else {
-        Err(FileHostingError::BackblazeError(response.json().await?))
-    }
+    super::process_response(response).await
 }
 
 pub async fn get_upload_url(
@@ -71,9 +67,5 @@ pub async fn get_upload_url(
         .send()
         .await?;
 
-    if response.status().is_success() {
-        Ok(response.json().await?)
-    } else {
-        Err(FileHostingError::BackblazeError(response.json().await?))
-    }
+    super::process_response(response).await
 }

src/file_hosting/backblaze/delete.rs

@@ -34,9 +34,5 @@ pub async fn delete_file_version(
         .send()
         .await?;
 
-    if response.status().is_success() {
-        Ok(response.json().await?)
-    } else {
-        Err(FileHostingError::BackblazeError(response.json().await?))
-    }
+    super::process_response(response).await
 }

src/file_hosting/backblaze/upload.rs

@@ -1,5 +1,6 @@
 use super::authorization::UploadUrlData;
 use crate::file_hosting::FileHostingError;
+use bytes::Bytes;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -21,7 +22,7 @@ pub async fn upload_file(
     url_data: &UploadUrlData,
     content_type: &str,
     file_name: &str,
-    file_bytes: Vec<u8>,
+    file_bytes: Bytes,
 ) -> Result<UploadFileData, FileHostingError> {
     let response = reqwest::Client::new()
         .post(&url_data.upload_url)
@@ -40,9 +41,5 @@ pub async fn upload_file(
         .send()
         .await?;
 
-    if response.status().is_success() {
-        Ok(response.json().await?)
-    } else {
-        Err(FileHostingError::BackblazeError(response.json().await?))
-    }
+    super::process_response(response).await
 }

src/file_hosting/mock.rs

@@ -1,5 +1,6 @@
 use super::{DeleteFileData, FileHost, FileHostingError, UploadFileData};
 use async_trait::async_trait;
+use bytes::{Buf, Bytes};
 use sha2::Digest;
 
 pub struct MockHost(());
@@ -16,15 +17,15 @@ impl FileHost for MockHost {
         &self,
         content_type: &str,
         file_name: &str,
-        file_bytes: Vec<u8>,
+        file_bytes: Bytes,
     ) -> Result<UploadFileData, FileHostingError> {
         let path = std::path::Path::new(&dotenv::var("MOCK_FILE_PATH").unwrap())
             .join(file_name.replace("../", ""));
         std::fs::create_dir_all(path.parent().ok_or(FileHostingError::InvalidFilename)?)?;
-        let content_sha1 = sha1::Sha1::from(&file_bytes).hexdigest();
-        let content_sha512 = format!("{:x}", sha2::Sha512::digest(&file_bytes));
+        let content_sha1 = sha1::Sha1::from(file_bytes.bytes()).hexdigest();
+        let content_sha512 = format!("{:x}", sha2::Sha512::digest(file_bytes.bytes()));
 
-        std::fs::write(path, &file_bytes)?;
+        std::fs::write(path, file_bytes.bytes())?;
         Ok(UploadFileData {
             file_id: String::from("MOCK_FILE_ID"),
             file_name: file_name.to_string(),

src/file_hosting/mod.rs

@@ -6,6 +6,7 @@ mod mock;
 mod s3_host;
 
 pub use backblaze::BackblazeHost;
+use bytes::Bytes;
 pub use mock::MockHost;
 use s3::creds::AwsCredsError;
 use s3::S3Error;
@@ -51,7 +52,7 @@ pub trait FileHost {
         &self,
         content_type: &str,
         file_name: &str,
-        file_bytes: Vec<u8>,
+        file_bytes: Bytes,
     ) -> Result<UploadFileData, FileHostingError>;
 
     async fn delete_file_version(

src/file_hosting/s3_host.rs

@@ -1,5 +1,6 @@
 use crate::file_hosting::{DeleteFileData, FileHost, FileHostingError, UploadFileData};
 use async_trait::async_trait;
+use bytes::{Buf, Bytes};
 use s3::bucket::Bucket;
 use s3::creds::Credentials;
 use s3::region::Region;
@@ -38,15 +39,15 @@ impl FileHost for S3Host {
         &self,
         content_type: &str,
         file_name: &str,
-        file_bytes: Vec<u8>,
+        file_bytes: Bytes,
     ) -> Result<UploadFileData, FileHostingError> {
         let content_sha1 = sha1::Sha1::from(&file_bytes).hexdigest();
-        let content_sha512 = format!("{:x}", sha2::Sha512::digest(&file_bytes));
+        let content_sha512 = format!("{:x}", sha2::Sha512::digest(file_bytes.bytes()));
 
         self.bucket
             .put_object_with_content_type(
                 format!("/{}", file_name),
-                file_bytes.as_slice(),
+                file_bytes.bytes(),
                 content_type,
             )
             .await?;