added -k parameter to sort by columns

lib/common.go

@@ -68,10 +68,22 @@ var (
 	validOutputmodes = "(orgtbl|markdown|extended|ascii)"
 
 	// main program version
-	Version = "v1.0.7"
+	Version = "v1.0.8"
 
 	// generated  version string, used  by -v contains  lib.Version on
 	//  main  branch,   and  lib.Version-$branch-$lastcommit-$date  on
 	// development branch
 	VERSION string
+
+	// sorting
+	SortByColumn int
 )
+
+// contains a whole parsed table
+type Tabdata struct {
+	maxwidthHeader int      // longest header
+	maxwidthPerCol []int    // max width per column
+	columns        int      // count
+	headers        []string // [ "ID", "NAME", ...]
+	entries        [][]string
+}

lib/parser.go

@@ -27,15 +27,6 @@ import (
 	"strings"
 )
 
-// contains a whole parsed table
-type Tabdata struct {
-	maxwidthHeader int      // longest header
-	maxwidthPerCol []int    // max width per column
-	columns        int      // count
-	headers        []string // [ "ID", "NAME", ...]
-	entries        [][]string
-}
-
 /*
    Parse tabular input.
 */

lib/printer.go

@@ -26,11 +26,19 @@ import (
 )
 
 func printData(data *Tabdata) {
+	// some output preparations:
+
 	if OutputMode != "shell" {
+		// not needed in eval string
 		numberizeHeaders(data)
 	}
+
+	// remove unwanted columns, if any
 	reduceColumns(data)
 
+	// sort the data
+	sortTable(data, SortByColumn)
+
 	switch OutputMode {
 	case "extended":
 		printExtendedData(data)

lib/printer_test.go

@@ -25,6 +25,20 @@ import (
 	"testing"
 )
 
+func stdout2pipe(t *testing.T) (*os.File, *os.File) {
+	reader, writer, err := os.Pipe()
+	if err != nil {
+		t.Fatal(err)
+	}
+	origStdout := os.Stdout
+	os.Stdout = writer
+
+	// we need to tell the color mode the io.Writer, even if we don't usw colorization
+	color.SetOutput(writer)
+
+	return origStdout, reader
+}
+
 func TestPrinter(t *testing.T) {
 	startdata := Tabdata{
 		maxwidthHeader: 5,
@@ -51,18 +65,22 @@ func TestPrinter(t *testing.T) {
 		"ascii": `ONE(1)	TWO(2)	THREE(3) 
 asd   	igig  	cxxxncnc	
 19191 	EDD 1 	X`,
+
 		"orgtbl": `|--------+--------+----------|
 | ONE(1) | TWO(2) | THREE(3) |
 |--------+--------+----------|
 | asd    | igig   | cxxxncnc |
 |  19191 | EDD 1  | X        |
 |--------+--------+----------|`,
+
 		"markdown": `| ONE(1) | TWO(2) | THREE(3) |
 |--------|--------|----------|
 | asd    | igig   | cxxxncnc |
 |  19191 | EDD 1  | X        |`,
+
 		"shell": `ONE="asd" TWO="igig" THREE="cxxxncnc"
 ONE="19191" TWO="EDD 1" THREE="X"`,
+
 		"extended": `ONE(1): asd
   TWO(2): igig
 THREE(3): cxxxncnc
@@ -73,16 +91,9 @@ THREE(3): X`,
 	}
 
 	NoColor = true
+	SortByColumn = 0 // disable sorting
 
-	r, w, err := os.Pipe()
-	if err != nil {
-		t.Fatal(err)
-	}
-	origStdout := os.Stdout
-	os.Stdout = w
-
-	// we need to tell the color mode the io.Writer, even if we don't usw colorization
-	color.SetOutput(w)
+	origStdout, reader := stdout2pipe(t)
 
 	for mode, expect := range expects {
 		testname := fmt.Sprintf("print-%s", mode)
@@ -93,7 +104,7 @@ THREE(3): X`,
 			printData(&data)
 
 			buf := make([]byte, 1024)
-			n, err := r.Read(buf)
+			n, err := reader.Read(buf)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -101,7 +112,8 @@ THREE(3): X`,
 			output := strings.TrimSpace(string(buf))
 
 			if output != expect {
-				t.Errorf("output mode: %s, got:\n%s\nwant:\n%s\n (%d <=> %d)", mode, output, expect, len(output), len(expect))
+				t.Errorf("output mode: %s, got:\n%s\nwant:\n%s\n (%d <=> %d)",
+					mode, output, expect, len(output), len(expect))
 			}
 		})
 	}
@@ -110,3 +122,91 @@ THREE(3): X`,
 	os.Stdout = origStdout
 
 }
+
+func TestSortPrinter(t *testing.T) {
+	startdata := Tabdata{
+		maxwidthHeader: 5,
+		maxwidthPerCol: []int{
+			3,
+			3,
+			2,
+		},
+		columns: 3,
+		headers: []string{
+			"ONE", "TWO", "THREE",
+		},
+		entries: [][]string{
+			[]string{
+				"abc", "345", "b1",
+			},
+			[]string{
+				"bcd", "234", "a2",
+			},
+			[]string{
+				"cde", "123", "c3",
+			},
+		},
+	}
+
+	var tests = []struct {
+		data   Tabdata
+		sortby int
+		expect string
+	}{
+		{
+			data:   startdata,
+			sortby: 1,
+			expect: `ONE(1)	TWO(2)	THREE(3) 
+abc   	345   	b1      	
+bcd   	234   	a2      	
+cde   	123   	c3`,
+		},
+
+		{
+			data:   startdata,
+			sortby: 2,
+			expect: `ONE(1)	TWO(2)	THREE(3) 
+cde   	123   	c3      	
+bcd   	234   	a2      	
+abc   	345   	b1`,
+		},
+
+		{
+			data:   startdata,
+			sortby: 3,
+			expect: `ONE(1)	TWO(2)	THREE(3) 
+bcd   	234   	a2      	
+abc   	345   	b1      	
+cde   	123   	c3`,
+		},
+	}
+
+	NoColor = true
+	OutputMode = "ascii"
+	origStdout, reader := stdout2pipe(t)
+
+	for _, tt := range tests {
+		testname := fmt.Sprintf("print-sorted-table-%d", tt.sortby)
+		t.Run(testname, func(t *testing.T) {
+			SortByColumn = tt.sortby
+
+			printData(&tt.data)
+
+			buf := make([]byte, 1024)
+			n, err := reader.Read(buf)
+			if err != nil {
+				t.Fatal(err)
+			}
+			buf = buf[:n]
+			output := strings.TrimSpace(string(buf))
+
+			if output != tt.expect {
+				t.Errorf("sort column: %d, got:\n%s\nwant:\n%s",
+					tt.sortby, output, tt.expect)
+			}
+		})
+	}
+
+	// Restore
+	os.Stdout = origStdout
+}

lib/sort.go

@@ -0,0 +1,46 @@
+/*
+Copyright © 2022 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package lib
+
+import (
+	"sort"
+)
+
+func sortTable(data *Tabdata, col int) {
+	if col <= 0 {
+		// no sorting wanted
+		return
+	}
+
+	col-- // ui starts counting by 1, but use 0 internally
+
+	// sanity checks
+	if len(data.entries) == 0 {
+		return
+	}
+
+	if col >= len(data.headers) {
+		// fall back to default column
+		col = 0
+	}
+
+	// actual sorting
+	sort.SliceStable(data.entries, func(i, j int) bool {
+		return data.entries[i][col] < data.entries[j][col]
+	})
+}