mrpack export, packwiz import/export

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mcman"
-version = "0.2.1"
+version = "0.3.0"
 edition = "2021"
 authors = ["ParadigmMC"]
 repository = "https://github.com/ParadigmMC/mcman"
@@ -31,7 +31,6 @@ serde_json = "1.0"
 tempfile = "3.7"
 tokio = { version = "1.29", features = ["macros", "rt", "rt-multi-thread"] }
 toml = "0.7"
-tracing = "0.1"
-tracing-subscriber = "0.3"
 walkdir = "2.3"
 zip = "0.6"
+sha2 = "0.10"

README.md

@@ -53,7 +53,18 @@ Submit a PR or open an issue if you have a mcman-server repository that we can a
 
 ## Changelog
 
-### `0.2.2` (unreleased)
+### `0.3.0` (unreleased)
+
+- Added [CurseRinth](https://curserinth.kuylar.dev/) support
+- Added **packwiz importing**
+- Added **packwiz exporting**
+- Added initializing with `--packwiz`
+- Added **mrpack exporting**
+- Added client-side mods field
+- Fixed github ratelimiting issue
+- A lot of improvements overall
+
+### `0.2.2`
 
 - Added support for **Datapacks**
   - Added command `mcman import datapack`

TUTORIAL.md

@@ -20,6 +20,17 @@
 - [Github Releases](https://github.com/ParadigmMC/mcman/releases)
 - [build action](https://github.com/ParadigmMC/mcman/actions/workflows/build.yml) (requires github account)
 
+### Windows: Scoop
+
+[Scoop](https://scoop.sh/) is a command-line installer for Windows. You can use 2 commands in powershell to install it.
+
+Add the [minecraft](https://github.com/The-Simples/scoop-minecraft) bucket and install mcman:
+
+```powershell
+scoop bucket add minecraft https://github.com/The-Simples/scoop-minecraft
+scoop install mcman
+```
+
 ## Recommended Usage
 
 First, initialize a github repository for your server and clone it. It can be private too if you want.

res/default_gitignore

@@ -1,3 +1,11 @@
-# mcman
+# generated by mcman
+
+# exclude server output directory
 server/
+
+# dont include the dotenv
 .env
+
+# exclude exported packs
+*.zip
+*.mrpack

src/commands/build/addons.rs

@@ -34,13 +34,15 @@ impl BuildContext {
             self.downloadable(addon, Some(addon_type), |state, file_name| match state {
                 ReportBackState::Skipped => {
                     println!(
-                        "          ({idx:idx_w$}/{addon_count}) Skipping    : {}",
+                        "          ({:idx_w$}/{addon_count}) Skipping    : {}",
+                        idx + 1,
                         style(&file_name).dim()
                     );
                 }
                 ReportBackState::Downloaded => {
                     println!(
-                        "          ({idx:idx_w$}/{addon_count}) {}  : {}",
+                        "          ({:idx_w$}/{addon_count}) {}  : {}",
+                        idx + 1,
                         style("Downloaded").green().bold(),
                         style(&file_name).dim()
                     );

src/commands/build/mod.rs

@@ -3,7 +3,7 @@ use std::{path::PathBuf, time::Instant};
 use anyhow::{anyhow, Context, Result};
 use clap::{arg, value_parser, ArgMatches, Command};
 use console::style;
-use tokio::fs::File;
+use tokio::fs::{File, self};
 
 use crate::{create_http_client, downloadable::Downloadable, model::Server, util};
 
@@ -139,7 +139,8 @@ impl BuildContext {
         folder_path: Option<&str>,
         report_back: F,
     ) -> Result<String> {
-        let file_name = dl.get_filename(&self.server, &self.http_client).await?;
+        let file_name = dl.get_filename(&self.server, &self.http_client)
+            .await.with_context(|| format!("Getting filename of Downloadable: {dl:#?}"))?;
 
         let file_path = if let Some(path) = folder_path {
             self.output_dir.join(path)
@@ -153,18 +154,29 @@ impl BuildContext {
         } else {
             report_back(ReportBackState::Downloading, &file_name);
 
-            util::download_with_progress(
-                File::create(&file_path).await.context(format!(
-                    "Failed to create output file: {}",
-                    file_path.to_string_lossy()
-                ))?,
-                &file_name,
-                dl,
-                Some(&file_name),
-                &self.server,
-                &self.http_client,
-            )
-            .await?;
+            let file = File::create(&file_path).await.with_context(|| format!(
+                "Failed to create output file: {}",
+                file_path.to_string_lossy()
+            ))?;
+
+            let result = util::download_with_progress(
+                    file,
+                    &file_name,
+                    dl,
+                    Some(&file_name),
+                    &self.server,
+                    &self.http_client,
+                )
+                .await
+                .with_context(|| format!("Downloading Downloadable: {dl:#?}"));
+
+            if result.is_err() {
+                // try to remove file if errored
+                // so we wont have any "0 bytes" files (which mcman will skip)
+                _ = fs::remove_file(file_path).await;
+            }
+
+            result?;
 
             report_back(ReportBackState::Downloaded, &file_name);
         }

src/commands/build/worlds.rs

@@ -10,7 +10,8 @@ impl BuildContext {
 
         for (idx, (name, world)) in self.server.worlds.iter().enumerate() {
             println!(
-                "          ({idx:wc_len$}/{world_count}) {} {name}",
+                "          ({:wc_len$}/{world_count}) {} {name}",
+                idx + 1,
                 style("World:").bold()
             );
 
@@ -30,14 +31,16 @@ impl BuildContext {
                     match state {
                         ReportBackState::Skipped => {
                             println!(
-                                "          {:pad_len$}({idx:dp_len$}/{datapack_count}) Skipping    : {}",
+                                "          {:pad_len$}({:dp_len$}/{datapack_count}) Skipping    : {}",
+                                idx + 1,
                                 "",
                                 style(file_name).dim()
                             );
                         }
                         ReportBackState::Downloaded => {
                             println!(
-                                "          {:pad_len$}({idx:dp_len$}/{datapack_count}) {}  : {}",
+                                "          {:pad_len$}({:dp_len$}/{datapack_count}) {}  : {}",
+                                idx + 1,
                                 "",
                                 style("Downloaded").green().bold(),
                                 style(file_name).dim()

src/commands/eject.rs

@@ -0,0 +1,35 @@
+use std::fs;
+
+use anyhow::{Result, Context};
+use clap::Command;
+use console::style;
+use dialoguer::{Input, theme::ColorfulTheme};
+
+use crate::model::Server;
+
+pub fn cli() -> Command {
+    Command::new("eject")
+        .hide(true)
+        .about("Eject - remove everything related to mcman")
+}
+
+pub async fn run() -> Result<()> {
+    let server = Server::load().context("Failed to load server.toml")?;
+
+    if Input::with_theme(&ColorfulTheme::default())
+        .with_prompt("Are you sure you want to delete everything? This is irreversible. Type this server's name to confirm.")
+        .default(String::new())
+        .interact_text()? == server.name {
+        println!(" > {}", style("Deleting server.toml...").yellow());
+        _ = fs::remove_file(server.path.join("server.toml"))?;
+        println!(" > {}", style("Deleting config/...").yellow());
+        _ = fs::remove_dir_all(server.path.join("config"));
+        println!(" > {}", style("Deleting server/...").yellow());
+        _ = fs::remove_dir_all(server.path.join("server"))?;
+        println!(" > Ejected successfully.");
+    } else {
+        println!(" > {}", style("Cancelled").green().bold());
+    }
+
+    Ok(())
+}