From 945e044bbf19f4326401485daf55b8c8bfd1186c Mon Sep 17 00:00:00 2001
From: Aleksey Lobanov <alekseylobanov1@gmail.com>
Date: Tue, 29 Mar 2016 03:06:56 +0300
Subject: [PATCH] Fixed some golint warnings

---
 main.go   | 12 +++++++++---
 saving.go | 18 ++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/main.go b/main.go
index f8ede49..3329a08 100644
--- a/main.go
+++ b/main.go
@@ -17,10 +17,16 @@ import (
 
 const (
 	// time between processing xinput output
-	SLEEP_TIME          = 3 * time.Second
+	SLEEP_TIME = 3 * time.Second
+
+	// Buffer that we read from xinput
 	KEYBOARD_BUFER_SIZE = 10000
-	DATABASE_NAME       = "file:gokeystat.db?cache=shared&mode=rwc"
-	CAPTURE_TIME        = 5 // time in seconds between capturing keyboard to db
+
+	// Database that stores keylog and other settings
+	DATABASE_NAME = "file:gokeystat.db?cache=shared&mode=rwc"
+
+	// time in seconds between capturing keyboard to db
+	CAPTURE_TIME = 5
 )
 
 // StatForTime stotres pressed keys and beginning time
diff --git a/saving.go b/saving.go
index d052997..646ba5d 100644
--- a/saving.go
+++ b/saving.go
@@ -8,7 +8,6 @@ import (
 	"io"
 	"log"
 	"os"
-	"sort"
 	"strconv"
 )
 
@@ -16,17 +15,15 @@ import (
 // if fullExport saves log for each key else only sum for keys
 func SaveToCsvWriter(data []StatForTime, keyMap map[uint8]string, writerOut io.Writer, fullExport bool) {
 
-	numKeysInt := make([]int, 0)
-	for key := range keyMap {
-		numKeysInt = append(numKeysInt, int(key))
-	}
-	sort.Ints(numKeysInt)
-	numKeys := make([]uint8, 0)
+	numKeysInt := GetKeyNumsFromKeyMap(keyMap)
+
+	var numKeys []uint8
 	for _, key := range numKeysInt {
 		numKeys = append(numKeys, uint8(key))
 	}
 
-	titleLine := make([]string, 0)
+	var titleLine []string
+
 	titleLine = append(titleLine, "Time")
 	if fullExport {
 		for _, key := range numKeys {
@@ -35,10 +32,11 @@ func SaveToCsvWriter(data []StatForTime, keyMap map[uint8]string, writerOut io.W
 	}
 	titleLine = append(titleLine, "Sum")
 
-	table := make([][]string, 0)
+	var table [][]string
+
 	table = append(table, titleLine)
 	for _, rec := range data {
-		line := make([]string, 0)
+		var line []string
 		line = append(line, strconv.Itoa(int(rec.time)))
 		var sum int
 		for _, key := range numKeys {