exec notification, freq.maxsize, paxed directories

[nncp.git] / src / tx.go

diff --git a/src/tx.go b/src/tx.go
index 4b7cb347cc992a3f4f4e58152671d61581bbe275..20853b0b27a3cd4a02eab6027a2081675bf6a11f 100644 (file)
--- a/src/tx.go
+++ b/src/tx.go
@@ -39,6 +39,8 @@ import (
 )
 
 const (
+       MaxFileSize = 1 << 62
+
        TarBlockSize = 512
        TarExt       = ".tar"
 )
@@ -279,58 +281,12 @@ func prepareTxFile(srcPath string) (reader io.Reader, closer io.Closer, fileSize
        return
 }
 
-func (ctx *Ctx) TxFile(node *Node, nice uint8, srcPath, dstPath string, minSize int64) error {
-       dstPathSpecified := false
-       if dstPath == "" {
-               if srcPath == "-" {
-                       return errors.New("Must provide destination filename")
-               }
-               dstPath = filepath.Base(srcPath)
-       } else {
-               dstPathSpecified = true
-       }
-       dstPath = filepath.Clean(dstPath)
-       if filepath.IsAbs(dstPath) {
-               return errors.New("Relative destination path required")
-       }
-       reader, closer, fileSize, archived, err := prepareTxFile(srcPath)
-       if closer != nil {
-               defer closer.Close()
-       }
-       if err != nil {
-               return err
-       }
-       if archived && !dstPathSpecified {
-               dstPath += TarExt
-       }
-       pkt, err := NewPkt(PktTypeFile, nice, []byte(dstPath))
-       if err != nil {
-               return err
-       }
-       _, err = ctx.Tx(node, pkt, nice, fileSize, minSize, reader)
-       sds := SDS{
-               "type": "file",
-               "node": node.Id,
-               "nice": strconv.Itoa(int(nice)),
-               "src":  srcPath,
-               "dst":  dstPath,
-               "size": strconv.FormatInt(fileSize, 10),
-       }
-       if err == nil {
-               ctx.LogI("tx", sds, "sent")
-       } else {
-               sds["err"] = err
-               ctx.LogE("tx", sds, "sent")
-       }
-       return err
-}
-
-func (ctx *Ctx) TxFileChunked(
+func (ctx *Ctx) TxFile(
        node *Node,
        nice uint8,
        srcPath, dstPath string,
-       minSize int64,
        chunkSize int64,
+       minSize, maxSize int64,
 ) error {
        dstPathSpecified := false
        if dstPath == "" {
@@ -352,6 +308,9 @@ func (ctx *Ctx) TxFileChunked(
        if err != nil {
                return err
        }
+       if fileSize > maxSize {
+               return errors.New("Too big than allowed")
+       }
        if archived && !dstPathSpecified {
                dstPath += TarExt
        }
@@ -373,8 +332,7 @@ func (ctx *Ctx) TxFileChunked(
                if err == nil {
                        ctx.LogI("tx", sds, "sent")
                } else {
-                       sds["err"] = err
-                       ctx.LogE("tx", sds, "sent")
+                       ctx.LogE("tx", SdsAdd(sds, SDS{"err": err}), "sent")
                }
                return err
        }
@@ -429,8 +387,7 @@ func (ctx *Ctx) TxFileChunked(
                if err == nil {
                        ctx.LogI("tx", sds, "sent")
                } else {
-                       sds["err"] = err
-                       ctx.LogE("tx", sds, "sent")
+                       ctx.LogE("tx", SdsAdd(sds, SDS{"err": err}), "sent")
                        return err
                }
                hsh.Sum(metaPkt.Checksums[chunkNum][:0])
@@ -463,8 +420,7 @@ func (ctx *Ctx) TxFileChunked(
        if err == nil {
                ctx.LogI("tx", sds, "sent")
        } else {
-               sds["err"] = err
-               ctx.LogE("tx", sds, "sent")
+               ctx.LogE("tx", SdsAdd(sds, SDS{"err": err}), "sent")
        }
        return err
 }
@@ -500,8 +456,7 @@ func (ctx *Ctx) TxFreq(
        if err == nil {
                ctx.LogI("tx", sds, "sent")
        } else {
-               sds["err"] = err
-               ctx.LogE("tx", sds, "sent")
+               ctx.LogE("tx", SdsAdd(sds, SDS{"err": err}), "sent")
        }
        return err
 }
@@ -549,8 +504,7 @@ func (ctx *Ctx) TxExec(
        if err == nil {
                ctx.LogI("tx", sds, "sent")
        } else {
-               sds["err"] = err
-               ctx.LogE("tx", sds, "sent")
+               ctx.LogE("tx", SdsAdd(sds, SDS{"err": err}), "sent")
        }
        return err
 }
@@ -565,7 +519,7 @@ func (ctx *Ctx) TxTrns(node *Node, nice uint8, size int64, src io.Reader) error
        ctx.LogD("tx", sds, "taken")
        if !ctx.IsEnoughSpace(size) {
                err := errors.New("is not enough space")
-               ctx.LogE("tx", sds, err.Error())
+               ctx.LogE("tx", SdsAdd(sds, SDS{"err": err}), err.Error())
                return err
        }
        tmp, err := ctx.NewTmpFileWHash()
@@ -580,8 +534,7 @@ func (ctx *Ctx) TxTrns(node *Node, nice uint8, size int64, src io.Reader) error
        if err == nil {
                ctx.LogI("tx", sds, "sent")
        } else {
-               sds["err"] = err
-               ctx.LogI("tx", sds, "sent")
+               ctx.LogI("tx", SdsAdd(sds, SDS{"err": err}), "sent")
        }
        os.Symlink(nodePath, filepath.Join(ctx.Spool, node.Name))
        return err