Improve by cargo fmt

Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>

Author: nuclearcat

src/azure.rs

@@ -10,24 +10,24 @@ impl AzureDriver {
     }
 }
 
-use crate::{ReceivedFile, get_config_content};
+use crate::{get_config_content, ReceivedFile};
 use axum::http::{HeaderName, HeaderValue};
 use azure_storage::StorageCredentials;
+use azure_storage_blobs::container::operations::BlobItem;
 use azure_storage_blobs::prelude::{BlobBlockType, BlockId, BlockList, ClientBuilder, Tags};
 use chksum_hash_sha2_512 as sha2_512;
+use futures::stream::StreamExt;
 use headers::HeaderMap;
 use hex;
 use reqwest::Client;
 use serde::Deserialize;
+use std::fs::read_to_string;
 use std::fs::File;
 use std::io::Read;
 use std::io::Write;
 use std::sync::Arc;
 use tempfile::Builder;
 use toml::Table;
-use std::fs::read_to_string;
-use futures::stream::StreamExt;
-use azure_storage_blobs::container::operations::BlobItem;
 
 #[derive(Deserialize)]
 struct AzureConfig {
@@ -59,7 +59,6 @@ fn calculate_checksum(filename: &String, data: &[u8]) {
     let hash = sha2_512::default().update(data).finalize();
     let digest = hash.digest();
     println!("File: {} Checksum: {}", filename, digest.to_hex_lowercase());
-    
 }
 
 /// Write file to Azure blob storage
@@ -230,7 +229,10 @@ async fn get_file_from_blob(filename: String) -> ReceivedFile {
                 break;
             }
             std::thread::sleep(std::time::Duration::from_millis(1000));
-            println!("Waiting for headers file {} to exist: {} seconds", cache_filename_headers, seconds);
+            println!(
+                "Waiting for headers file {} to exist: {} seconds",
+                cache_filename_headers, seconds
+            );
         }
 
         if !headers_file_exists {
@@ -309,7 +311,10 @@ async fn get_file_from_blob(filename: String) -> ReceivedFile {
 
 // Implement set tags for Azure blob storage
 // tags are in format "key=value"
-async fn azure_set_filename_tags(filename: String, user_tags: Vec<(String, String)>) -> Result<String, String> {
+async fn azure_set_filename_tags(
+    filename: String,
+    user_tags: Vec<(String, String)>,
+) -> Result<String, String> {
     let azure_cfg = Arc::new(get_azure_credentials("azure"));
     let storage_account = azure_cfg.account.as_str();
     let storage_key = azure_cfg.key.clone();
@@ -341,8 +346,8 @@ async fn azure_list_files(directory: String) -> Vec<String> {
     let storage_key = azure_cfg.key.clone();
     let storage_container = azure_cfg.container.as_str();
     let storage_credential = StorageCredentials::access_key(storage_account, storage_key);
-    let container_r = ClientBuilder::new(storage_account, storage_credential)
-        .container_client(storage_container);
+    let container_r =
+        ClientBuilder::new(storage_account, storage_credential).container_client(storage_container);
     let listbldr = container_r.list_blobs();
     let mut liststream = listbldr.into_stream();
     let mut listing = Vec::new();
@@ -354,7 +359,6 @@ async fn azure_list_files(directory: String) -> Vec<String> {
                 BlobItem::BlobPrefix(blob_prefix) => blob_prefix.name,
             };
             listing.push(blob_name.clone());
-            
         }
         println!("Listing count: {}", listing.len());
     }
@@ -373,7 +377,11 @@ impl super::Driver for AzureDriver {
         });
         return filenameret;
     }
-    fn tag_file(&self, filename: String, user_tags: Vec<(String, String)>) -> Result<String, String> {
+    fn tag_file(
+        &self,
+        filename: String,
+        user_tags: Vec<(String, String)>,
+    ) -> Result<String, String> {
         let rt = tokio::runtime::Runtime::new().unwrap();
         let ret = rt.block_on(azure_set_filename_tags(filename, user_tags));
         return ret;

src/main.rs

@@ -11,8 +11,8 @@
 */
 
 mod azure;
-mod storjwt;
 mod storcaching;
+mod storjwt;
 
 use axum::{
     body::Body,
@@ -29,9 +29,8 @@ use std::path;
 use std::{net::SocketAddr, path::PathBuf};
 use tokio::io::AsyncSeekExt;
 use tokio_util::io::ReaderStream;
-use tower::ServiceBuilder;
 use toml::Table;
-
+use tower::ServiceBuilder;
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
@@ -55,19 +54,10 @@ struct Args {
     )]
     config_file: String,
 
-    #[clap(
-        short,
-        long,
-        default_value = "false",
-        help = "Generate JWT secret"
-    )]
+    #[clap(short, long, default_value = "false", help = "Generate JWT secret")]
     generate_jwt_secret: bool,
 
-    #[clap(
-        long,
-        default_value = "",
-        help = "Generate JWT token for email"
-    )]
+    #[clap(long, default_value = "", help = "Generate JWT token for email")]
     generate_jwt_token: String,
 }
 
