now much more better

Author: MagicTeaMC

Cargo.lock

@@ -16,10 +16,11 @@ exclude = ["images/"]
 clap = { version = "4.5", features = ["derive"] }
 colored = "3.0"
 inquire = "0.7"
-reqwest = { version = "0.12", features = ["blocking", "json"] }
+reqwest = { version = "0.12", features = ["json"] }
 tokio = { version = "1.0", features = ["full"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+anyhow = "1.0"
 
 [lints.rust]
-dead_code = "allow"
+dead_code = "allow"

Cargo.toml

@@ -52,9 +52,9 @@ Note: The `--mc-version` and `--eula` flags are only required for Java Edition s
 ```bash
 mcsast setup --software=paper --mc-version=1.21.1 --eula=true -y
 ```
-### Update to latest build of current Minecraft version
+### Sync latest build of current Minecraft version
 ```bash
-mcsast update
+mcsast sync
 ```
 ### Upgrade Minecraft version
 ```bash

README.md

@@ -1,9 +1,9 @@
 pub mod setup;
-pub mod update;
+pub mod sync;
 pub mod upgrade;
 pub mod plugins;
 
 pub use setup::handle_setup;
-pub use update::handle_update;
+pub use sync::handle_sync;
 pub use upgrade::handle_upgrade;
 pub use plugins::handle_plugins;

src/cli/commands/mod.rs

@@ -1,7 +1,8 @@
+use anyhow::Result;
 use crate::cli::PluginActions;
 use crate::plugins;
 
-pub async fn handle_plugins(action: PluginActions) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn handle_plugins(action: PluginActions) -> Result<()> {
     match action {
         PluginActions::List => plugins::list_plugins().await,
         PluginActions::Add { name, force } => plugins::get_plugin(&name, force).await,

src/cli/commands/plugins.rs

@@ -1,17 +1,18 @@
 use std::{io::Write, process::exit};
 use colored::Colorize;
 use inquire::{Confirm, Select, Text};
+use anyhow::Result;
 
 use crate::core::{Config, Software, eula};
 use crate::download;
 use crate::utils::{get_current_directory_name, get_executable_extension, inquired, print_error_and_exit};
 
-pub fn handle_setup(
+pub async fn handle_setup(
     software: Option<Software>,
     mc_version: Option<String>,
     eula: Option<bool>,
     yes: bool,
-) -> Result<(), Box<dyn std::error::Error>> {
+) -> Result<()> {
     let software = {
         if software.is_none() {
             let binding = Select::new(
@@ -136,7 +137,7 @@ pub fn handle_setup(
     );
     std::io::stdout().flush()?;
 
-    match download::get(software.name(), version.clone()) {
+    match download::get(&software.name(), version.clone()).await {
         Err(e) => {
             println!();
             println!("{}: {}", "error".bold().red(), e);

src/cli/commands/setup.rs

@@ -1,21 +1,22 @@
 use std::{io::Write, process::exit};
 use colored::Colorize;
+use anyhow::Result;
 
 use crate::core::Config;
 use crate::download;
 use crate::utils::get_executable_extension;
 
-pub fn handle_update() -> Result<(), Box<dyn std::error::Error>> {
+pub async fn handle_sync() -> Result<()> {
     let config = Config::load()?;
 
     if !config.software.supports_minecraft_version() {
         println!(
-            "🔄 Updating {} to latest build...",
+            "🔄 Syncing {} to latest build...",
             config.software.name().bold().yellow()
         );
     } else {
         println!(
-            "🔄 Updating {}-{} to latest build...",
+            "🔄 Syncing {}-{} to latest build...",
             config.software.name().bold().yellow(),
             config.minecraft_version.bold().blue()
         );
@@ -27,7 +28,7 @@ pub fn handle_update() -> Result<(), Box<dyn std::error::Error>> {
     );
     std::io::stdout().flush()?;
 
-    match download::get(config.software.name(), config.minecraft_version.clone()) {
+    match download::get(&config.software.name(), config.minecraft_version.clone()).await {
         Err(e) => {
             println!();
             println!("{}: {}", "error".bold().red(), e);
@@ -43,14 +44,14 @@ pub fn handle_update() -> Result<(), Box<dyn std::error::Error>> {
         println!(
             "  {} server.jar {}",
             "↻".green().bold(),
-            "(updated to latest build)".dimmed()
+            "(synced to latest build)".dimmed()
         );
     } else {
         println!(
             "  {} gate{} {}",
             "↻".green().bold(),
             need_exe,
-            "(updated to latest build)".dimmed()
+            "(synced to latest build)".dimmed()
         );
     }
 

src/cli/commands/update.rs src/cli/commands/sync.rssrc/cli/commands/update.rs renamed to src/cli/commands/sync.rs

@@ -1,12 +1,13 @@
 use std::{io::Write, process::exit};
 use colored::Colorize;
 use inquire::Text;
+use anyhow::Result;
 
 use crate::core::Config;
 use crate::download;
 use crate::utils::{inquired, print_error_and_exit};
 
-pub fn handle_upgrade(target_version: Option<String>) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn handle_upgrade(target_version: Option<String>) -> Result<()> {
     let mut config = Config::load()?;
 
     let target_version = {
@@ -16,7 +17,7 @@ pub fn handle_upgrade(target_version: Option<String>) -> Result<(), Box<dyn std:
                     "❌ {} upgrades are currently unsupported.",
                     config.software.name()
                 );
-                return Err(not_supported_message.into());
+                return Err(anyhow::anyhow!("{}", not_supported_message));
             } else {
                 let binding =
                     Text::new("🚀 What version of Minecraft would you like to upgrade to?")
@@ -43,7 +44,7 @@ pub fn handle_upgrade(target_version: Option<String>) -> Result<(), Box<dyn std:
     );
     std::io::stdout().flush()?;
 
-    match download::get(config.software.name(), target_version.clone()) {
+    match download::get(&config.software.name(), target_version.clone()).await {
         Err(e) => {
             println!();
             println!("{}: {}", "error".bold().red(), e);

src/cli/commands/upgrade.rs

@@ -32,8 +32,8 @@ pub enum Commands {
         #[arg(short, default_value_t = false)]
         yes: bool,
     },
-    /// update to latest build of this version
-    Update,
+    /// sync to latest build of this version
+    Sync,
     /// upgrade to another version
     Upgrade {
         /// your target minecraft version

src/cli/parser.rs

@@ -1,6 +1,7 @@
 use crate::core::software::Software;
 use serde::{Deserialize, Serialize};
 use std::{fs, path::Path};
+use anyhow::Result;
 
 const CONFIG_FILE: &str = "mcsast.config.json";
 
@@ -24,17 +25,17 @@ pub struct Config {
 }
 
 impl Config {
-    pub fn load() -> Result<Self, Box<dyn std::error::Error>> {
+    pub fn load() -> Result<Self> {
         if !Path::new(CONFIG_FILE).exists() {
-            return Err("No config file found. Please run 'mcsast setup' first.".into());
+            return Err(anyhow::anyhow!("No config file found. Please run 'mcsast setup' first."));
         }
 
         let content = fs::read_to_string(CONFIG_FILE)?;
         let config: Config = serde_json::from_str(&content)?;
         Ok(config)
     }
 
-    pub fn save(&self) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn save(&self) -> Result<()> {
         let content = serde_json::to_string_pretty(self)?;
         fs::write(CONFIG_FILE, content)?;
         Ok(())