Raise copyright years

[nncp.git] / src / progress.go

diff --git a/src/progress.go b/src/progress.go
index 546979a5d645b80133d19a1df676f71a9a69378f..171f8e95878a4de603ae987784d52fa9e2fded25 100644 (file)
--- a/src/progress.go
+++ b/src/progress.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2020 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 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
@@ -25,7 +25,7 @@ import (
        "time"
 
        "github.com/dustin/go-humanize"
-       "go.cypherpunks.ru/nncp/v5/uilive"
+       "go.cypherpunks.ru/nncp/v8/uilive"
 )
 
 func init() {
@@ -82,7 +82,7 @@ func CopyProgressed(
        dst io.Writer,
        src io.Reader,
        prgrsPrefix string,
-       sds SDS,
+       les LEs,
        showPrgrs bool,
 ) (written int64, err error) {
        buf := make([]byte, EncBlkSize)
@@ -95,8 +95,7 @@ func CopyProgressed(
                        if nw > 0 {
                                written += int64(nw)
                                if showPrgrs {
-                                       sds["size"] = written
-                                       Progress(prgrsPrefix, sds)
+                                       Progress(prgrsPrefix, append(les, LE{"Size", written}))
                                }
                        }
                        if ew != nil {
@@ -115,35 +114,64 @@ func CopyProgressed(
                        break
                }
        }
+       if showPrgrs {
+               for _, le := range les {
+                       if le.K == "FullSize" {
+                               if le.V.(int64) == 0 {
+                                       Progress(prgrsPrefix, append(
+                                               les, LE{"Size", written}, LE{"FullSize", written},
+                                       ))
+                               }
+                               break
+                       }
+               }
+       }
        return
 }
 
-func Progress(prefix string, sds SDS) {
+func Progress(prefix string, les LEs) {
        var size int64
-       if sizeI, exists := sds["size"]; exists {
-               size = sizeI.(int64)
+       var fullsize int64
+       var pkt string
+       for _, le := range les {
+               switch le.K {
+               case "Size":
+                       size = le.V.(int64)
+               case "FullSize":
+                       fullsize = le.V.(int64)
+               case "Pkt":
+                       pkt = le.V.(string)
+               }
        }
-       fullsize := sds["fullsize"].(int64)
-       pkt := sds["pkt"].(string)
        progressBarsLock.RLock()
-       pb, exists := progressBars[pkt]
+       pb := progressBars[pkt]
        progressBarsLock.RUnlock()
-       if !exists {
+       if pb == nil {
                progressBarsLock.Lock()
                pb = ProgressBarNew(size, fullsize)
                progressBars[pkt] = pb
                progressBarsLock.Unlock()
        }
        what := pkt
-       if len(what) >= 52 { // Base32 encoded
+       if len(what) >= Base32Encoded32Len { // Base32 encoded
                what = what[:16] + ".." + what[len(what)-16:]
        }
        what = prefix + " " + what
        pb.Render(what, size)
-       if size >= fullsize {
+       if fullsize != 0 && size >= fullsize {
                pb.Kill()
                progressBarsLock.Lock()
                delete(progressBars, pkt)
                progressBarsLock.Unlock()
        }
 }
+
+func ProgressKill(pkt string) {
+       progressBarsLock.Lock()
+       pb := progressBars[pkt]
+       if pb != nil {
+               pb.Kill()
+               delete(progressBars, pkt)
+       }
+       progressBarsLock.Unlock()
+}