[passthru] Improvements

essentialkaos · Jan 22, 2024 · e31a3e4 · e31a3e4
1 parent 231f969
commit e31a3e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/passthru/passthru.go b/passthru/passthru.go
@@ -100,17 +100,13 @@ func (r *Reader) Read(p []byte) (int, error) {
 
 	n, err := r.r.Read(p)
 
-	if err != nil {
-		return n, err
-	}
-
 	atomic.AddInt64(&r.current, int64(n))
 
-	if r.Update != nil {
+	if r.Update != nil && n > 0 {
 		r.Update(n)
 	}
 
-	return n, nil
+	return n, err
 }
 
 // Current returns read amount of data
@@ -195,17 +191,13 @@ func (w *Writer) Write(p []byte) (int, error) {
 
 	n, err := w.w.Write(p)
 
-	if err != nil {
-		return n, err
-	}
-
 	atomic.AddInt64(&w.current, int64(n))
 
-	if w.Update != nil {
+	if w.Update != nil && n > 0 {
 		w.Update(n)
 	}
 
-	return n, nil
+	return n, err
 }
 
 // Current returns written amount of data

diff --git a/passthru/passthru_spinner_test.go b/passthru/passthru_spinner_test.go
@@ -1,4 +1,4 @@
-package passthru
+package passthru_test
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 //                                                                                    //
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/essentialkaos/ek/v12/fmtutil"
+	"github.com/essentialkaos/ek/v12/passthru"
 	"github.com/essentialkaos/ek/v12/path"
 	"github.com/essentialkaos/ek/v12/req"
 	"github.com/essentialkaos/ek/v12/spinner"
@@ -22,7 +23,7 @@ import (
 type DLSpinner struct {
 	file       string
 	lastUpdate time.Time
-	reader     *Reader
+	reader     *passthru.Reader
 }
 
 func Example() {
@@ -47,7 +48,7 @@ func Example() {
 		return
 	}
 
-	r := NewReader(resp.Body, resp.ContentLength)
+	r := passthru.NewReader(resp.Body, resp.ContentLength)
 	s := &DLSpinner{file: filename, reader: r}
 	s.reader.Update = s.Update