fix launch default with no header

BrettMayson · Oct 15, 2023 · 846265b · 846265b
1 parent 0f8254f
commit 846265b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/bin/src/commands/launch.rs b/bin/src/commands/launch.rs
@@ -1,7 +1,10 @@
-use std::path::{Path, PathBuf};
+use std::{
+    borrow::Cow,
+    path::{Path, PathBuf},
+};
 
 use clap::{ArgMatches, Command};
-use hemtt_project::ProjectConfig;
+use hemtt_project::{hemtt::LaunchOptions, ProjectConfig};
 use steamlocate::SteamDir;
 
 use crate::{error::Error, utils::create_link};
@@ -51,6 +54,11 @@ pub fn execute(matches: &ArgMatches) -> Result<(), Error> {
     let launch = config
         .hemtt()
         .launch(&launch_config)
+        .or(if launch_config == "default" {
+            Some(Cow::Owned(LaunchOptions::default()))
+        } else {
+            None
+        })
         .ok_or(Error::LaunchConfigNotFound(launch_config.to_string()))?;
 
     let Some(arma3dir) =

diff --git a/libs/project/src/hemtt.rs b/libs/project/src/hemtt.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::{borrow::Cow, collections::HashMap};
 
 use hemtt_common::arma::dlc::DLC;
 use serde::{Deserialize, Serialize};
@@ -25,8 +25,8 @@ impl Features {
     }
 
     #[must_use]
-    pub fn launch(&self, key: &str) -> Option<&LaunchOptions> {
-        self.launch.get(key)
+    pub fn launch(&self, key: &str) -> Option<Cow<LaunchOptions>> {
+        self.launch.get(key).map(Cow::Borrowed)
     }
 
     #[must_use]

diff --git a/libs/project/src/lib.rs b/libs/project/src/lib.rs
@@ -6,7 +6,7 @@ mod addon;
 mod asc;
 mod error;
 mod files;
-mod hemtt;
+pub mod hemtt;
 mod lint;
 mod signing;
 mod version;