minor fixes to progress and text (#63)

* text: color: fix race condition while generating escape sequences
* progress: Tracker.ETA() should return remaining time (not total)

progress/tracker.go

@@ -32,7 +32,7 @@ func (t *Tracker) ETA() time.Duration {
 	}
 
 	timeTaken := time.Since(t.timeStart)
-	eta := time.Duration((int64(timeTaken) / int64(percDone)) * 100)
+	eta := time.Duration((int64(timeTaken) / int64(percDone)) * int64(100-percDone))
 	return eta
 }
 

progress/tracker_test.go

@@ -13,10 +13,10 @@ func TestTracker_ETA(t *testing.T) {
 
 	tracker.timeStart = time.Now()
 	time.Sleep(time.Millisecond * 100)
-	tracker.value = 10
+	tracker.value = 50
 	eta := tracker.ETA()
 	assert.NotEqual(t, time.Duration(0), eta)
-	assert.True(t, eta > time.Second)
+	assert.True(t, eta < time.Second)
 }
 
 func TestTracker_Increment(t *testing.T) {

text/color.go

@@ -117,10 +117,7 @@ type Colors []Color
 
 var (
 	// colorsSeqMap caches the escape sequence for a set of colors
-	colorsSeqMap = make(map[string]string)
-
-	// colorsSeqMapMutex should be used to lock writes to the map
-	colorsSeqMapMutex = sync.Mutex{}
+	colorsSeqMap = sync.Map{}
 )
 
 // GetEscapeSeq returns the ANSI escape sequence for the colors set.
@@ -129,18 +126,16 @@ func (c Colors) GetEscapeSeq() string {
 		return ""
 	}
 	colorsKey := fmt.Sprintf("%#v", c)
-	escapeSeq := colorsSeqMap[colorsKey]
-	if escapeSeq == "" {
+	escapeSeq, ok := colorsSeqMap.Load(colorsKey)
+	if !ok || escapeSeq == "" {
 		colorNums := make([]string, len(c))
 		for idx, c := range c {
 			colorNums[idx] = strconv.Itoa(int(c))
 		}
 		escapeSeq = EscapeStart + strings.Join(colorNums, ";") + EscapeStop
-		colorsSeqMapMutex.Lock()
-		colorsSeqMap[colorsKey] = escapeSeq
-		colorsSeqMapMutex.Unlock()
+		colorsSeqMap.Store(colorsKey, escapeSeq)
 	}
-	return escapeSeq
+	return escapeSeq.(string)
 }
 
 // Sprint colorizes and prints the given string(s).