From 763ccb3291170b84905941949c638d17d4db369c Mon Sep 17 00:00:00 2001 From: Valerie Wolfe Date: Mon, 10 Jun 2024 13:05:12 -0400 Subject: [PATCH] fixed column behavior in qdls --- qdls/Program.cs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/qdls/Program.cs b/qdls/Program.cs index 1a83465..6c1aa17 100644 --- a/qdls/Program.cs +++ b/qdls/Program.cs @@ -1,5 +1,4 @@ - -using Qdls; +using Qdls; // collect args and consume flags List arguments = args.ToList(); @@ -25,10 +24,10 @@ foreach(var arg in arguments) { // state vars var buffer = ""; - var longest = children.OrderByDescending(s => Path.GetFileName(s).Length).First().Length; + var longest = Path.GetFileName(children.OrderByDescending(s => s.Length).First()).Length; var columns = Console.WindowWidth / (longest + 2); - var multiline = columns < args.Length; - var position = -1; + var multiline = columns < children.Count(); + var position = 0; // print names if more than one target if(args.Length > 1) @@ -46,13 +45,13 @@ foreach(var arg in arguments) { buffer += Format.Directory; // if we pass max width, write buffer and clear - if( multiline && (++position > columns) ) { - position = -1; - Console.WriteLine(buffer); + if( (++position > columns) && multiline ) { + position = 1; + Console.WriteLine(buffer.TrimEnd()); buffer = ""; } if(multiline) - buffer += $"{name}{Format.Reset}".PadRight(longest) + " "; + buffer += $"{name}{Format.Reset}".PadRight(longest + 4); else buffer += $"{name}{Format.Reset} ";