Merge branch 'develop'

[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 2be3ac21afe8b258f5d78218260fd3c56fa2b6e1..49b715a1c91f6c7c118196b0bf7e948c0aac4a02 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,6 @@ 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 "call-start":
                msg = fmt.Sprintf("Connected to %s", nodeS)
        case "call-finish":
@@ -190,9 +188,9 @@ func (ctx *Ctx) Humanize(s string) string {
        case "sp-file":
                switch sds["xx"] {
                case "rx":
-                       msg = "Got file "
+                       msg = "Got packet "
                case "tx":
-                       msg = "Sent file "
+                       msg = "Sent packet "
                default:
                        return s
                }
@@ -214,12 +212,31 @@ func (ctx *Ctx) Humanize(s string) string {
        case "sp-done":
                switch sds["xx"] {
                case "rx":
-                       msg = fmt.Sprintf("File %s is retreived (%s)", sds["hash"], size)
+                       msg = fmt.Sprintf("Packet %s is retreived (%s)", sds["hash"], size)
                case "tx":
-                       msg = fmt.Sprintf("File %s is sent", sds["hash"])
+                       msg = fmt.Sprintf("Packet %s is sent", sds["hash"])
                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
+               }
        default:
                return s
        }