diff --git a/src/commands/create.rs b/src/commands/create.rs index 5b39f73..cfd2ebb 100644 --- a/src/commands/create.rs +++ b/src/commands/create.rs @@ -16,41 +16,21 @@ use crate::{ pub struct Create { // project_name: String, - config_file: File, - - version: Option, loader: Option, - loader_version: Option, - - show_snapshots: bool, - show_betas: bool, - show_alphas: bool, + config_file: File, } impl Create { const LOADERS: [&str; 2] = ["Vanilla", "Fabric"]; - pub async fn new( - project_name: String, - version: Option, - loader: Option, - loader_version: Option, - show_snapshots: bool, - show_betas: bool, - show_alphas: bool, - ) -> Result> { + pub async fn new(project_name: String) -> Result> { tokio::fs::create_dir_all(&project_name).await?; std::env::set_current_dir(&project_name)?; let config_file = tokio::fs::File::create("mcsm.toml").await?; Ok(Create { /*project_name,*/ + loader: None, config_file, - version, - loader, - loader_version, - show_snapshots, - show_betas, - show_alphas, }) } @@ -64,12 +44,11 @@ impl Create { Ok(()) } - pub async fn download_server(&mut self) -> Result> { + pub async fn download_server(&self) -> Result> { Ok(match self.loader.as_deref() { - Some("Vanilla") => VanillaDownloader::download(self).await?, - Some("Fabric") => FabricDownloader::download(self).await?, - Some(l) => return Err(format!("Invalid loader specified: {}", l).into()), - None => return Err("No loader specified".into()), + Some("Vanilla") => VanillaDownloader::download().await?, + Some("Fabric") => FabricDownloader::download().await?, + _ => return Err("Invalid selection".into()), }) } @@ -83,7 +62,7 @@ impl Create { trait LoaderDownloader { fn name() -> String; - async fn download(create: &mut Create) -> Result>; + async fn download() -> Result>; } struct VanillaDownloader {} @@ -92,7 +71,7 @@ impl LoaderDownloader for VanillaDownloader { "Vanilla".to_string() } - async fn download(create: &mut Create) -> Result> { + async fn download() -> Result> { const URL: &str = "https://launchermeta.mojang.com/mc/game/version_manifest.json"; let res = with_spinner("", "", || async { let res: VanillaVersions = reqwest::get(URL).await?.json().await?; @@ -100,47 +79,25 @@ impl LoaderDownloader for VanillaDownloader { }) .await?; - if let Some(version) = create.version.clone() { - let version_exists = res - .versions - .iter() - .any(|v| v.id == version); - if !version_exists { return Err("Invalid minecraft version specified".into()) } - } - else { - let versions = res - .versions - .iter() - .filter(|version| { - version.version_type == VanillaVersionType::Release || - (create.show_snapshots && version.version_type == VanillaVersionType::Snapshot) || - (create.show_betas && version.version_type == VanillaVersionType::OldBeta) || - (create.show_alphas && version.version_type == VanillaVersionType::OldAlpha) - }) - .collect::>(); - let version_names = versions - .iter() - .map(|version| version.id.as_str()) - .collect::>(); - - let version_index = FuzzySelect::with_theme(&ColorfulTheme::default()) - .with_prompt("Select Version") - .items(&version_names) - .default(0) - .interact()?; - - create.version = Some(version_names[version_index].to_string()); - } - - let version = res + let release_versions = res .versions .iter() - .find(|v| &v.id == create.version.as_ref().unwrap()) - .unwrap(); + .filter(|version| version.version_type == VanillaVersionType::Release) + .collect::>(); + let release_version_names = release_versions + .iter() + .map(|version| version.id.clone()) + .collect::>(); + + let version_index = FuzzySelect::with_theme(&ColorfulTheme::default()) + .with_prompt("Select Version") + .items(&release_version_names) + .default(0) + .interact()?; let version_detail: VanillaVersionDetail = with_spinner("", "", || async { let version_detail: VanillaVersionDetail = - reqwest::get(version.url.clone()) + reqwest::get(release_versions[version_index].url.clone()) .await? .json() .await?; @@ -151,7 +108,7 @@ impl LoaderDownloader for VanillaDownloader { let start_msg = format!( "downloading server.jar for {} {}", Self::name(), - create.version.as_ref().unwrap(), + release_version_names[version_index] ); with_progressbar( &start_msg, @@ -189,7 +146,7 @@ impl LoaderDownloader for VanillaDownloader { let config = Config { server: Server { - version: create.version.clone().unwrap(), + version: release_version_names[version_index].to_string(), loader: Self::name(), loader_version: None, }, @@ -206,7 +163,7 @@ impl LoaderDownloader for FabricDownloader { "Fabric".to_string() } - async fn download(create: &mut Create) -> Result> { + async fn download() -> Result> { const URL: &str = "https://meta.fabricmc.net/v2/versions"; let res = with_spinner("", "", || async { let res: FabricVersions = reqwest::get(URL).await?.json().await?; @@ -214,54 +171,34 @@ impl LoaderDownloader for FabricDownloader { }) .await?; - if let Some(version) = create.version.clone() { - let exists = res - .game - .iter() - .any(|game| game.version == version); - if !exists { return Err("Invalid minecraft version specified".into()) } - } - else { - let game_version_names = res - .game - .iter() - .filter(|game| create.show_snapshots || game.stable) - .map(|game| game.version.as_str()) - .collect::>(); + let game_version_names = res + .game + .iter() + .filter(|game| game.stable) + .map(|game| game.version.clone()) + .collect::>(); - let game_version_index = FuzzySelect::with_theme(&ColorfulTheme::default()) - .with_prompt("Select Game Version") - .items(&game_version_names) - .default(0) - .interact()?; + let game_version_index = FuzzySelect::with_theme(&ColorfulTheme::default()) + .with_prompt("Select Game Version") + .items(&game_version_names) + .default(0) + .interact()?; - create.version = Some(game_version_names[game_version_index].to_string()); - } + let loader_version_names = res + .loader + .iter() + .filter(|loader| loader.stable) + .map(|loader| loader.version.clone()) + .collect::>(); - if let Some(loader_version) = create.loader_version.clone() { - let exists = res - .loader - .iter() - .any(|loader| loader.version == loader_version); - if !exists { return Err(format!("Invalid {} loader version specified", Self::name()).into()) } - } - else { - let loader_version_names = res - .loader - .iter() - .filter(|loader| loader.stable) - .map(|loader| loader.version.clone()) - .collect::>(); - - let loader_version_index = FuzzySelect::with_theme(&ColorfulTheme::default()) - .with_prompt("Select Loader Version") - .items(&loader_version_names) - .default(0) - .interact()?; - - create.loader_version = Some(loader_version_names[loader_version_index].to_string()); - } + let loader_version_index = FuzzySelect::with_theme(&ColorfulTheme::default()) + .with_prompt("Select Loader Version") + .items(&loader_version_names) + .default(0) + .interact()?; + let game_version = game_version_names[game_version_index].clone(); + let loader_version = loader_version_names[loader_version_index].clone(); let installer_version = res .installer .iter() @@ -277,13 +214,13 @@ impl LoaderDownloader for FabricDownloader { let start_msg = format!( "downloading server.jar for {} {}, {}", Self::name(), - create.loader_version.as_ref().unwrap(), - create.version.as_ref().unwrap(), + loader_version_names[loader_version_index], + game_version_names[game_version_index], ); with_spinner(&start_msg, "download finished", || async { let download_url = format!( "{}/loader/{}/{}/{}/server/jar", - URL, create.version.as_ref().unwrap(), create.loader_version.as_ref().unwrap(), installer_version + URL, game_version, loader_version, installer_version ); let res = reqwest::get(download_url).await?; let mut file = tokio::fs::File::create("server.jar").await?; @@ -299,9 +236,9 @@ impl LoaderDownloader for FabricDownloader { let config = Config { server: Server { - version: create.version.clone().unwrap(), + version: game_version, loader: Self::name(), - loader_version: create.loader_version.clone(), + loader_version: Some(loader_version), }, mods: Mods {}, }; diff --git a/src/main.rs b/src/main.rs index 4beb546..45e0cd6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -25,34 +25,8 @@ struct Mcsm { #[derive(Subcommand)] enum Commands { - /// Create a new minecraft server - Create { - project_name: String, - - /// Minecraft version - #[arg(long)] - version: Option, - - /// Mod Loader, can be either Vanilla or Fabric - #[arg(long)] - loader: Option, - - /// Mod Loader version, ignored if loader is Vanilla - #[arg(long)] - loader_version: Option, - - /// Show snapshot versions - #[arg(long)] - show_snapshots: bool, - - /// Show old beta versions - #[arg(long)] - show_betas: bool, - /// - /// Show old alpha versions - #[arg(long)] - show_alphas: bool, - }, + /// create a new minecraft server + Create { project_name: String }, } #[tokio::main] @@ -60,26 +34,9 @@ async fn main() -> Result<(), Box> { let mcsm = Mcsm::parse(); match mcsm.command { - Commands::Create { - project_name, - version, - loader, - loader_version, - show_snapshots, - show_betas, - show_alphas, - } => { - let loader_is_unset = loader == None; - let mut create = Create::new( - project_name, - version, - loader, - loader_version, - show_snapshots, - show_betas, - show_alphas - ).await?; - if loader_is_unset { create.init_loader().await? } + Commands::Create { project_name } => { + let mut create = Create::new(project_name.clone()).await?; + create.init_loader().await?; let config = create.download_server().await?; create.save_config(config).await?; }