@@ -81,7 +71,11 @@ struct ReceivedFile {
 trait Driver {
     fn write_file(&self, filename: String, data: Vec<u8>, cont_type: String) -> String;
     fn get_file(&self, filename: String) -> ReceivedFile;
-    fn tag_file(&self, filename: String, user_tags: Vec<(String, String)>) -> Result<String, String>;
+    fn tag_file(
+        &self,
+        filename: String,
+        user_tags: Vec<(String, String)>,
+    ) -> Result<String, String>;
     fn list_files(&self, directory: String) -> Vec<String>;
 }
 
@@ -146,7 +140,7 @@ async fn initial_setup() -> Option<RustlsConfig> {
         std::fs::create_dir(download_dir).unwrap();
     }
 
-    let cfg_file : PathBuf;
+    let cfg_file: PathBuf;
     // is ENV KCI_STORAGE_CONFIG set?
     if let Ok(cfg_file_env) = std::env::var("KCI_STORAGE_CONFIG") {
         cfg_file = PathBuf::from(&cfg_file_env);
@@ -155,7 +149,7 @@ async fn initial_setup() -> Option<RustlsConfig> {
         cfg_file = PathBuf::from(&args.config_file);
         println!("Using config file from args: {}", cfg_file.display());
     }
-    
+
     if !cfg_file.exists() {
         eprintln!("Config file {} does not exist", &args.config_file);
         std::process::exit(1);
@@ -176,8 +170,6 @@ async fn initial_setup() -> Option<RustlsConfig> {
             None
         }
     }
-
-    
 }
 
 #[tokio::main]
@@ -309,7 +301,10 @@ fn verify_upload_permissions(owner: &str, path: &str) -> Result<(), String> {
             }
         }
     }
-    Err(format!("User {} has no upload permissions for path {}", owner, path))
+    Err(format!(
+        "User {} has no upload permissions for path {}",
+        owner, path
+    ))
 }
 
 /*
@@ -353,7 +348,6 @@ async fn ax_post_file(headers: HeaderMap, mut multipart: Multipart) -> (StatusCo
         Err(e) => return (StatusCode::FORBIDDEN, e.to_string().into_bytes()),
     }
 
-
     while let Some(field) = multipart.next_field().await.unwrap() {
         let name = field.name().unwrap().to_string();
         //let filename = field.file_name();

src/storcaching.rs

@@ -1,7 +1,7 @@
-use tokio::time::Duration;
-use std::time::SystemTime;
-use std::fs;
 use fs2;
+use std::fs;
+use std::time::SystemTime;
+use tokio::time::Duration;
 
 struct Files {
     file: String,
@@ -59,7 +59,10 @@ fn delete_cache_file(file: String) {
     // Truncate from filename .content, and add .headers, delete both files
     let content_filename = file.clone();
     let headers_filename = file.replace(".content", ".headers");
-    println!("Deleting files: {} {}", &content_filename, &headers_filename);
+    println!(
+        "Deleting files: {} {}",
+        &content_filename, &headers_filename
+    );
     let res = fs::remove_file(&content_filename);
     match res {
         Ok(_) => {}
@@ -93,7 +96,7 @@ async fn clean_disk(cache_dir: String) {
 /// Cache housekeeping loop
 /// This function will check the disk space every and clean with some hysteresis
 pub async fn cache_loop(cache_dir: &str) {
-    let mut cleaning_on : bool = false;
+    let mut cleaning_on: bool = false;
     loop {
         let free_space = freediskspace_percent(cache_dir.to_string()).await;
         if free_space < 12 && !cleaning_on {
@@ -115,4 +118,4 @@ pub async fn cache_loop(cache_dir: &str) {
             tokio::time::sleep(Duration::from_secs(10)).await;
         }
     }
-}        
+}

src/storjwt.rs

@@ -1,6 +1,6 @@
 use crate::get_config_content;
 use hmac::{Hmac, Mac};
-use jwt::{Header, Token, VerifyWithKey, SignWithKey};
+use jwt::{Header, SignWithKey, Token, VerifyWithKey};
 use sha2::Sha256;
 use std::collections::BTreeMap;
 use toml::value::Table;
@@ -36,7 +36,7 @@ pub fn verify_jwt_token(token_str: &str) -> Result<BTreeMap<String, String>, jwt
 pub fn generate_jwt_secret() {
     // generate a random 32 bytes alphanumeric string
     use rand::{distributions::Alphanumeric, Rng};
-    
+
     let secret: String = rand::thread_rng()
         .sample_iter(&Alphanumeric)
         .take(32)
@@ -54,4 +54,4 @@ pub fn generate_jwt_token(email: &str) -> Result<String, jwt::Error> {
     claims.insert("email".to_string(), email.to_string());
     let token_str = claims.sign_with_key(&key)?;
     Ok(token_str)
-}
+}