Do not keep files opened

[nncp.git] / src / check.go

diff --git a/src/check.go b/src/check.go
index 127e8c93c841a29bcff69002082ca3608a45f863..b2ea671325d0a027b956e05286a0bda4dd36d6f3 100644 (file)
--- a/src/check.go
+++ b/src/check.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
@@ -23,16 +23,17 @@ import (
        "errors"
        "io"
        "log"
+       "os"
 
        "golang.org/x/crypto/blake2b"
 )
 
-func Check(src io.Reader, checksum []byte, sds SDS, showPrgrs bool) (bool, error) {
+func Check(src io.Reader, checksum []byte, les LEs, showPrgrs bool) (bool, error) {
        hsh, err := blake2b.New256(nil)
        if err != nil {
                log.Fatalln(err)
        }
-       if _, err = CopyProgressed(hsh, bufio.NewReader(src), "check", sds, showPrgrs); err != nil {
+       if _, err = CopyProgressed(hsh, bufio.NewReader(src), "check", les, showPrgrs); err != nil {
                return false, err
        }
        return bytes.Compare(hsh.Sum(nil), checksum) == 0, nil
@@ -41,21 +42,26 @@ func Check(src io.Reader, checksum []byte, sds SDS, showPrgrs bool) (bool, error
 func (ctx *Ctx) checkXxIsBad(nodeId *NodeId, xx TRxTx) bool {
        isBad := false
        for job := range ctx.Jobs(nodeId, xx) {
-               sds := SDS{
-                       "xx":       string(xx),
-                       "node":     nodeId,
-                       "pkt":      ToBase32(job.HshValue[:]),
-                       "fullsize": job.Size,
+               les := LEs{
+                       {"XX", string(xx)},
+                       {"Node", nodeId},
+                       {"Pkt", Base32Codec.EncodeToString(job.HshValue[:])},
+                       {"FullSize", job.Size},
                }
-               gut, err := Check(job.Fd, job.HshValue[:], sds, ctx.ShowPrgrs)
-               job.Fd.Close()
+               fd, err := os.Open(job.Path)
                if err != nil {
-                       ctx.LogE("check", sds, err, "")
+                       ctx.LogE("check", les, err, "")
+                       return true
+               }
+               gut, err := Check(fd, job.HshValue[:], les, ctx.ShowPrgrs)
+               fd.Close() // #nosec G104
+               if err != nil {
+                       ctx.LogE("check", les, err, "")
                        return true
                }
                if !gut {
                        isBad = true
-                       ctx.LogE("check", sds, errors.New("bad"), "")
+                       ctx.LogE("check", les, errors.New("bad"), "")
                }
        }
        return isBad