improve display

Author: jpinsonneau

cmd/map_format.go

@@ -28,6 +28,8 @@ var (
 		"PktDrop", "Drop",
 		"DnsTracking", "DNS",
 		"FlowRTT", "RTT",
+		"Dropped", "Drop",
+		"L3 Layer", "L3",
 	)
 )
 
@@ -461,22 +463,23 @@ func toFieldName(id string) string {
 	return ""
 }
 
-func ellipsize(text string, maxLen int) string {
-	if maxLen == 0 {
+func ellipsizeAndPad(text string, length int) string {
+	if length == 0 {
 		return text
 	}
-	lastSpaceIx := maxLen
+	lastSpaceIx := length
 	len := 0
+	truncatedText := text
 	for i, r := range text {
 		if unicode.IsSpace(r) {
 			lastSpaceIx = i
 		}
 		len++
-		if len > maxLen {
-			return text[:lastSpaceIx] + "…"
+		if len > length {
+			truncatedText = text[:lastSpaceIx] + "…"
 		}
 	}
-	return text
+	return fmt.Sprintf("%-*s", length, truncatedText)
 }
 
 func ToColWidth(id string) int {
@@ -502,8 +505,7 @@ func ToColName(id string) string {
 			name = col.Name
 		}
 	}
-	padding := ToColWidth(id)
-	return fmt.Sprintf("%-*s", padding, replacer.Replace(name))
+	return ellipsizeAndPad(replacer.Replace(name), ToColWidth(id))
 }
 
 func ToColValue(genericMap config.GenericMap, id string) string {
@@ -545,6 +547,5 @@ func ToColValue(genericMap config.GenericMap, id string) string {
 		outputStr = toValue(genericMap, fieldName)
 	}
 
-	width := ToColWidth(id)
-	return ellipsize(outputStr, width)
+	return ellipsizeAndPad(outputStr, ToColWidth(id))
 }