MTH

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

diff --git a/src/cmd/nncp-file/main.go b/src/cmd/nncp-file/main.go
index f3572ca04fc95f2b6a38aca6171324a92b9cfd71..6fbbdc9ab8166b0008c465e7e0eea849fa0389ea 100644 (file)
--- a/src/cmd/nncp-file/main.go
+++ b/src/cmd/nncp-file/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
@@ -25,7 +25,7 @@ import (
        "os"
        "strings"
 
-       "go.cypherpunks.ru/nncp/v5"
+       "go.cypherpunks.ru/nncp/v7"
 )
 
 func usage() {
@@ -36,7 +36,7 @@ func usage() {
        fmt.Fprint(os.Stderr, `
 If SRC equals to -, then read data from stdin to temporary file.
 
--minsize/-chunked take NODE's FreqMinSize/FreqChunked configuration
+-minsize/-chunked take NODE's freq.minsize/freq.chunked configuration
 options by default. You can forcefully turn them off by specifying 0 value.
 `)
 }
@@ -51,10 +51,13 @@ func main() {
                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 +77,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)
        }
@@ -108,26 +119,19 @@ func main() {
        } else if *argChunkSize > 0 {
                chunkSize = *argChunkSize * 1024
        }
-
        if chunkSize == 0 {
-               err = ctx.TxFile(
-                       node,
-                       nice,
-                       flag.Arg(0),
-                       splitted[1],
-                       minSize,
-               )
-       } else {
-               err = ctx.TxFileChunked(
-                       node,
-                       nice,
-                       flag.Arg(0),
-                       splitted[1],
-                       minSize,
-                       chunkSize,
-               )
+               chunkSize = nncp.MaxFileSize
        }
-       if err != nil {
+
+       if err = ctx.TxFile(
+               node,
+               nice,
+               flag.Arg(0),
+               splitted[1],
+               chunkSize,
+               minSize,
+               nncp.MaxFileSize,
+       ); err != nil {
                log.Fatalln(err)
        }
 }