Bundles feature

[nncp.git] / src / cypherpunks.ru / nncp / humanizer.go

diff --git a/src/cypherpunks.ru/nncp/humanizer.go b/src/cypherpunks.ru/nncp/humanizer.go
index 87a20c2f6032e2f9f8ac52ae6105b527a91df5d8..7830a31e764cccda52eab660aa38d958a81a9bf2 100644 (file)
--- a/src/cypherpunks.ru/nncp/humanizer.go
+++ b/src/cypherpunks.ru/nncp/humanizer.go
@@ -128,10 +128,10 @@ func (ctx *Ctx) Humanize(s string) string {
                        msg += ": " + err
                }
        case "check":
-               msg = fmt.Sprintf(
-                       "Integrity check: %s/%s/%s %s",
-                       sds["node"], sds["xx"], sds["pkt"], sds["err"],
-               )
+               msg = fmt.Sprintf("Checking: %s/%s/%s", sds["node"], sds["xx"], sds["pkt"])
+               if err, exists := sds["err"]; exists {
+                       msg += fmt.Sprintf(" %s", err)
+               }
        case "nncp-xfer":
                switch sds["xx"] {
                case "rx":
@@ -150,8 +150,25 @@ func (ctx *Ctx) Humanize(s string) string {
                if err, exists := sds["err"]; exists {
                        msg += ": " + err
                }
-       case "daemon":
-               msg = fmt.Sprintf("Daemon listening on %s", sds["bind"])
+       case "nncp-bundle":
+               switch sds["xx"] {
+               case "rx":
+                       msg = "Bundle transfer, received from"
+               case "tx":
+                       msg = "Bundle transfer, sent to"
+               default:
+                       return s
+               }
+               if nodeS != "" {
+                       msg += " node " + nodeS
+               }
+               msg += " " + sds["pkt"]
+               if size != "" {
+                       msg += fmt.Sprintf(" (%s)", size)
+               }
+               if err, exists := sds["err"]; exists {
+                       msg += ": " + err
+               }
        case "call-start":
                msg = fmt.Sprintf("Connected to %s", nodeS)
        case "call-finish":
@@ -220,6 +237,27 @@ func (ctx *Ctx) Humanize(s string) string {
                default:
                        return s
                }
+       case "nncp-reass":
+               chunkNum, exists := sds["chunk"]
+               if exists {
+                       msg = fmt.Sprintf(
+                               "Reassembling chunked file \"%s\" (chunk %s): %s",
+                               sds["path"],
+                               chunkNum,
+                               rem,
+                       )
+               } else {
+                       msg = fmt.Sprintf(
+                               "Reassembling chunked file \"%s\": %s",
+                               sds["path"],
+                               rem,
+                       )
+               }
+               if err, exists := sds["err"]; exists {
+                       msg += ": " + err
+               }
+       case "lockdir":
+               msg = fmt.Sprintf("Acquire lock for %s: %s", sds["path"], sds["err"])
        default:
                return s
        }