X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fprogress.go;h=171f8e95878a4de603ae987784d52fa9e2fded25;hb=0ed43747344437800094782e78313b1c41c2cc1c;hp=62e0f01b6ff77bc44e3bb18a64ebb2d5c17281df;hpb=ae2b0d687a4ed40fe0161b79b4a9ec42290ffb6b;p=nncp.git diff --git a/src/progress.go b/src/progress.go index 62e0f01..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 +Copyright (C) 2016-2022 Sergey Matveev 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,24 +144,34 @@ 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 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() +}