From a31cb962b99e96bda167be87dd37c2e2f82fea2f Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Fri, 27 Feb 2026 06:20:10 +0800 Subject: Add pretty output option to sheetdump command --- src/cmds/cmd/sheetdump.rs | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'src/cmds/cmd') diff --git a/src/cmds/cmd/sheetdump.rs b/src/cmds/cmd/sheetdump.rs index 1945f44..fefa6d4 100644 --- a/src/cmds/cmd/sheetdump.rs +++ b/src/cmds/cmd/sheetdump.rs @@ -3,8 +3,10 @@ use std::any::TypeId; use crate::{ cmd_output, cmds::{ - arg::sheetdump::JVSheetdumpArgument, collect::sheetdump::JVSheetdumpCollect, - r#in::sheetdump::JVSheetdumpInput, out::mappings::JVMappingsOutput, + arg::sheetdump::JVSheetdumpArgument, + collect::sheetdump::JVSheetdumpCollect, + r#in::sheetdump::JVSheetdumpInput, + out::{mappings::JVMappingsOutput, mappings_pretty::JVMappingsPrettyOutput}, }, systems::cmd::{ cmd_system::JVCommandContext, @@ -28,7 +30,10 @@ fn help_str() -> String { } async fn prepare(args: &Arg, _ctx: &JVCommandContext) -> Result { - Ok(In { sort: args.sort }) + Ok(In { + sort: !args.no_sort, + pretty: !args.no_pretty, + }) } async fn collect(args: &Arg, _ctx: &JVCommandContext) -> Result { @@ -55,10 +60,15 @@ async fn exec( mappings_vec.sort(); } - let result = JVMappingsOutput { - mappings: mappings_vec, - }; - cmd_output!(JVMappingsOutput => result) + if input.pretty { + cmd_output!(JVMappingsPrettyOutput => JVMappingsPrettyOutput { + mappings: mappings_vec, + }) + } else { + cmd_output!(JVMappingsOutput => JVMappingsOutput { + mappings: mappings_vec, + }) + } } crate::command_template!(); -- cgit