cargo fmt

TOwInOK · Mar 2, 2024 · 5a21758 · 5a21758
1 parent 667aa32
commit 5a21758
Show file tree

Hide file tree

Showing 9 changed files with 132 additions and 75 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,45 @@
+{
+    // Используйте IntelliSense, чтобы узнать о возможных атрибутах.
+    // Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.
+    // Для получения дополнительной информации посетите: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug executable 'minecraft_addon_controller'",
+            "cargo": {
+                "args": [
+                    "build",
+                    "--bin=minecraft_addon_controller",
+                    "--package=minecraft_addon_controller"
+                ],
+                "filter": {
+                    "name": "minecraft_addon_controller",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in executable 'minecraft_addon_controller'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--bin=minecraft_addon_controller",
+                    "--package=minecraft_addon_controller"
+                ],
+                "filter": {
+                    "name": "minecraft_addon_controller",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "MinecraftAddonController"
+name = "minecraft_addon_controller"
 version = "0.0.1"
 authors = ["TOwInOK"]
 edition = "2021"

diff --git a/src/config/datapack.rs b/src/config/datapack.rs
@@ -1,4 +1,4 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 ///Lists of Datapacks
 #[derive(Deserialize, Serialize, Debug)]
@@ -14,12 +14,20 @@ pub struct Datapack {
 }
 
 impl Datapack {
-    fn new(modrinth: Option<Vec<String>>, spigot: Option<Vec<String>>, paper: Option<Vec<String>>, frozen: Option<Vec<String>>) -> Self {
-        Self { modrinth, spigot, paper, frozen }
+    fn new(
+        modrinth: Option<Vec<String>>,
+        spigot: Option<Vec<String>>,
+        paper: Option<Vec<String>>,
+        frozen: Option<Vec<String>>,
+    ) -> Self {
+        Self {
+            modrinth,
+            spigot,
+            paper,
+            frozen,
+        }
     }
     pub fn default() -> Self {
         Datapack::new(None, None, None, None)
     }
 }
-
-
diff --git a/src/config/errors.rs b/src/config/errors.rs
@@ -3,14 +3,10 @@ use thiserror::Error;
 pub enum DownloadErrors {
     #[error("Загрузка прекращенна потому что: {0}")]
     DownloadCorrapt(String),
-
 }
 
-
 #[derive(Error, Debug)]
 pub enum ConfigErrors {
     #[error("Загрузка файла не была успешна: {0}")]
     LoadCorrapt(String),
-
 }
-
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -1,19 +1,17 @@
 mod datapack;
 mod errors;
+mod model;
 mod plugin;
 mod version;
-mod model;
 
-
-use std::default;
+use datapack::*;
+use errors::*;
 use log::{error, info};
+use plugin::Plugin;
+use serde::{Deserialize, Serialize};
+use std::default;
 use tokio::fs;
-use errors::*;
-use serde::{Serialize, Deserialize};
 use version::Versions;
-use datapack::*;
-use plugin::Plugin;
-
 
 ///Struct to load config from toml file.
 #[derive(Deserialize, Serialize, Debug)]
@@ -25,10 +23,13 @@ pub struct Config {
 
 impl Config {
     fn new(version: Versions, plugins: Option<Plugin>, datapacks: Option<Datapack>) -> Self {
-        Self { version, plugins, datapacks }
+        Self {
+            version,
+            plugins,
+            datapacks,
+        }
     }
 
-
     fn default() -> Self {
         Config::new(Versions::default(), None, None)
     }
@@ -62,41 +63,37 @@ impl Config {
             }
         };
         config
-}
-
-
+    }
 
-pub async fn download(config: Config) -> Result<(), DownloadErrors> {
-    let file = config.download_core().await;
-    todo!()
-}
+    pub async fn download(config: Config) -> Result<(), DownloadErrors> {
+        let file = config.download_core().await;
+        todo!()
+    }
 
-async fn download_plugins() -> Result<(), DownloadErrors> {
-    todo!()
-}
-async fn download_mods() -> Result<(), DownloadErrors> {
-    todo!()
-}
-async fn download_datapacks() -> Result<(), DownloadErrors> {
-    todo!()
-}
+    async fn download_plugins() -> Result<(), DownloadErrors> {
+        todo!()
+    }
+    async fn download_mods() -> Result<(), DownloadErrors> {
+        todo!()
+    }
+    async fn download_datapacks() -> Result<(), DownloadErrors> {
+        todo!()
+    }
 
-async fn download_core(self) -> Result<Option<()>, DownloadErrors> {
-    match self.version {
-        Versions::Purpur(ver, freez) => {
-            if !freez {
-                //We don't need to download
-                return Ok(None) ;
+    async fn download_core(self) -> Result<Option<()>, DownloadErrors> {
+        match self.version {
+            Versions::Purpur(ver, freez) => {
+                if !freez {
+                    //We don't need to download
+                    return Ok(None);
+                }
+                //use if error
+                Err(DownloadErrors::DownloadCorrapt("ff".to_string()))
             }
-            //use if error
-            Err(DownloadErrors::DownloadCorrapt("ff".to_string()))
-        },
-        Versions::Paper(ver, freez) => todo!(),
-        Versions::Spigot(ver, freez) => todo!(),
-        Versions::Bucket(ver, freez) => todo!(),
-        Versions::Vanila(ver, freez) => todo!(),
+            Versions::Paper(ver, freez) => todo!(),
+            Versions::Spigot(ver, freez) => todo!(),
+            Versions::Bucket(ver, freez) => todo!(),
+            Versions::Vanila(ver, freez) => todo!(),
+        }
     }
 }
-
-}
-
diff --git a/src/config/plugin.rs b/src/config/plugin.rs
@@ -1,4 +1,4 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 ///Lists of plugins
 #[derive(Deserialize, Serialize, Debug)]
@@ -14,11 +14,20 @@ pub struct Plugin {
 }
 
 impl Plugin {
-    fn new(modrinth: Option<Vec<String>>, spigot: Option<Vec<String>>, paper: Option<Vec<String>>, frozen: Option<Vec<String>>) -> Self {
-        Self { modrinth, spigot, paper, frozen }
+    fn new(
+        modrinth: Option<Vec<String>>,
+        spigot: Option<Vec<String>>,
+        paper: Option<Vec<String>>,
+        frozen: Option<Vec<String>>,
+    ) -> Self {
+        Self {
+            modrinth,
+            spigot,
+            paper,
+            frozen,
+        }
     }
     pub fn default() -> Self {
         Plugin::new(None, None, None, None)
     }
 }
-
diff --git a/src/config/version.rs b/src/config/version.rs
@@ -1,4 +1,4 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 ///Cores include version
 #[derive(Deserialize, Serialize, Debug)]
@@ -13,6 +13,6 @@ pub enum Versions {
 
 impl Default for Versions {
     fn default() -> Self {
-        Versions::Vanila("1.20.4".to_string(), false)
+        Versions::Vanila("latest".to_string(), false)
     }
-}
+}
diff --git a/src/main.rs b/src/main.rs
@@ -3,7 +3,9 @@ use config::Config;
 
 #[tokio::main]
 async fn main() {
-    pretty_env_logger::formatted_builder().filter_level(log::LevelFilter::Debug).init();
+    pretty_env_logger::formatted_builder()
+        .filter_level(log::LevelFilter::Debug)
+        .init();
 
     //Load Config file
     let path = "./config.toml".to_string();
@@ -12,5 +14,5 @@ async fn main() {
     match Config::download(config).await {
         Ok(_) => todo!(),
         Err(_) => todo!(),
-    }   
+    }
 }