Prefixed progress messages

diff --git a/VERSION b/VERSION
index 26d99a283f21aa125ccd146e50e76a9b643f54f1..03f488b076ae34efcfad44444186507b6415e8cc 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.2.1
+5.3.0

diff --git a/doc/install.texi b/doc/install.texi
index 1c8497e6f2ab6679a0d003e69e03d26779883849..da94047582e3941eda7d9e1f2f482321918bffb7 100644 (file)
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -1,7 +1,7 @@
 @node Installation
 @unnumbered Installation
 
-@set VERSION 5.2.1
+@set VERSION 5.3.0
 
 Possibly NNCP package already exists for your distribution:
 

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 2e5d927bdf90546a1bcd4194767b9b676a0c57c7..dc74fa1fdc0b6c08c9ac18633f5226c04cec0be7 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,15 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.3.0
+@subsection Релиз 5.3.0
+@itemize
+
+@item
+Сообщения прогресса содержат префикс, поясняющий выполняемое действие.
+
+@end itemize
+
 @node Релиз 5.2.1
 @subsection Релиз 5.2.1
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index 6cdc9981afaf2033bc48a0c4e0adde26e929ae03..894a2efe2e9b9ebc4d8b9da5d4b86f1d7d4315fe 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,15 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.3.0
+@section Release 5.3.0
+@itemize
+
+@item
+Progress messages contain prefix, describing the running action.
+
+@end itemize
+
 @node Release 5.2.1
 @section Release 5.2.1
 @itemize

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index 6dca46acaaf714e7a90180959966a44eb38c4fe5..3b5109ba60f467b98edf963586992ebc2e38cdcd 100644 (file)
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: head/net/nncp/Makefile 517819 2019-11-17 11:51:56Z dmgk $
 
 PORTNAME=      nncp
-DISTVERSION=   5.2.1
+DISTVERSION=   5.3.0
 CATEGORIES=    net
 MASTER_SITES=  http://www.nncpgo.org/download/
 

