refactor: #10 📦 Move task name to state

ddanier · Apr 25, 2024 · e18f580 · e18f580
1 parent f9bc609
commit e18f580
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/engine.rs b/src/engine.rs
@@ -65,7 +65,6 @@ pub(crate) struct NurEngine {
     pub(crate) stack: Stack,
 
     pub(crate) state: NurState,
-    pub(crate) task_name: Option<String>,
 }
 
 impl NurEngine {
@@ -75,7 +74,6 @@ impl NurEngine {
             stack: Stack::new(),
 
             state: nur_state,
-            task_name: None,
         };
 
         nur_engine._apply_nur_state()?;
@@ -167,7 +165,7 @@ impl NurEngine {
             NUR_ENV_NUR_TASK_CALL.to_string(),
             Value::string(self.state.task_call.join(" "), Span::unknown()),
         );
-        if self.task_name.is_some() {
+        if self.state.task_name.is_some() {
             let task_name = self.get_task_name();
             self.engine_state.add_env_var(
                 NUR_ENV_NUR_TASK_NAME.to_string(),
@@ -239,17 +237,17 @@ impl NurEngine {
             i += 1; // check next argument
         }
 
-        self.task_name = Some(self.state.task_call[0..i].join(" "));
+        self.state.task_name = Some(self.state.task_call[0..i].join(" "));
     }
 
     pub(crate) fn get_task_def(&mut self) -> Option<&dyn Command> {
-        let task_name = self.task_name.clone().unwrap();
+        let task_name = self.state.task_name.clone().unwrap();
 
         self.get_def(task_name)
     }
 
     pub(crate) fn get_task_name(&mut self) -> String {
-        let task_name = self.task_name.clone().unwrap();
+        let task_name = self.state.task_name.clone().unwrap();
 
         String::from(&task_name[4..])
     }

diff --git a/src/main.rs b/src/main.rs
@@ -110,14 +110,14 @@ fn main() -> Result<ExitCode, miette::ErrReport> {
     }
 
     // Ensure we have a task name
-    if nur_engine.task_name.is_none() {
+    if nur_engine.state.task_name.is_none() {
         return Err(miette::ErrReport::from(NurError::TaskNotFound(
             nur_engine.state.task_call[1].clone(),
         )));
     }
     #[cfg(feature = "debug")]
     if parsed_nur_args.debug_output {
-        eprintln!("full task name: {}", nur_engine.task_name.unwrap());
+        eprintln!("full task name: {}", nur_engine.state.task_name.unwrap());
     }
 
     // Handle help
@@ -132,7 +132,7 @@ fn main() -> Result<ExitCode, miette::ErrReport> {
             std::process::exit(0);
         } else {
             return Err(miette::ErrReport::from(NurError::TaskNotFound(
-                nur_engine.task_name.clone().unwrap(),
+                nur_engine.state.task_name.clone().unwrap(),
             )));
         }
     }

diff --git a/src/state.rs b/src/state.rs
@@ -24,6 +24,7 @@ pub(crate) struct NurState {
     pub(crate) args_to_nur: Vec<String>,
     pub(crate) has_task_call: bool,
     pub(crate) task_call: Vec<String>,
+    pub(crate) task_name: Option<String>,
 }
 
 impl NurState {
@@ -62,6 +63,7 @@ impl NurState {
             args_to_nur,
             has_task_call,
             task_call,
+            task_name: None,
         })
     }
 }