From abc0409fe8378929de5b0903c189f479261cc68d Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Tue, 14 Dec 2021 18:33:56 +0100
Subject: [PATCH] Add the commands to the package display impl
---
src/cmd/cmd.rs | 5 +++++
src/cmd/package.rs | 15 +++++++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/cmd/cmd.rs b/src/cmd/cmd.rs
index 75ac6ea..5d70238 100644
--- a/src/cmd/cmd.rs
+++ b/src/cmd/cmd.rs
@@ -37,4 +37,9 @@ impl Cmd {
CmdHandler::MultiEcho(f) => f(args).join("<br>---"),
}
}
+
+ #[allow(dead_code)]
+ pub fn get_name(&self) -> &str {
+ &self.name
+ }
}
diff --git a/src/cmd/package.rs b/src/cmd/package.rs
index 98f4404..44b2865 100644
--- a/src/cmd/package.rs
+++ b/src/cmd/package.rs
@@ -55,8 +55,19 @@ impl fmt::Display for CmdPackage {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(
f,
- "CmdPackage({}, acls({}), admins({}))",
- self.name, self.acl, self.admin_register
+ "CmdPackage({}, acls({}), admins({}), commands({}))",
+ self.name,
+ self.acl,
+ self.admin_register,
+ match self.commands.len() != 0 {
+ true => self
+ .commands
+ .iter()
+ .map(|x| x.get_name().to_string())
+ .reduce(|x1, x2| format!("{}, {}", x1, x2))
+ .unwrap(),
+ false => "".to_string(),
+ }
)
}
}
--
GitLab