mirror of
https://github.com/Mikescher/kpsync.git
synced 2025-08-25 16:38:06 +02:00
Fix missing colors in fifo
This commit is contained in:
parent
da9f6e6dbe
commit
675cead3c6
@ -60,10 +60,12 @@ func (app *Application) LogDebug(msg string) {
|
|||||||
app.logInternal("[D]", msg, termext.Gray)
|
app.logInternal("[D]", msg, termext.Gray)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (app *Application) logInternal(pf string, msg string, c func(_ string) string) {
|
func (app *Application) logInternal(pf string, msg string, cf func(_ string) string) {
|
||||||
app.logLock.Lock()
|
app.logLock.Lock()
|
||||||
defer app.logLock.Unlock()
|
defer app.logLock.Unlock()
|
||||||
|
|
||||||
|
c := cf
|
||||||
|
|
||||||
if !termext.SupportsColors() && !app.config.ForceColors {
|
if !termext.SupportsColors() && !app.config.ForceColors {
|
||||||
c = func(s string) string { return s }
|
c = func(s string) string { return s }
|
||||||
}
|
}
|
||||||
@ -71,24 +73,24 @@ func (app *Application) logInternal(pf string, msg string, c func(_ string) stri
|
|||||||
for i, s := range strings.Split(msg, "\n") {
|
for i, s := range strings.Split(msg, "\n") {
|
||||||
if i == 0 {
|
if i == 0 {
|
||||||
println(c(pf + " " + s))
|
println(c(pf + " " + s))
|
||||||
app.logList = append(app.logList, LogMessage{i, pf, s, c})
|
app.logList = append(app.logList, LogMessage{i, pf, s, cf})
|
||||||
if app.logFile != nil {
|
if app.logFile != nil {
|
||||||
_, err := app.logFile.WriteString(pf + " " + s + "\n")
|
_, err := app.logFile.WriteString(pf + " " + s + "\n")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
app.fallbackLog("[!] Failed to write logfile: " + err.Error())
|
app.fallbackLog("[!] Failed to write logfile: " + err.Error())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
app.logBroadcaster.Publish("", LogMessage{i, pf, s, c})
|
app.logBroadcaster.Publish("", LogMessage{i, pf, s, cf})
|
||||||
} else {
|
} else {
|
||||||
println(c(langext.StrRepeat(" ", len(pf)+1) + s))
|
println(c(langext.StrRepeat(" ", len(pf)+1) + s))
|
||||||
app.logList = append(app.logList, LogMessage{i, pf, s, c})
|
app.logList = append(app.logList, LogMessage{i, pf, s, cf})
|
||||||
if app.logFile != nil {
|
if app.logFile != nil {
|
||||||
_, err := app.logFile.WriteString(langext.StrRepeat(" ", len(pf)+1) + s + "\n")
|
_, err := app.logFile.WriteString(langext.StrRepeat(" ", len(pf)+1) + s + "\n")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
app.fallbackLog("[!] Failed to write logfile: " + err.Error())
|
app.fallbackLog("[!] Failed to write logfile: " + err.Error())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
app.logBroadcaster.Publish("", LogMessage{i, pf, s, c})
|
app.logBroadcaster.Publish("", LogMessage{i, pf, s, cf})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user