improvements during testing presentation scenario

adamgracikowski · adamgracikowski · commit dfc8227fcb2e · 2026-01-13T15:29:22.000+01:00
diff --git a/cli/src/commands/config/subcommands/get.rs b/cli/src/commands/config/subcommands/get.rs
@@ -70,17 +70,14 @@ impl MevaCommand for ConfigGetCommand {
         let default = matches.get_one::<String>(Self::ARG_DEFAULT);
 
         let config_handler = container.config_handler().into_diagnostic()?;
-        let interceptor = container.plugins_interceptor().into_diagnostic()?;
 
         let request = GetRequest {
             location,
             key: key.clone(),
             default: default.cloned(),
         };
 
-        let response = config_handler
-            .handle_get(request, &interceptor)
-            .into_diagnostic()?;
+        let response = config_handler.handle_get(request).into_diagnostic()?;
 
         println!("{}", response.value);
 
diff --git a/cli/src/commands/config/subcommands/list.rs b/cli/src/commands/config/subcommands/list.rs
@@ -48,13 +48,10 @@ impl MevaCommand for ConfigListCommand {
         let location = matches.get_config_location();
 
         let config_handler = container.config_handler().into_diagnostic()?;
-        let interceptor = container.plugins_interceptor().into_diagnostic()?;
 
         let request = ListRequest { location };
 
-        let response = config_handler
-            .handle_list(request, &interceptor)
-            .into_diagnostic()?;
+        let response = config_handler.handle_list(request).into_diagnostic()?;
 
         if response.key_values.is_empty() {
             println!(
diff --git a/cli/src/commands/ignore/subcommands/add.rs b/cli/src/commands/ignore/subcommands/add.rs
@@ -8,6 +8,8 @@ use engine::{
 };
 use globset::Glob;
 use miette::IntoDiagnostic;
+use owo_colors::OwoColorize;
+use shared::PathToString;
 
 use crate::{
     commands::MevaCommand,
@@ -58,8 +60,8 @@ impl MevaCommand for IgnoreAddCommand {
 
         println!(
             "Pattern '{}' appended to {}",
-            pattern,
-            result_path.to_string_lossy()
+            pattern.green(),
+            result_path.to_utf8_string().cyan()
         );
 
         Ok(())
diff --git a/cli/src/commands/plugins/subcommands/list.rs b/cli/src/commands/plugins/subcommands/list.rs
@@ -1,12 +1,13 @@
 use async_trait::async_trait;
-use clap::{Arg, ArgAction, ArgGroup, ArgMatches, Command};
+use clap::{Arg, ArgAction, ArgGroup, ArgMatches, Command, builder::PossibleValuesParser};
 use engine::{
     EngineContainer,
     engine_container::MevaContainer,
     handlers::plugins::{ListRequest, PluginsOperations},
 };
 use miette::IntoDiagnostic;
 use plugins::{CommandType, EventType, ScopeType};
+use strum::VariantNames;
 
 use crate::{commands::MevaCommand, extensions::WithScope};
 
@@ -46,13 +47,15 @@ impl MevaCommand for PluginsListCommand {
                     .index(1)
                     .required(true)
                     .value_name("COMMAND")
+                    .value_parser(PossibleValuesParser::new(CommandType::VARIANTS))
                     .help("Filter plugins by associated command"),
             )
             .arg(
                 Arg::new(Self::ARG_EVENT)
                     .index(2)
                     .required(true)
                     .value_name("EVENT")
+                    .value_parser(PossibleValuesParser::new(EventType::VARIANTS))
                     .help("Filter plugins by event"),
             )
             .with_scope_arg("Scope of the plugin")
diff --git a/engine/src/handlers/commit/handlers.rs b/engine/src/handlers/commit/handlers.rs
@@ -81,13 +81,22 @@ impl CommitHandler {
     ) -> EngineResult<Response> {
         match self.should_execute(&request)? {
             false => Err(CommitError::NothingToCommit.into()),
-            true => interceptor.intercept_with_plugins(
-                CommandType::Commit,
-                None,
-                request,
-                self,
-                |req| self.commit(req),
-            ),
+            true => {
+                let mut request = request;
+                if request.author.is_none() {
+                    request.author = Some(Person {
+                        name: self.get_user_name()?,
+                        email: self.get_user_email()?,
+                    });
+                }
+                interceptor.intercept_with_plugins(
+                    CommandType::Commit,
+                    None,
+                    request,
+                    self,
+                    |req| self.commit(req),
+                )
+            }
         }
     }
 
@@ -123,7 +132,7 @@ impl CommitHandler {
     }
 
     /// Retrieves the configured username from the repository settings.
-    fn get_username(&self) -> EngineResult<String> {
+    fn get_user_name(&self) -> EngineResult<String> {
         self.config_loader
             .get("user.name", Some(&String::default()))
     }
@@ -188,8 +197,9 @@ impl CommitOperations for CommitHandler {
     fn commit(&self, request: Request) -> EngineResult<Response> {
         let author = match request.author.clone() {
             Some(a) => a,
+            // should not happen
             None => Person {
-                name: self.get_username()?,
+                name: self.get_user_name()?,
                 email: self.get_user_email()?,
             },
         };
diff --git a/engine/src/handlers/commit/operations.rs b/engine/src/handlers/commit/operations.rs
@@ -6,7 +6,7 @@ use crate::objects::{MevaCommit, Person};
 ///
 /// This struct holds input data passed to the commit process,
 /// including the commit message, author information, and execution flags.
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct Request {
     /// Commit message provided by the user.
     pub message: String,
diff --git a/engine/src/handlers/config/handlers.rs b/engine/src/handlers/config/handlers.rs
@@ -21,14 +21,8 @@ impl ConfigHandler {
         Self { config_loader }
     }
 
-    pub fn handle_get(
-        &self,
-        request: GetRequest,
-        interceptor: &PluginsInterceptor,
-    ) -> EngineResult<GetResponse> {
-        interceptor.intercept_with_plugins(CommandType::ConfigGet, None, request, self, |req| {
-            self.get(req)
-        })
+    pub fn handle_get(&self, request: GetRequest) -> EngineResult<GetResponse> {
+        self.get(request)
     }
 
     pub fn handle_set(
@@ -51,14 +45,8 @@ impl ConfigHandler {
         })
     }
 
-    pub fn handle_list(
-        &self,
-        request: ListRequest,
-        interceptor: &PluginsInterceptor,
-    ) -> EngineResult<ListResponse> {
-        interceptor.intercept_with_plugins(CommandType::ConfigList, None, request, self, |req| {
-            self.list(req)
-        })
+    pub fn handle_list(&self, request: ListRequest) -> EngineResult<ListResponse> {
+        self.list(request)
     }
 
     pub fn handle_create(&self, request: CreateRequest) -> EngineResult<CreateResponse> {
@@ -120,50 +108,6 @@ impl ConfigOperations for ConfigHandler {
     }
 }
 
-impl PluginsInvocationMapper<GetRequest, GetResponse> for ConfigHandler {
-    fn request_to_payload(&self, req: &GetRequest) -> EngineResult<InvocationPrePayload> {
-        Ok(InvocationPrePayload::ConfigGet(ConfigGetPrePayload {
-            config_file: req.location.get_default_path()?,
-            key: req.key.clone(),
-            default: req.default.clone(),
-        }))
-    }
-
-    fn response_to_payload(&self, res: &GetResponse) -> EngineResult<InvocationPostPayload> {
-        Ok(InvocationPostPayload::ConfigGet(ConfigGetPostPayload {
-            key: res.key.clone(),
-            value: res.value.clone(),
-        }))
-    }
-
-    fn input_to_request(&self, input: &InvocationInput) -> EngineResult<GetRequest> {
-        if let Some(InvocationPrePayload::ConfigGet(pre)) = &input.pre_payload {
-            Ok(GetRequest {
-                location: ConfigLocation::from_path(&pre.config_file)?,
-                key: pre.key.clone(),
-                default: pre.default.clone(),
-            })
-        } else {
-            Err(EngineError::Plugins(PluginError::PrePayload {
-                payload: input.pre_payload.clone(),
-            }))
-        }
-    }
-
-    fn input_to_response(&self, input: &InvocationInput) -> EngineResult<GetResponse> {
-        if let Some(InvocationPostPayload::ConfigGet(post)) = &input.post_payload {
-            Ok(GetResponse {
-                key: post.key.clone(),
-                value: post.value.clone(),
-            })
-        } else {
-            Err(EngineError::Plugins(PluginError::PostPayload {
-                payload: input.post_payload.clone(),
-            }))
-        }
-    }
-}
-
 impl PluginsInvocationMapper<SetRequest, SetResponse> for ConfigHandler {
     fn request_to_payload(&self, req: &SetRequest) -> EngineResult<InvocationPrePayload> {
         Ok(InvocationPrePayload::ConfigSet(ConfigSetPrePayload {
@@ -195,7 +139,7 @@ impl PluginsInvocationMapper<SetRequest, SetResponse> for ConfigHandler {
     }
 
     fn input_to_response(&self, input: &InvocationInput) -> EngineResult<SetResponse> {
-        if let Some(InvocationPostPayload::ConfigGet(post)) = &input.post_payload {
+        if let Some(InvocationPostPayload::ConfigSet(post)) = &input.post_payload {
             Ok(SetResponse {
                 key: post.key.clone(),
                 value: post.value.clone(),
@@ -247,41 +191,3 @@ impl PluginsInvocationMapper<UnsetRequest, UnsetResponse> for ConfigHandler {
         }
     }
 }
-
-impl PluginsInvocationMapper<ListRequest, ListResponse> for ConfigHandler {
-    fn request_to_payload(&self, req: &ListRequest) -> EngineResult<InvocationPrePayload> {
-        Ok(InvocationPrePayload::ConfigList(ConfigListPrePayload {
-            config_file: req.location.get_default_path()?,
-        }))
-    }
-
-    fn response_to_payload(&self, res: &ListResponse) -> EngineResult<InvocationPostPayload> {
-        Ok(InvocationPostPayload::ConfigList(ConfigListPostPayload {
-            key_values: res.key_values.clone(),
-        }))
-    }
-
-    fn input_to_request(&self, input: &InvocationInput) -> EngineResult<ListRequest> {
-        if let Some(InvocationPrePayload::ConfigList(pre)) = &input.pre_payload {
-            Ok(ListRequest {
-                location: ConfigLocation::from_path(&pre.config_file)?,
-            })
-        } else {
-            Err(EngineError::Plugins(PluginError::PrePayload {
-                payload: input.pre_payload.clone(),
-            }))
-        }
-    }
-
-    fn input_to_response(&self, input: &InvocationInput) -> EngineResult<ListResponse> {
-        if let Some(InvocationPostPayload::ConfigList(post)) = &input.post_payload {
-            Ok(ListResponse {
-                key_values: post.key_values.clone(),
-            })
-        } else {
-            Err(EngineError::Plugins(PluginError::PostPayload {
-                payload: input.post_payload.clone(),
-            }))
-        }
-    }
-}
diff --git a/engine/src/handlers/ls_files/models/ls_files_entry.rs b/engine/src/handlers/ls_files/models/ls_files_entry.rs
@@ -26,7 +26,7 @@ impl Display for LsFilesEntry {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             LsFilesEntry::Path { path } => {
-                write!(f, "{}", path.green())
+                write!(f, "{}", path.cyan())
             }
             LsFilesEntry::Entry {
                 mode,
@@ -39,8 +39,8 @@ impl Display for LsFilesEntry {
                     "{} {} {} {}",
                     format!("{mode:o}").dimmed(),
                     object.yellow(),
-                    stage.dimmed(),
-                    path.green()
+                    stage.green(),
+                    path.cyan()
                 )
             }
         }
diff --git a/engine/src/handlers/ls_tree/models/ls_tree_entry.rs b/engine/src/handlers/ls_tree/models/ls_tree_entry.rs
@@ -1,5 +1,8 @@
 use std::fmt::Display;
 
+use owo_colors::OwoColorize;
+use shared::PathToString;
+
 use super::display_mode::DisplayMode;
 
 use crate::objects::ObjectEntry;
@@ -21,15 +24,15 @@ impl Display for LsTreeEntry {
 
         match self.display_mode {
             DisplayMode::NameOnly => {
-                write!(f, "{}", entry.path.display())
+                write!(f, "{}", entry.path.to_utf8_string().cyan())
             }
             DisplayMode::Normal => {
                 write!(
                     f,
                     "{} {} {}",
-                    entry.entry_type,
-                    entry.hash,
-                    entry.path.display()
+                    entry.entry_type.dimmed(),
+                    entry.hash.yellow(),
+                    entry.path.to_utf8_string().cyan()
                 )
             }
             DisplayMode::Long => {
@@ -40,10 +43,10 @@ impl Display for LsTreeEntry {
                 write!(
                     f,
                     "{} {} {:>8} {}",
-                    entry.entry_type,
-                    entry.hash,
-                    size_str,
-                    entry.path.display(),
+                    entry.entry_type.dimmed(),
+                    entry.hash.yellow(),
+                    size_str.green(),
+                    entry.path.to_utf8_string().cyan(),
                 )
             }
         }
diff --git a/engine/src/handlers/status/models/branch_info.rs b/engine/src/handlers/status/models/branch_info.rs
@@ -1,5 +1,7 @@
 use std::fmt::Display;
 
+use owo_colors::OwoColorize;
+
 /// Represents information about the current branch and HEAD state.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct BranchInfo {
@@ -29,24 +31,32 @@ impl Display for BranchInfo {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         if self.is_detached {
             match &self.head {
-                Some(oid) => writeln!(f, "HEAD (detached at {oid})")?,
+                Some(oid) => writeln!(f, "HEAD (detached at {})", oid.yellow())?,
                 None => writeln!(f, "HEAD (detached)")?,
             }
         } else if let Some(head) = &self.head {
             match &self.upstream {
                 Some(up) if self.ahead == 0 && self.behind == 0 => {
-                    writeln!(f, "On branch {head} (up to date with {up})")
+                    writeln!(
+                        f,
+                        "On branch {} (up to date with {})",
+                        head.bold().cyan(),
+                        up.cyan()
+                    )
                 }
                 Some(up) => writeln!(
                     f,
-                    "On branch {head} ({} ahead, {} behind of {})",
-                    self.ahead, self.behind, up
+                    "On branch {} ({} ahead, {} behind of {})",
+                    head.bold().cyan(),
+                    self.ahead.green(),
+                    self.behind.red(),
+                    up.cyan()
                 ),
-                None => writeln!(f, "On branch {head}"),
+                None => writeln!(f, "On branch {}", head.bold().cyan()),
             }?;
             if !self.has_commits {
                 // This is a new/orphan branch with no commit history
-                writeln!(f, "\nNo commits yet")?;
+                writeln!(f, "\n{}", "No commits yet".yellow())?;
                 return writeln!(f);
             }
         } else {
diff --git a/engine/src/network/common/pkt_line.rs b/engine/src/network/common/pkt_line.rs
diff --git a/gui/src/ui/views/settings.rs b/gui/src/ui/views/settings.rs
diff --git a/plugins/src/enums/invocation_payload.rs b/plugins/src/enums/invocation_payload.rs
diff --git a/plugins/src/models/payloads/config_payload.rs b/plugins/src/models/payloads/config_payload.rs
diff --git a/server/src/server_handler.rs b/server/src/server_handler.rs

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ impl Display for LsFilesEntry {`
`26`	`26`	`fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
`27`	`27`	`match self {`
`28`	`28`	`LsFilesEntry::Path { path } => {`
`29`		`- write!(f, "{}", path.green())`
	`29`	`+ write!(f, "{}", path.cyan())`
`30`	`30`	`}`
`31`	`31`	`LsFilesEntry::Entry {`
`32`	`32`	`mode,`
`@@ -39,8 +39,8 @@ impl Display for LsFilesEntry {`
`39`	`39`	`"{} {} {} {}",`
`40`	`40`	`format!("{mode:o}").dimmed(),`
`41`	`41`	`object.yellow(),`
`42`		`- stage.dimmed(),`
`43`		`- path.green()`
	`42`	`+ stage.green(),`
	`43`	`+ path.cyan()`
`44`	`44`	`)`
`45`	`45`	`}`
`46`	`46`	`}`