Streamed NNCPE format

[nncp.git] / src / cmd / nncp-freq / main.go

diff --git a/src/cmd/nncp-freq/main.go b/src/cmd/nncp-freq/main.go
index 08adaf9c794932e50d68c193f31db24d10057ab2..78b565aff66346927539af07cf6476019774d603 100644 (file)
--- a/src/cmd/nncp-freq/main.go
+++ b/src/cmd/nncp-freq/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2021 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
@@ -24,10 +24,9 @@ import (
        "log"
        "os"
        "path/filepath"
-       "strconv"
        "strings"
 
-       "go.cypherpunks.ru/nncp/v5"
+       "go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -41,16 +40,19 @@ func main() {
        var (
                cfgPath      = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
                niceRaw      = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFreq), "Outbound packet niceness")
-               replyNiceRaw = flag.String("replynice", strconv.Itoa(nncp.DefaultNiceFile), "Reply file packet niceness")
+               replyNiceRaw = flag.String("replynice", nncp.NicenessFmt(nncp.DefaultNiceFile), "Reply file packet niceness")
                minSize      = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB")
                viaOverride  = flag.String("via", "", "Override Via path to destination node")
                spoolPath    = flag.String("spool", "", "Override path to spool")
                logPath      = flag.String("log", "", "Override path to logfile")
                quiet        = flag.Bool("quiet", false, "Print only errors")
+               showPrgrs    = flag.Bool("progress", false, "Force progress showing")
+               omitPrgrs    = flag.Bool("noprogress", false, "Omit progress showing")
                debug        = flag.Bool("debug", false, "Print debug messages")
                version      = flag.Bool("version", false, "Print version information")
                warranty     = flag.Bool("warranty", false, "Print warranty information")
        )
+       log.SetFlags(log.Lshortfile)
        flag.Usage = usage
        flag.Parse()
        if *warranty {
@@ -74,7 +76,15 @@ func main() {
                log.Fatalln(err)
        }
 
-       ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
+       ctx, err := nncp.CtxFromCmdline(
+               *cfgPath,
+               *spoolPath,
+               *logPath,
+               *quiet,
+               *showPrgrs,
+               *omitPrgrs,
+               *debug,
+       )
        if err != nil {
                log.Fatalln("Error during initialization:", err)
        }
@@ -93,6 +103,7 @@ func main() {
        }
 
        nncp.ViaOverride(*viaOverride, ctx, node)
+       ctx.Umask()
 
        var dst string
        if flag.NArg() == 2 {