import (
"bufio"
+ "errors"
"flag"
"fmt"
"io"
"log"
"os"
"path/filepath"
- "strconv"
xdr "github.com/davecgh/go-xdr/xdr2"
"go.cypherpunks.ru/nncp/v5"
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.Fatalln("-rx and -tx can not be set simultaneously")
}
- 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)
}
ctx.LogD("nncp-xfer", sds, "no dir")
goto Tx
}
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "stat")
+ ctx.LogE("nncp-xfer", sds, err, "stat")
isBad = true
goto Tx
}
dir, err = os.Open(selfPath)
if err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "open")
+ ctx.LogE("nncp-xfer", sds, err, "open")
isBad = true
goto Tx
}
fis, err = dir.Readdir(0)
dir.Close()
if err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "read")
+ ctx.LogE("nncp-xfer", sds, err, "read")
isBad = true
goto Tx
}
}
dir, err = os.Open(filepath.Join(selfPath, fi.Name()))
if err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "open")
+ ctx.LogE("nncp-xfer", sds, err, "open")
isBad = true
continue
}
fisInt, err := dir.Readdir(0)
dir.Close()
if err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "read")
+ ctx.LogE("nncp-xfer", sds, err, "read")
isBad = true
continue
}
if !fi.IsDir() {
continue
}
+ // Check that it is valid Base32 encoding
+ if _, err = nncp.NodeIdFromString(fiInt.Name()); err != nil {
+ continue
+ }
filename := filepath.Join(dir.Name(), fiInt.Name())
sds["file"] = filename
delete(sds, "size")
fd, err := os.Open(filename)
if err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "open")
+ ctx.LogE("nncp-xfer", sds, err, "open")
isBad = true
continue
}
fd.Close()
continue
}
- sds["size"] = strconv.FormatInt(fiInt.Size(), 10)
+ sds["size"] = fiInt.Size()
if !ctx.IsEnoughSpace(fiInt.Size()) {
- ctx.LogE("nncp-xfer", sds, "is not enough space")
+ ctx.LogE("nncp-xfer", sds, errors.New("is not enough space"), "")
fd.Close()
continue
}
if err != nil {
log.Fatalln(err)
}
- if _, err = io.CopyN(tmp.W, bufio.NewReader(fd), fiInt.Size()); err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "copy")
+ r, w := io.Pipe()
+ go func() {
+ _, err := io.CopyN(w, bufio.NewReader(fd), fiInt.Size())
+ if err == nil {
+ w.Close()
+ return
+ }
+ 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 {
+ ctx.LogE("nncp-xfer", sds, err, "copy")
isBad = true
- fd.Close()
+ }
+ fd.Close()
+ if isBad {
tmp.Cancel()
continue
}
- fd.Close()
if err = tmp.Commit(filepath.Join(
ctx.Spool,
nodeId.String(),
ctx.LogI("nncp-xfer", sds, "")
if !*keep {
if err = os.Remove(filename); err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "remove")
+ ctx.LogE("nncp-xfer", sds, err, "remove")
isBad = true
}
}
}
if err = os.Mkdir(nodePath, os.FileMode(0777)); err != nil {
ctx.UnlockDir(dirLock)
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "mkdir")
+ ctx.LogE("nncp-xfer", sds, err, "mkdir")
isBad = true
continue
}
} else {
ctx.UnlockDir(dirLock)
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "stat")
+ ctx.LogE("nncp-xfer", sds, err, "stat")
isBad = true
continue
}
if os.IsNotExist(err) {
if err = os.Mkdir(dstPath, os.FileMode(0777)); err != nil {
ctx.UnlockDir(dirLock)
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "mkdir")
+ ctx.LogE("nncp-xfer", sds, err, "mkdir")
isBad = true
continue
}
} else {
ctx.UnlockDir(dirLock)
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "stat")
+ ctx.LogE("nncp-xfer", sds, err, "stat")
isBad = true
continue
}
}
tmp, err := nncp.TempFile(dstPath, "xfer")
if err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "mktemp")
+ ctx.LogE("nncp-xfer", sds, err, "mktemp")
job.Fd.Close()
isBad = true
break
sds["tmp"] = tmp.Name()
ctx.LogD("nncp-xfer", sds, "created")
bufW := bufio.NewWriter(tmp)
- copied, err := io.Copy(bufW, bufio.NewReader(job.Fd))
+ copied, err := nncp.CopyProgressed(
+ bufW,
+ bufio.NewReader(job.Fd),
+ nncp.SdsAdd(sds, nncp.SDS{"fullsize": job.Size}),
+ ctx.ShowPrgrs,
+ )
job.Fd.Close()
if err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "copy")
+ ctx.LogE("nncp-xfer", sds, err, "copy")
tmp.Close()
isBad = true
continue
}
if err = bufW.Flush(); err != nil {
tmp.Close()
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "flush")
+ ctx.LogE("nncp-xfer", sds, err, "flush")
isBad = true
continue
}
if err = tmp.Sync(); err != nil {
tmp.Close()
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "sync")
+ ctx.LogE("nncp-xfer", sds, err, "sync")
isBad = true
continue
}
tmp.Close()
if err = os.Rename(tmp.Name(), filepath.Join(dstPath, pktName)); err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "rename")
+ ctx.LogE("nncp-xfer", sds, err, "rename")
isBad = true
continue
}
if err = nncp.DirSync(dstPath); err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "sync")
+ ctx.LogE("nncp-xfer", sds, err, "sync")
isBad = true
continue
}
os.Remove(filepath.Join(dstPath, pktName+".part"))
delete(sds, "tmp")
- ctx.LogI("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{
- "size": strconv.FormatInt(copied, 10),
- }), "")
+ ctx.LogI("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"size": copied}), "")
if !*keep {
if err = os.Remove(job.Fd.Name()); err != nil {
- ctx.LogE("nncp-xfer", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "remove")
+ ctx.LogE("nncp-xfer", sds, err, "remove")
isBad = true
}
}