From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 29 Apr 2021 12:02:56 +0000 (+0300)
Subject: More simpler statusline cleaning
X-Git-Tag: v1.4.1^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=commitdiff_plain;h=b5a5c4fcfcc6fb214136a5cfafaa92d0e50c002a

More simpler statusline cleaning
---

diff --git a/doc/news.texi b/doc/news.texi
index 0c29352..36f6aa9 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -1,6 +1,13 @@
 @node News
 @unnumbered News
 
+@anchor{Release 1.4.1}
+@section Release 1.4.1
+@itemize
+@item
+    Even more simpler statusline cleaning function.
+@end itemize
+
 @anchor{Release 1.4.0}
 @section Release 1.4.0
 @itemize
diff --git a/log.go b/log.go
index f4248de..4d8a982 100644
--- a/log.go
+++ b/log.go
@@ -70,7 +70,6 @@ var (
 
 	LogMutex     sync.Mutex
 	KeyEraseLine string
-	LogWasStatus bool
 )
 
 func init() {
@@ -88,10 +87,10 @@ func init() {
 }
 
 func erasedStatus(s, end string) string {
-	if LogWasStatus {
-		s += KeyEraseLine
+	if NoProgress {
+		return s + end
 	}
-	return s + end
+	return s + KeyEraseLine + end
 }
 
 func trace(level, format string, args ...interface{}) {
@@ -101,10 +100,9 @@ func trace(level, format string, args ...interface{}) {
 	}
 	switch level {
 	case CNone:
-		p = StderrPrefix + p + fmt.Sprintf(format, args...)
+		p = erasedStatus(StderrPrefix+p+fmt.Sprintf(format, args...), "\n")
 		LogMutex.Lock()
-		os.Stderr.WriteString(erasedStatus(p, "\n"))
-		LogWasStatus = false
+		os.Stderr.WriteString(p)
 		LogMutex.Unlock()
 		return
 	case CDebug:
@@ -139,9 +137,9 @@ func trace(level, format string, args ...interface{}) {
 	}
 	msg := fmt.Sprintf(format, args...)
 	msg = StderrPrefix + colourize(level, p+strings.Repeat(". ", Level)+msg)
+	msg = erasedStatus(msg, "\n")
 	LogMutex.Lock()
-	os.Stderr.WriteString(erasedStatus(msg, "\n"))
-	LogWasStatus = false
+	os.Stderr.WriteString(msg)
 	LogMutex.Unlock()
 }
 
diff --git a/status.go b/status.go
index 7b45905..0852dbd 100644
--- a/status.go
+++ b/status.go
@@ -96,9 +96,9 @@ func statusInit() {
 					CJS, done, CReset,
 				)
 			}
+			out = erasedStatus(out, "\r")
 			LogMutex.Lock()
-			os.Stderr.WriteString(erasedStatus(out, "\r"))
-			LogWasStatus = true
+			os.Stderr.WriteString(out)
 			LogMutex.Unlock()
 		}
 	}()
diff --git a/usage.go b/usage.go
index 179eb15..81e954d 100644
--- a/usage.go
+++ b/usage.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	Version  = "1.4.0"
+	Version  = "1.4.1"
 	Warranty = `Copyright (C) 2020-2021 Sergey Matveev
 
 This program is free software: you can redistribute it and/or modify