refactor: Reorganise file structure

Signed-off-by: quexeky <git@quexeky.dev>

src-tauri/src/remote/auth.rs

@@ -1,21 +1,20 @@
-use std::{collections::HashMap, env, sync::Mutex};
+use std::{collections::HashMap, env};
 
 use chrono::Utc;
 use droplet_rs::ssl::sign_nonce;
 use gethostname::gethostname;
 use log::{debug, error, warn};
 use serde::{Deserialize, Serialize};
-use serde_json::json;
-use tauri::{AppHandle, Emitter, Manager};
+use tauri::{AppHandle, Emitter};
 use url::Url;
 
 use crate::{
     database::{
-        db::{borrow_db_checked, borrow_db_mut_checked, save_db, DatabaseImpls},
+        db::{borrow_db_checked, borrow_db_mut_checked, save_db},
         models::data::DatabaseAuth,
     },
     error::{drop_server_error::DropServerError, remote_access_error::RemoteAccessError},
-    AppState, AppStatus, User, DB,
+    AppStatus, User,
 };
 
 use super::{

src-tauri/src/remote/cache.rs

@@ -1,6 +1,7 @@
-use std::sync::RwLockReadGuard;
-
-use crate::{database::{db::borrow_db_checked, models::data::Database}, error::remote_access_error::RemoteAccessError};
+use crate::{
+    database::{db::borrow_db_checked, models::data::Database},
+    error::remote_access_error::RemoteAccessError,
+};
 use cacache::Integrity;
 use http::{header::CONTENT_TYPE, response::Builder as ResponseBuilder, Response};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};

src-tauri/src/remote/commands.rs

@@ -6,11 +6,16 @@ use tauri::{AppHandle, Emitter, Manager};
 use url::Url;
 
 use crate::{
-    database::db::{borrow_db_checked, borrow_db_mut_checked, save_db}, error::remote_access_error::RemoteAccessError, remote::{auth::generate_authorization_header, requests::make_request}, AppState, AppStatus
+    database::db::{borrow_db_checked, borrow_db_mut_checked, save_db},
+    error::remote_access_error::RemoteAccessError,
+    remote::{auth::generate_authorization_header, requests::make_request},
+    AppState, AppStatus,
 };
 
 use super::{
-    auth::{auth_initiate_logic, recieve_handshake, setup}, cache::{cache_object, get_cached_object}, remote::use_remote_logic
+    auth::{auth_initiate_logic, recieve_handshake, setup},
+    cache::{cache_object, get_cached_object},
+    remote::use_remote_logic,
 };
 
 #[tauri::command]
@@ -36,24 +41,22 @@ pub fn gen_drop_url(path: String) -> Result<String, RemoteAccessError> {
 
 #[tauri::command]
 pub fn fetch_drop_object(path: String) -> Result<Vec<u8>, RemoteAccessError> {
-    let drop_url = gen_drop_url(path.clone());
-    let req = make_request(
-        &Client::new(), 
-        &[&path],
-        &[], 
-        |r| { r.header("Authorization", generate_authorization_header()) }
-    )?.send();
+    let _drop_url = gen_drop_url(path.clone())?;
+    let req = make_request(&Client::new(), &[&path], &[], |r| {
+        r.header("Authorization", generate_authorization_header())
+    })?
+    .send();
 
     match req {
         Ok(data) => {
             let data = data.bytes()?.to_vec();
             cache_object(&path, &data)?;
             Ok(data)
-        },
+        }
         Err(e) => {
             debug!("{}", e);
             get_cached_object::<&str, Vec<u8>>(&path)
-        },
+        }
     }
 }
 #[tauri::command]

src-tauri/src/remote/fetch_object.rs

@@ -2,12 +2,13 @@ use http::{header::CONTENT_TYPE, response::Builder as ResponseBuilder};
 use log::warn;
 use tauri::UriSchemeResponder;
 
-use super::{auth::generate_authorization_header, cache::{cache_object, get_cached_object, ObjectCache}, requests::make_request};
+use super::{
+    auth::generate_authorization_header,
+    cache::{cache_object, get_cached_object, ObjectCache},
+    requests::make_request,
+};
 
-pub fn fetch_object(
-    request: http::Request<Vec<u8>>,
-    responder: UriSchemeResponder,
-) {
+pub fn fetch_object(request: http::Request<Vec<u8>>, responder: UriSchemeResponder) {
     // Drop leading /
     let object_id = &request.uri().path()[1..];
 
@@ -25,7 +26,7 @@ pub fn fetch_object(
             Ok(data) => responder.respond(data.into()),
             Err(e) => {
                 warn!("{}", e)
-            },
+            }
         }
         return;
     }
@@ -41,10 +42,7 @@ pub fn fetch_object(
 
     responder.respond(resp);
 }
-pub fn fetch_object_offline(
-    request: http::Request<Vec<u8>>,
-    responder: UriSchemeResponder,
-) {
+pub fn fetch_object_offline(request: http::Request<Vec<u8>>, responder: UriSchemeResponder) {
     let object_id = &request.uri().path()[1..];
     let data = get_cached_object::<&str, ObjectCache>(object_id);
 

src-tauri/src/remote/mod.rs

@@ -5,4 +5,4 @@ pub mod commands;
 pub mod fetch_object;
 pub mod remote;
 pub mod requests;
-pub mod server_proto;
+pub mod server_proto;

src-tauri/src/remote/server_proto.rs

@@ -1,10 +1,9 @@
-use std::{path::PathBuf, str::FromStr};
+use std::str::FromStr;
 
 use http::{
-    uri::{Authority, PathAndQuery},
+    uri::PathAndQuery,
     Request, Response, StatusCode, Uri,
 };
-use log::info;
 use reqwest::blocking::Client;
 use tauri::UriSchemeResponder;