From ce4a214761c58d9a58eefcd2c1e6def6d6a9170c Mon Sep 17 00:00:00 2001
From: Keepers <ryanfkeepers@gmail.com>
Date: Tue, 22 Nov 2022 13:35:18 -0700
Subject: [PATCH] observe always hides when told (#1578)

## Description

Fixes a bug where not all observer progress bars
were staying hidden if the 'hide' configuration
was flagged.

## Type of change

- [x] :bug: Bugfix

## Issue(s)

* fixes https://github.com/alcionai/corso/issues/1569

## Test Plan

- [x] :muscle: Manual
---
 src/internal/observe/observe.go | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/internal/observe/observe.go b/src/internal/observe/observe.go
index 374b205d5..b91562efb 100644
--- a/src/internal/observe/observe.go
+++ b/src/internal/observe/observe.go
@@ -76,6 +76,10 @@ type config struct {
 	doNotDisplay bool
 }
 
+func (c config) hidden() bool {
+	return c.doNotDisplay || writer == nil
+}
+
 // SeedWriter adds default writer to the observe package.
 // Uses a noop writer until seeded.
 func SeedWriter(ctx context.Context, w io.Writer, hide bool) {
@@ -118,7 +122,7 @@ const (
 
 // Message is used to display a progress message
 func Message(message string) {
-	if writer == nil {
+	if cfg.hidden() {
 		return
 	}
 
@@ -143,7 +147,7 @@ func Message(message string) {
 func MessageWithCompletion(message string) (chan<- struct{}, func()) {
 	completionCh := make(chan struct{}, 1)
 
-	if writer == nil {
+	if cfg.hidden() {
 		return completionCh, func() {}
 	}
 
@@ -185,7 +189,7 @@ func MessageWithCompletion(message string) (chan<- struct{}, func()) {
 // read through the provided readcloser, up until the byte count matches
 // the totalBytes.
 func ItemProgress(rc io.ReadCloser, header, iname string, totalBytes int64) (io.ReadCloser, func()) {
-	if cfg.doNotDisplay || writer == nil || rc == nil || totalBytes == 0 {
+	if cfg.hidden() || rc == nil || totalBytes == 0 {
 		return rc, func() {}
 	}
 
@@ -213,7 +217,7 @@ func ItemProgress(rc io.ReadCloser, header, iname string, totalBytes int64) (io.
 func ProgressWithCount(header, message string, count int64) (chan<- struct{}, func()) {
 	progressCh := make(chan struct{})
 
-	if cfg.doNotDisplay || writer == nil {
+	if cfg.hidden() {
 		go func(ci <-chan struct{}) {
 			for {
 				_, ok := <-ci
@@ -298,7 +302,7 @@ func makeSpinFrames(barWidth int) {
 // incrementing the count of items handled.  Each write to the provided channel
 // counts as a single increment.  The caller is expected to close the channel.
 func CollectionProgress(user, category, dirName string) (chan<- struct{}, func()) {
-	if cfg.doNotDisplay || writer == nil || len(user) == 0 || len(dirName) == 0 {
+	if cfg.hidden() || len(user) == 0 || len(dirName) == 0 {
 		ch := make(chan struct{})
 
 		go func(ci <-chan struct{}) {