X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-reass%2Fmain.go;h=0882d285c597262f637e7b9bbc3c6d53f44da201;hb=0367cce2741e1ce6a89a49fd5c4e9df6005c9744;hp=7ca8db871339230addc337fc22b32c32491102d0;hpb=0139e8deda4112d2c3dcd52e0ad72162e54caa03;p=nncp.git

diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go
index 7ca8db8..0882d28 100644
--- a/src/cmd/nncp-reass/main.go
+++ b/src/cmd/nncp-reass/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-2022 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
@@ -22,6 +22,7 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/hex"
+	"errors"
 	"flag"
 	"fmt"
 	"hash"
@@ -32,10 +33,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/davecgh/go-xdr/xdr2"
+	xdr "github.com/davecgh/go-xdr/xdr2"
 	"github.com/dustin/go-humanize"
-	"go.cypherpunks.ru/nncp/v5"
-	"golang.org/x/crypto/blake2b"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -56,22 +56,29 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 		log.Fatalln("Can not open file:", err)
 	}
 	var metaPkt nncp.ChunkedMeta
+	les := nncp.LEs{{K: "Path", V: path}}
+	logMsg := func(les nncp.LEs) string {
+		return fmt.Sprintf("Reassembling chunked file \"%s\"", path)
+	}
 	if _, err = xdr.Unmarshal(fd, &metaPkt); err != nil {
-		ctx.LogE("nncp-reass", nncp.SDS{"path": path, "err": err}, "bad meta file")
+		ctx.LogE("reass-bad-meta", les, err, func(les nncp.LEs) string {
+			return logMsg(les) + ": bad meta"
+		})
 		return false
 	}
 	fd.Close()
-	if metaPkt.Magic != nncp.MagicNNCPMv1 {
-		ctx.LogE("nncp-reass", nncp.SDS{"path": path, "err": nncp.BadMagic}, "")
+	if metaPkt.Magic == nncp.MagicNNCPMv1.B {
+		ctx.LogE("reass", les, nncp.MagicNNCPMv1.TooOld(), logMsg)
+		return false
+	}
+	if metaPkt.Magic != nncp.MagicNNCPMv2.B {
+		ctx.LogE("reass", les, nncp.BadMagic, logMsg)
 		return false
 	}
 
 	metaName := filepath.Base(path)
 	if !strings.HasSuffix(metaName, nncp.ChunkedSuffixMeta) {
-		ctx.LogE("nncp-reass", nncp.SDS{
-			"path": path,
-			"err":  "invalid filename suffix",
-		}, "")
+		ctx.LogE("reass", les, errors.New("invalid filename suffix"), logMsg)
 		return false
 	}
 	mainName := strings.TrimSuffix(metaName, nncp.ChunkedSuffixMeta)
@@ -107,11 +114,11 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 	allChunksExist := true
 	for chunkNum, chunkPath := range chunksPaths {
 		fi, err := os.Stat(chunkPath)
+		lesChunk := append(les, nncp.LE{K: "Chunk", V: chunkNum})
 		if err != nil && os.IsNotExist(err) {
-			ctx.LogI("nncp-reass", nncp.SDS{
-				"path":  path,
-				"chunk": strconv.Itoa(chunkNum),
-			}, "missing")
+			ctx.LogI("reass-chunk-miss", lesChunk, func(les nncp.LEs) string {
+				return fmt.Sprintf("%s: chunk %d missing", logMsg(les), chunkNum)
+			})
 			allChunksExist = false
 			continue
 		}
@@ -122,10 +129,14 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 			badSize = uint64(fi.Size()) != metaPkt.ChunkSize
 		}
 		if badSize {
-			ctx.LogE("nncp-reass", nncp.SDS{
-				"path":  path,
-				"chunk": strconv.Itoa(chunkNum),
-			}, "invalid size")
+			ctx.LogE(
+				"reass-chunk",
+				lesChunk,
+				errors.New("invalid size"),
+				func(les nncp.LEs) string {
+					return fmt.Sprintf("%s: chunk %d", logMsg(les), chunkNum)
+				},
+			)
 			allChunksExist = false
 		}
 	}
@@ -140,19 +151,28 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 		if err != nil {
 			log.Fatalln("Can not open file:", err)
 		}
-		hsh, err = blake2b.New256(nil)
+		fi, err := fd.Stat()
 		if err != nil {
-			log.Fatalln(err)
+			log.Fatalln("Can not stat file:", err)
 		}
-		if _, err = io.Copy(hsh, bufio.NewReader(fd)); err != nil {
+		hsh = nncp.MTHNew(fi.Size(), 0)
+		if _, err = nncp.CopyProgressed(
+			hsh, bufio.NewReader(fd), "check",
+			nncp.LEs{{K: "Pkt", V: chunkPath}, {K: "FullSize", V: fi.Size()}},
+			ctx.ShowPrgrs,
+		); err != nil {
 			log.Fatalln(err)
 		}
 		fd.Close()
 		if bytes.Compare(hsh.Sum(nil), metaPkt.Checksums[chunkNum][:]) != 0 {
-			ctx.LogE("nncp-reass", nncp.SDS{
-				"path":  path,
-				"chunk": strconv.Itoa(chunkNum),
-			}, "checksum is bad")
+			ctx.LogE(
+				"reass-chunk",
+				nncp.LEs{{K: "Path", V: path}, {K: "Chunk", V: chunkNum}},
+				errors.New("checksum is bad"),
+				func(les nncp.LEs) string {
+					return fmt.Sprintf("%s: chunk %d", logMsg(les), chunkNum)
+				},
+			)
 			allChecksumsGood = false
 		}
 	}
