X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fprogress.go;h=171f8e95878a4de603ae987784d52fa9e2fded25;hb=655146e4ee2bde72c9e8daa1361010fefe016df9;hp=ca1f361a09fbb4e63b26c6b13e72d8013a2d5595;hpb=16ac75d51758c249f5fc4e8fac9cf71b84331c55;p=nncp.git

diff --git a/src/progress.go b/src/progress.go
index ca1f361..171f8e9 100644
--- 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-2021 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() {
@@ -114,6 +114,18 @@ 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
 }
 
@@ -132,9 +144,9 @@ func Progress(prefix string, les LEs) {
 		}
 	}
 	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
@@ -146,10 +158,20 @@ func Progress(prefix string, les LEs) {
 	}
 	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()
+}