fmt & enhancements & changelog

Author: heydocode

Cargo.lock

@@ -7,4 +7,3 @@ edition = "2021"
 async-std = "1.12.0"
 lettre = "0.11"
 maud = "0.26.0"
-tracing-subscriber = "0.3.18"

Cargo.toml

@@ -0,0 +1,18 @@
+# 1.0.0 Release
+This is the first `ServerAPI` **stable** release you can enjoy!
+
+Added features:
+- installation wizard
+- launching rust modules in parallel
+- config support (you can change everything manually)
+- implemented fancy html header (use of `maud` crate)
+- implemented a text raw alternative to html in case client does not support it
+
+
+Waited soon:
+- crate organization, such as in my [`LimitPush`](https://github.com/heydocode/limitpush) project
+- launching of processes via the CLI environment
+- responsible CLI with commands
+- inter-operability with [`LimitPush`](https://github.com/heydocode/limitpush) template, and any other bevy game
+- feature organization
+- custom multiplayer protocol that'll work with `LimitPush` if "mp-protocol" feature enabled

changelog/1.0.0.md

@@ -1,4 +1,4 @@
-use std::fs::{create_dir_all, File, metadata};
+use std::fs::{create_dir_all, metadata, File};
 use std::io::{BufReader, Read};
 use std::path::Path;
 
@@ -41,7 +41,12 @@ pub fn mc_status_reader() -> String {
     }
 
     let contents = read_from_file(file_path.to_str().unwrap_or("config/logs.txt"));
-    if contents.clone().expect("Could not convert contents to Ok()").len() <= 5 {
+    if contents
+        .clone()
+        .expect("Could not convert contents to Ok()")
+        .len()
+        <= 5
+    {
         String::from("The server's logs are empty! Is there a problem?")
     } else {
         contents.expect("Could not convert contents to Ok()")
@@ -63,11 +68,14 @@ fn read_from_file(file_path: &str) -> Result<String, String> {
     }
 
     // Attempt to open the file
-    let file = File::open(file_path).map_err(|e| format!("Error opening file '{}': {}", file_path, e))?;
+    let file =
+        File::open(file_path).map_err(|e| format!("Error opening file '{}': {}", file_path, e))?;
     let mut buf_reader = BufReader::new(file);
     let mut contents = String::new();
-    
-    buf_reader.read_to_string(&mut contents).map_err(|e| format!("Error reading file '{}': {}", file_path, e))?;
+
+    buf_reader
+        .read_to_string(&mut contents)
+        .map_err(|e| format!("Error reading file '{}': {}", file_path, e))?;
 
     Ok(contents)
 }

src/file_reader.rs

@@ -1,6 +1,6 @@
+use async_std::fs::File;
 use async_std::fs::OpenOptions;
 use async_std::path::Path;
-use async_std::fs::File;
 use async_std::prelude::*;
 
 pub async fn write_to_file(text: String, file_path: &str) -> Result<(), String> {
@@ -11,27 +11,37 @@ pub async fn write_to_file(text: String, file_path: &str) -> Result<(), String>
         .await
         .map_err(|e| e.to_string())?;
 
-    file.write_all(text.as_bytes()).await.map_err(|e| e.to_string())
+    file.write_all(text.as_bytes())
+        .await
+        .map_err(|e| e.to_string())
 }
 
-pub async fn update_credentials(username: String, password: String, receiver: String) -> Result<(), String> {
+pub async fn update_credentials(
+    username: String,
+    password: String,
+    receiver: String,
+) -> Result<(), String> {
     let file_path = "config/smtp_account.txt";
     let path = Path::new(file_path);
 
     let mut content = String::new();
     {
-        let mut file = File::open(path)
-            .await
-            .map_err(|e| e.to_string())?;
+        let mut file = File::open(path).await.map_err(|e| e.to_string())?;
         file.read_to_string(&mut content)
             .await
             .map_err(|e| e.to_string())?;
     }
 
     let updated_content = content
-        .replace("username:[email protected]", &format!("username:{}", username))
+        .replace(
+            "username:[email protected]",
+            &format!("username:{}", username),
+        )
         .replace("password:password123123", &format!("password:{}", password))
-        .replace("receiver:[email protected]", &format!("receiver:{}", receiver));
+        .replace(
+            "receiver:[email protected]",
+            &format!("receiver:{}", receiver),
+        );
 
     {
         let mut file = OpenOptions::new()

src/file_writer.rs

@@ -1,8 +1,11 @@
 use crate::file_reader::smtp_account_reader;
 use crate::file_writer::write_to_file;
 use lettre::{
-    message::{header::{self, ContentType}, MultiPart, SinglePart}, transport::smtp::authentication::Credentials, Message,
-    SmtpTransport, Transport,
+    message::{
+        header::{self}, MaybeString, MultiPart, SinglePart
+    },
+    transport::smtp::authentication::Credentials,
+    Message, SmtpTransport, Transport,
 };
 use maud::PreEscaped;
 
@@ -28,8 +31,7 @@ pub async fn mail_sender(title: &str, html: PreEscaped<String>) {
                 .singlepart(
                     SinglePart::builder()
                         .header(header::ContentType::TEXT_PLAIN)
-                        .body(format!(
-                            "Hello there!\nYour server is working fine! The next status email will be sent in 5 minutes.\n\nServer's Logs:\nYour client does not support html...")),
+                        .body(MaybeString::String(String::from("Hello there!\nYour server is working fine! The next status email will be sent in 5 minutes.\n\nServer's Logs:\nYour client does not support html..."))),
                 )
                 .singlepart(
                     SinglePart::builder()
@@ -50,7 +52,7 @@ pub async fn mail_sender(title: &str, html: PreEscaped<String>) {
     match mailer.send(&email) {
         Ok(_) => {
             match write_to_file(
-                format!("Email has been sent successfully!"),
+                "Email has been sent successfully!".to_string(),
                 "config/mail_logs.txt",
             )
             .await

src/mail.rs

@@ -12,11 +12,8 @@ use scheduler::status_upload;
 use file_writer::write_to_file;
 use setup::check_config_components;
 use std::thread;
-use tracing_subscriber;
 
 fn main() {
-    tracing_subscriber::fmt::init();
-
     let setup_handle = thread::Builder::new().name("setup".to_string()).spawn(|| {
         println!("Setup Process has been launched");
         match check_config_components() {
@@ -26,7 +23,7 @@ fn main() {
 
         async_std::task::block_on(async {
             match write_to_file(
-                format!("All config components are OK, loading the server.."),
+                "All config components are OK, loading the server..".to_string(),
                 "config/logs.txt",
             )
             .await
@@ -37,23 +34,30 @@ fn main() {
         });
     });
 
-    if let Err(_) = setup_handle.expect("Unable to join setup handle").join() {
+    let mail_handle = thread::Builder::new()
+        .name("mail_server".to_string())
+        .spawn(|| {
+            println!("Mail Server has been enabled");
+            status_upload();
+            println!("Mail Server has been disabled");
+        });
+
+    if setup_handle
+        .expect("Unable to join setup handle")
+        .join()
+        .is_err()
+    {
         eprintln!("An error occured when tried to join setup handle");
-    } else {
-        let mail_handle = thread::Builder::new()
-            .name("mail_server".to_string())
-            .spawn(|| {
-                println!("Mail Server has been enabled");
-                status_upload();
-                println!("Mail Server has been disabled");
-            });
-        if let Err(_) = mail_handle.expect("Unable to join mail handle").join() {
-            eprintln!("An error occured when tried to join mail handle");
-        }
-        // Please consider adding `else if` blocks until all handles won't be joined
-        else {
-            println!("All config components are OK, loading the server..");
-        }
+    } else if mail_handle
+        .expect("Unable to join mail handle")
+        .join()
+        .is_err()
+    {
+        eprintln!("An error occured when tried to join mail handle");
+    }
+    // Please consider adding `else if` blocks until all handles won't be joined
+    else {
+        println!("All config components are OK, loading the server..");
     }
     /*
         MINECRAFT SERVER SUPPORT USING VALENCE