@@ -160,23 +180,24 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 		return false
 	}
 	if dryRun {
-		ctx.LogI("nncp-reass", nncp.SDS{"path": path}, "ready")
+		ctx.LogI("reass", nncp.LEs{{K: "path", V: path}}, logMsg)
 		return true
 	}
 
 	var dst io.Writer
 	var tmp *os.File
-	var sds nncp.SDS
 	if stdout {
 		dst = os.Stdout
-		sds = nncp.SDS{"path": path}
+		les = nncp.LEs{{K: "path", V: path}}
 	} else {
 		tmp, err = nncp.TempFile(mainDir, "reass")
 		if err != nil {
 			log.Fatalln(err)
 		}
-		sds = nncp.SDS{"path": path, "tmp": tmp.Name()}
-		ctx.LogD("nncp-reass", sds, "created")
+		les = nncp.LEs{{K: "path", V: path}, {K: "Tmp", V: tmp.Name()}}
+		ctx.LogD("reass-tmp-created", les, func(les nncp.LEs) string {
+			return fmt.Sprintf("%s: temporary %s created", logMsg(les), tmp.Name())
+		})
 		dst = tmp
 	}
 	dstW := bufio.NewWriter(dst)
@@ -187,16 +208,27 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 		if err != nil {
 			log.Fatalln("Can not open file:", err)
 		}
-		if _, err = io.Copy(dstW, bufio.NewReader(fd)); err != nil {
+		fi, err := fd.Stat()
+		if err != nil {
+			log.Fatalln("Can not stat file:", err)
+		}
+		if _, err = nncp.CopyProgressed(
+			dstW, bufio.NewReader(fd), "reass",
+			nncp.LEs{{K: "Pkt", V: chunkPath}, {K: "FullSize", V: fi.Size()}},
+			ctx.ShowPrgrs,
+		); err != nil {
 			log.Fatalln(err)
 		}
 		fd.Close()
 		if !keep {
 			if err = os.Remove(chunkPath); err != nil {
-				ctx.LogE("nncp-reass", nncp.SdsAdd(sds, nncp.SDS{
-					"chunk": strconv.Itoa(chunkNum),
-					"err":   err,
-				}), "")
+				ctx.LogE(
+					"reass-chunk",
+					append(les, nncp.LE{K: "Chunk", V: chunkNum}), err,
+					func(les nncp.LEs) string {
+						return fmt.Sprintf("%s: chunk %d", logMsg(les), chunkNum)
+					},
+				)
 				hasErrors = true
 			}
 		}
@@ -208,17 +240,25 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 		if err = tmp.Sync(); err != nil {
 			log.Fatalln("Can not sync:", err)
 		}
-		tmp.Close()
+		if err = tmp.Close(); err != nil {
+			log.Fatalln("Can not close:", err)
+		}
 	}
-	ctx.LogD("nncp-reass", sds, "written")
+	ctx.LogD("reass-written", les, func(les nncp.LEs) string {
+		return logMsg(les) + ": written"
+	})
 	if !keep {
 		if err = os.Remove(path); err != nil {
-			ctx.LogE("nncp-reass", nncp.SdsAdd(sds, nncp.SDS{"err": err}), "")
+			ctx.LogE("reass-removing", les, err, func(les nncp.LEs) string {
+				return logMsg(les) + ": removing"
+			})
 			hasErrors = true
 		}
 	}
 	if stdout {
-		ctx.LogI("nncp-reass", nncp.SDS{"path": path}, "done")
+		ctx.LogI("reass", nncp.LEs{{K: "Path", V: path}}, func(les nncp.LEs) string {
+			return logMsg(les) + ": done"
+		})
 		return !hasErrors
 	}
 
@@ -238,21 +278,29 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 	if err = os.Rename(tmp.Name(), dstPath); err != nil {
 		log.Fatalln(err)
 	}
-	ctx.LogI("nncp-reass", nncp.SDS{"path": path}, "done")
+	if err = nncp.DirSync(mainDir); err != nil {
+		log.Fatalln(err)
+	}
+	ctx.LogI("reass", nncp.LEs{{K: "Path", V: path}}, func(les nncp.LEs) string {
+		return logMsg(les) + ": done"
+	})
 	return !hasErrors
 }
 
 func findMetas(ctx *nncp.Ctx, dirPath string) []string {
 	dir, err := os.Open(dirPath)
 	defer dir.Close()
+	logMsg := func(les nncp.LEs) string {
+		return "Finding .meta in " + dirPath
+	}
 	if err != nil {
-		ctx.LogE("nncp-reass", nncp.SDS{"path": dirPath, "err": err}, "")
+		ctx.LogE("reass", nncp.LEs{{K: "Path", V: dirPath}}, err, logMsg)
 		return nil
 	}
 	fis, err := dir.Readdir(0)
 	dir.Close()
 	if err != nil {
-		ctx.LogE("nncp-reass", nncp.SDS{"path": dirPath, "err": err}, "")
+		ctx.LogE("reass", nncp.LEs{{K: "Path", V: dirPath}}, err, logMsg)
 		return nil
 	}
 	metaPaths := make([]string, 0)
@@ -276,10 +324,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 {
@@ -291,7 +342,15 @@ func main() {
 		return
 	}
 
-	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)
 	}
@@ -317,6 +376,8 @@ func main() {
 		os.Exit(1)
 	}
 
+	ctx.Umask()
+
 	if flag.NArg() > 0 {
 		if process(ctx, flag.Arg(0), *keep, *dryRun, *stdout, *dumpMeta) {
 			return