diff --git a/src/cmd/cmd.rs b/src/cmd/cmd.rs index 75ac6eab3ecb44b4a779f5733b7699f1afe4a644..5d7023815a64385a22b485351930eba2908bde9f 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 98f440421bd93d9de2b488afd5e1815905489bc8..44b2865f1492ca6e5b76a45ed2dc2e476e5c9f28 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(), + } ) } }