@@ -33,15 +33,81 @@ struct Options {
3333 ) ]
3434 dry_run : bool ,
3535
36- #[ arg( help = "Destination file" ) ]
37- filepath : String ,
36+ #[ arg(
37+ short = 'u' ,
38+ long = "unique" ,
39+ help = "Merge all input files, sort and remove duplicates (like 'sort -u')"
40+ ) ]
41+ unique_mode : bool ,
42+
43+ #[ arg( help = "Destination file" , required_unless_present = "unique_mode" ) ]
44+ filepath : Option < String > ,
45+
46+ #[ arg( help = "Additional input files for unique mode" , num_args = 0 ..) ]
47+ additional_files : Vec < String > ,
3848}
3949
4050fn main ( ) -> io:: Result < ( ) > {
4151 let args = Options :: parse ( ) ;
4252
53+ if args. unique_mode {
54+ // Handle unique mode (sort -u equivalent)
55+ let mut all_lines = IndexSet :: new ( ) ;
56+
57+ // Process files if provided
58+ if let Some ( filepath) = & args. filepath {
59+ if let Ok ( lines) = load_file_content ( filepath) {
60+ for line in lines {
61+ if should_add_line ( & args, & all_lines, & line) {
62+ all_lines. insert ( line) ;
63+ }
64+ }
65+ }
66+ }
67+
68+ // Process additional files
69+ for file in & args. additional_files {
70+ if let Ok ( lines) = load_file_content ( file) {
71+ for line in lines {
72+ if should_add_line ( & args, & all_lines, & line) {
73+ all_lines. insert ( line) ;
74+ }
75+ }
76+ }
77+ }
78+
79+ // Process stdin
80+ let stdin = io:: stdin ( ) ;
81+ let mut handle = stdin. lock ( ) ;
82+ let mut buffer = String :: new ( ) ;
83+
84+ while handle. read_line ( & mut buffer) ? > 0 {
85+ let line = buffer. trim_end ( ) . to_string ( ) ;
86+ if should_add_line ( & args, & all_lines, & line) {
87+ all_lines. insert ( line) ;
88+ }
89+ buffer. clear ( ) ;
90+ }
91+
92+ // Sort if requested
93+ let mut final_lines: Vec < _ > = all_lines. into_iter ( ) . collect ( ) ;
94+ if args. sort {
95+ final_lines. sort_by ( |a, b| natsort:: compare ( a, b, false ) ) ;
96+ }
97+
98+ // Output results
99+ for line in final_lines {
100+ println ! ( "{}" , line) ;
101+ }
102+
103+ return Ok ( ( ) ) ;
104+ }
105+
106+ // Original functionality for non-unique mode
107+ let filepath = args. filepath . as_ref ( ) . expect ( "Destination file is required in non-unique mode" ) ;
108+
43109 // Ensure the directories in the filepath exist before attempting to open the file
44- if let Some ( parent) = Path :: new ( & args . filepath ) . parent ( ) {
110+ if let Some ( parent) = Path :: new ( filepath) . parent ( ) {
45111 fs:: create_dir_all ( parent) ?;
46112 }
47113
@@ -52,7 +118,7 @@ fn main() -> io::Result<()> {
52118 . write ( true )
53119 . create ( true )
54120 . truncate ( true )
55- . open ( & args . filepath ) ?;
121+ . open ( filepath) ?;
56122 let mut writer = BufWriter :: new ( file) ;
57123
58124 for line in lines. iter ( ) {
@@ -65,7 +131,7 @@ fn main() -> io::Result<()> {
65131 . append ( true )
66132 . write ( true )
67133 . create ( true )
68- . open ( & args . filepath ) ?;
134+ . open ( filepath) ?;
69135 let mut writer = BufWriter :: new ( file) ;
70136
71137 for stdin_line in stdin. lock ( ) . lines ( ) {
@@ -88,23 +154,24 @@ fn main() -> io::Result<()> {
88154 let mut sorted_lines: Vec < _ > = lines. into_iter ( ) . collect ( ) ;
89155 sorted_lines. sort_by ( |a, b| natsort:: compare ( a, b, false ) ) ;
90156
91- let soet_file = OpenOptions :: new ( )
157+ let sort_file = OpenOptions :: new ( )
92158 . write ( true )
93159 . create ( true )
94160 . truncate ( true )
95- . open ( & args . filepath ) ?;
96- let mut soet_writer = BufWriter :: new ( soet_file ) ;
161+ . open ( filepath) ?;
162+ let mut sort_writer = BufWriter :: new ( sort_file ) ;
97163
98164 for line in sorted_lines. iter ( ) {
99- writeln ! ( soet_writer , "{}" , line) ?;
165+ writeln ! ( sort_writer , "{}" , line) ?;
100166 }
101167 }
102168
103169 Ok ( ( ) )
104170}
105171
106172fn load_file ( args : & Options ) -> Result < IndexSet < String > , io:: Error > {
107- match File :: open ( & args. filepath ) {
173+ let filepath = args. filepath . as_ref ( ) . expect ( "Destination file is required" ) ;
174+ match File :: open ( filepath) {
108175 Ok ( file) => {
109176 let reader = BufReader :: new ( file) ;
110177 let mut lines = IndexSet :: new ( ) ;
@@ -126,3 +193,18 @@ fn should_add_line(args: &Options, lines: &IndexSet<String>, line: &str) -> bool
126193 let trimmed_line = if args. trim { line. trim ( ) } else { line } ;
127194 !trimmed_line. is_empty ( ) && !lines. contains ( trimmed_line)
128195}
196+
197+ // New helper function to load file content
198+ fn load_file_content ( filepath : & str ) -> io:: Result < Vec < String > > {
199+ match File :: open ( filepath) {
200+ Ok ( file) => {
201+ let reader = BufReader :: new ( file) ;
202+ let mut lines = Vec :: new ( ) ;
203+ for line in reader. lines ( ) {
204+ lines. push ( line?) ;
205+ }
206+ Ok ( lines)
207+ }
208+ Err ( _) => Ok ( Vec :: new ( ) ) ,
209+ }
210+ }
0 commit comments