isModified check must only look at ifchanges

[goredo.git] / status.go

diff --git a/status.go b/status.go
index f203b7411202d86c3ae52d13ab49db9115f9bc29..d6f7c0d4f9898270ca3df148584415a802b49a8b 100644 (file)
--- a/status.go
+++ b/status.go
@@ -1,6 +1,6 @@
 /*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020 Sergey Matveev <stargrave@stargrave.org>
+goredo -- djb's redo implementation on pure Go
+Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
 
 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
@@ -20,8 +20,8 @@ package main
 import (
        "flag"
        "fmt"
+       "log"
        "os"
-       "strings"
 )
 
 const (
@@ -37,11 +37,19 @@ const (
 var (
        FdStatus *os.File
 
-       flagNoStatus = flag.Bool("no-status", false, "disable statusline (REDO_NO_STATUS=1)")
+       flagNoStatus *bool
 )
 
+func init() {
+       cmdName := CmdName()
+       if !(cmdName == CmdNameRedo || cmdName == CmdNameRedoIfchange) {
+               return
+       }
+       flagNoStatus = flag.Bool("no-status", false, "disable statusline (REDO_NO_STATUS=1)")
+}
+
 func statusInit() {
-       if *flagNoStatus {
+       if NoProgress || *flagNoStatus {
                return
        }
        if v := os.Getenv(EnvNoStatus); v == "1" {
@@ -58,14 +66,13 @@ func statusInit() {
        var err error
        r, FdStatus, err = os.Pipe()
        if err != nil {
-               panic(err)
+               log.Fatalln(err)
        }
        go func() {
                running := 0
                waiting := 0
                done := 0
                var out string
-               outLenPrev := 0
                buf := make([]byte, 1)
                var n int
                for {
@@ -86,23 +93,18 @@ func statusInit() {
                        }
                        if NoColor {
                                out = fmt.Sprintf(
-                                       "\rrun: %d wait: %d done: %d\r",
+                                       "\rrun: %d wait: %d done: %d",
                                        running, waiting, done,
                                )
                        } else {
                                out = fmt.Sprintf(
-                                       "\rrun: %s%d%s wait: %s%d%s done: %s%d%s\r",
+                                       "\rrun: %s%d%s wait: %s%d%s done: %s%d%s",
                                        CRedo, running, CReset,
                                        CWait, waiting, CReset,
                                        CJS, done, CReset,
                                )
                        }
-                       if len(out) < outLenPrev {
-                               outLenPrev = len(out)
-                               out += strings.Repeat(" ", outLenPrev-len(out))
-                       } else {
-                               outLenPrev = len(out)
-                       }
+                       out = erasedStatus(out, "\r")
                        LogMutex.Lock()
                        os.Stderr.WriteString(out)
                        LogMutex.Unlock()