diff --git a/src/check.go b/src/check.go
index 4c1f542452420bda9a3446208c2dfc4b4a0a499c..127e8c93c841a29bcff69002082ca3608a45f863 100644 (file)
--- a/src/check.go
+++ b/src/check.go
@@ -32,7 +32,7 @@ func Check(src io.Reader, checksum []byte, sds SDS, showPrgrs bool) (bool, error
        if err != nil {
                log.Fatalln(err)
        }
-       if _, err = CopyProgressed(hsh, bufio.NewReader(src), sds, showPrgrs); err != nil {
+       if _, err = CopyProgressed(hsh, bufio.NewReader(src), "check", sds, showPrgrs); err != nil {
                return false, err
        }
        return bytes.Compare(hsh.Sum(nil), checksum) == 0, nil

diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go
index 0bca23f69c1ad5d502c05188ed416823b7079f91..f0fec55c61f357c554ff94a7bfcee9d02153f039 100644 (file)
--- a/src/cmd/nncp-bundle/main.go
+++ b/src/cmd/nncp-bundle/main.go
@@ -153,7 +153,7 @@ func main() {
                                        log.Fatalln("Error writing tar header:", err)
                                }
                                if _, err = nncp.CopyProgressed(
-                                       tarWr, job.Fd,
+                                       tarWr, job.Fd, "Tx",
                                        nncp.SdsAdd(sds, nncp.SDS{
                                                "pkt":      nncp.ToBase32(job.HshValue[:]),
                                                "fullsize": job.Size,
@@ -293,7 +293,7 @@ func main() {
                                        log.Fatalln("Error during writing:", err)
                                }
                                if _, err = nncp.CopyProgressed(
-                                       hsh, tarR,
+                                       hsh, tarR, "Rx",
                                        nncp.SdsAdd(sds, nncp.SDS{"fullsize": entry.Size}),
                                        ctx.ShowPrgrs,
                                ); err != nil {
@@ -341,7 +341,7 @@ func main() {
                                        if _, err = hsh.Write(pktEncBuf); err != nil {
                                                log.Fatalln("Error during writing:", err)
                                        }
-                                       if _, err = nncp.CopyProgressed(hsh, tarR, sds, ctx.ShowPrgrs); err != nil {
+                                       if _, err = nncp.CopyProgressed(hsh, tarR, "check", sds, ctx.ShowPrgrs); err != nil {
                                                log.Fatalln("Error during copying:", err)
                                        }
                                        if nncp.ToBase32(hsh.Sum(nil)) != pktName {
@@ -356,7 +356,7 @@ func main() {
                                        if _, err = tmp.W.Write(pktEncBuf); err != nil {
                                                log.Fatalln("Error during writing:", err)
                                        }
-                                       if _, err = nncp.CopyProgressed(tmp.W, tarR, sds, ctx.ShowPrgrs); err != nil {
+                                       if _, err = nncp.CopyProgressed(tmp.W, tarR, "check", sds, ctx.ShowPrgrs); err != nil {
                                                log.Fatalln("Error during copying:", err)
                                        }
                                        if err = tmp.W.Flush(); err != nil {
@@ -374,7 +374,7 @@ func main() {
                                }
                        } else {
                                if *dryRun {
-                                       if _, err = nncp.CopyProgressed(ioutil.Discard, tarR, sds, ctx.ShowPrgrs); err != nil {
+                                       if _, err = nncp.CopyProgressed(ioutil.Discard, tarR, "Rx", sds, ctx.ShowPrgrs); err != nil {
                                                log.Fatalln("Error during copying:", err)
                                        }
                                } else {
@@ -386,7 +386,7 @@ func main() {
                                        if _, err = bufTmp.Write(pktEncBuf); err != nil {
                                                log.Fatalln("Error during writing:", err)
                                        }
-                                       if _, err = nncp.CopyProgressed(bufTmp, tarR, sds, ctx.ShowPrgrs); err != nil {
+                                       if _, err = nncp.CopyProgressed(bufTmp, tarR, "Rx", sds, ctx.ShowPrgrs); err != nil {
                                                log.Fatalln("Error during copying:", err)
                                        }
                                        if err = bufTmp.Flush(); err != nil {

diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go
index 75aaf5a0aa06b036373e8aff2b10c9efc45b41ab..7d6e1c96965d2bc8c418921d6f30a7a717a7e836 100644 (file)
--- a/src/cmd/nncp-reass/main.go
+++ b/src/cmd/nncp-reass/main.go
@@ -144,10 +144,14 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
                if err != nil {
                        log.Fatalln(err)
                }
-               if _, err = nncp.CopyProgressed(hsh, bufio.NewReader(fd), nncp.SDS{
-                       "pkt":      chunkPath,
-                       "fullsize": fi.Size(),
-               }, ctx.ShowPrgrs); err != nil {
+               if _, err = nncp.CopyProgressed(
+                       hsh, bufio.NewReader(fd), "check",
+                       nncp.SDS{
+                               "pkt":      chunkPath,
+                               "fullsize": fi.Size(),
+                       },
+                       ctx.ShowPrgrs,
+               ); err != nil {
                        log.Fatalln(err)
                }
                fd.Close()
@@ -195,10 +199,14 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
                if err != nil {
                        log.Fatalln("Can not stat file:", err)
                }
-               if _, err = nncp.CopyProgressed(dstW, bufio.NewReader(fd), nncp.SDS{
-                       "pkt":      chunkPath,
-                       "fullsize": fi.Size(),
-               }, ctx.ShowPrgrs); err != nil {
+               if _, err = nncp.CopyProgressed(
+                       dstW, bufio.NewReader(fd), "reass",
+                       nncp.SDS{
+                               "pkt":      chunkPath,
+                               "fullsize": fi.Size(),
+                       },
+                       ctx.ShowPrgrs,
+               ); err != nil {
                        log.Fatalln(err)
                }
                fd.Close()

diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go
index df7acd3b9cc3f0b2b881f4f85073ff51ec40e2b7..bd00eb724db430ec8c0007e6360d14054326320c 100644 (file)
--- a/src/cmd/nncp-xfer/main.go
+++ b/src/cmd/nncp-xfer/main.go
@@ -215,10 +215,14 @@ func main() {
                                ctx.LogE("nncp-xfer", sds, err, "copy")
                                w.CloseWithError(err)
                        }()
-                       if _, err = nncp.CopyProgressed(tmp.W, r, nncp.SdsAdd(sds, nncp.SDS{
-                               "pkt":      filename,
-                               "fullsize": sds["size"],
-                       }), ctx.ShowPrgrs); err != nil {
+                       if _, err = nncp.CopyProgressed(
+                               tmp.W, r, "Rx",
+                               nncp.SdsAdd(sds, nncp.SDS{
+                                       "pkt":      filename,
+                                       "fullsize": sds["size"],
+                               }),
+                               ctx.ShowPrgrs,
+                       ); err != nil {
                                ctx.LogE("nncp-xfer", sds, err, "copy")
                                isBad = true
                        }
@@ -333,8 +337,7 @@ Tx:
                        ctx.LogD("nncp-xfer", sds, "created")
                        bufW := bufio.NewWriter(tmp)
                        copied, err := nncp.CopyProgressed(
-                               bufW,
-                               bufio.NewReader(job.Fd),
+                               bufW, bufio.NewReader(job.Fd), "Tx",
                                nncp.SdsAdd(sds, nncp.SDS{"fullsize": job.Size}),
                                ctx.ShowPrgrs,
                        )

diff --git a/src/progress.go b/src/progress.go
index d07185749dd812670e156fb1ff800444c2c3ad0d..4474cf5adfe200f0c95b8a3abb93dcc025b14c92 100644 (file)
--- a/src/progress.go
+++ b/src/progress.go
@@ -21,7 +21,6 @@ import (
        "fmt"
        "io"
        "os"
-       "strings"
        "sync"
        "time"
 
@@ -82,6 +81,7 @@ func (pb ProgressBar) Kill() {
 func CopyProgressed(
        dst io.Writer,
        src io.Reader,
+       prgrsPrefix string,
        sds SDS,
        showPrgrs bool,
 ) (written int64, err error) {
@@ -96,7 +96,7 @@ func CopyProgressed(
                                written += int64(nw)
                                if showPrgrs {
                                        sds["size"] = written
-                                       Progress(sds)
+                                       Progress(prgrsPrefix, sds)
                                }
                        }
                        if ew != nil {
@@ -118,13 +118,13 @@ func CopyProgressed(
        return
 }
 
-func Progress(sds SDS) {
-       pkt := sds["pkt"].(string)
+func Progress(prefix string, sds SDS) {
        var size int64
        if sizeI, exists := sds["size"]; exists {
                size = sizeI.(int64)
        }
        fullsize := sds["fullsize"].(int64)
+       pkt := sds["pkt"].(string)
        progressBarsLock.RLock()
        pb, exists := progressBars[pkt]
        progressBarsLock.RUnlock()
@@ -138,9 +138,7 @@ func Progress(sds SDS) {
        if len(what) >= 52 { // Base32 encoded
                what = what[:16] + ".." + what[len(what)-16:]
        }
-       if xx, exists := sds["xx"]; exists {
-               what = strings.Title(xx.(string)) + " " + what
-       }
+       what = prefix + " " + what
        pb.Render(what, size)
        if size >= fullsize {
                pb.Kill()

diff --git a/src/sp.go b/src/sp.go
index fa853b033779d971c5d3e35299961d7c36064964..64b154f8eda000de8b4a74f9a7b82f62e31b06c2 100644 (file)
--- a/src/sp.go
+++ b/src/sp.go
@@ -634,7 +634,7 @@ func (state *SPState) StartWorkers(
                                sdsp["size"] = int64(ourSize)
                                sdsp["fullsize"] = fullSize
                                if state.Ctx.ShowPrgrs {
-                                       Progress(sdsp)
+                                       Progress("Tx", sdsp)
                                }
                                state.Lock()
                                if len(state.queueTheir) > 0 && *state.queueTheir[0].freq.Hash == *freq.Hash {
@@ -878,7 +878,7 @@ func (state *SPState) ProcessSP(payload []byte) ([][]byte, error) {
                        sdsp["size"] = int64(ourSize)
                        sdsp["fullsize"] = int64(state.infosTheir[*file.Hash].Size)
                        if state.Ctx.ShowPrgrs {
-                               Progress(sdsp)
+                               Progress("Rx", sdsp)
                        }
                        if state.infosTheir[*file.Hash].Size != ourSize {
                                state.RUnlock()

diff --git a/src/toss.go b/src/toss.go
index 6abf278af8ab18cc61e785a80fb0c5565890bcca..67a7311569b41fc7f8f827dba140dddffb127821 100644 (file)
--- a/src/toss.go
+++ b/src/toss.go
@@ -224,8 +224,7 @@ func (ctx *Ctx) Toss(
                                ctx.LogD("rx", sds, "created")
                                bufW := bufio.NewWriter(tmp)
                                if _, err = CopyProgressed(
-                                       bufW,
-                                       pipeR,
+                                       bufW, pipeR, "Rx file",
                                        SdsAdd(sds, SDS{"fullsize": sds["size"]}),
                                        ctx.ShowPrgrs,
                                ); err != nil {

diff --git a/src/tx.go b/src/tx.go
index 67bb659a672426895919fcd5961633c75d455df9..1281841c32ea75a25e2e8491c534302e5a00795b 100644 (file)
--- a/src/tx.go
+++ b/src/tx.go
@@ -108,8 +108,8 @@ func (ctx *Ctx) Tx(
        }
        go func() {
                _, err := CopyProgressed(
-                       tmp.W, pipeR,
-                       SDS{"xx": string(TTx), "pkt": pktName, "fullsize": curSize},
+                       tmp.W, pipeR, "Tx",
+                       SDS{"pkt": pktName, "fullsize": curSize},
                        ctx.ShowPrgrs,
                )
                errs <- err
@@ -532,11 +532,11 @@ func (ctx *Ctx) TxTrns(node *Node, nice uint8, size int64, src io.Reader) error
        if err != nil {
                return err
        }
-       if _, err = CopyProgressed(tmp.W, src, SDS{
-               "xx":       string(TTx),
-               "pkt":      node.Id.String(),
-               "fullsize": size,
-       }, ctx.ShowPrgrs); err != nil {
+       if _, err = CopyProgressed(
+               tmp.W, src, "Tx trns",
+               SDS{"pkt": node.Id.String(), "fullsize": size},
+               ctx.ShowPrgrs,
+       ); err != nil {
                return err
        }
        nodePath := filepath.Join(ctx.Spool, node.Id.String())