Mode NodeName to appropriate place

[nncp.git] / src / ctx.go

diff --git a/src/ctx.go b/src/ctx.go
index 8a1146e2b5651f44731cfe7de792ff3388c906a9..fb26185fbb3af9e4ee6024f8af805d1c2c2e7ee2 100644 (file)
--- a/src/ctx.go
+++ b/src/ctx.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
@@ -19,6 +19,7 @@ package nncp
 
 import (
        "errors"
+       "fmt"
        "io/ioutil"
        "log"
        "os"
@@ -39,10 +40,15 @@ type Ctx struct {
        LogPath    string
        UmaskForce *int
        Quiet      bool
+       ShowPrgrs  bool
+       HdrUsage   bool
        Debug      bool
        NotifyFile *FromToJSON
        NotifyFreq *FromToJSON
        NotifyExec map[string]*FromToJSON
+
+       MCDRxIfis []string
+       MCDTxIfis map[string]int
 }
 
 func (ctx *Ctx) FindNode(id string) (*Node, error) {
@@ -63,24 +69,34 @@ func (ctx *Ctx) FindNode(id string) (*Node, error) {
 
 func (ctx *Ctx) ensureRxDir(nodeId *NodeId) error {
        dirPath := filepath.Join(ctx.Spool, nodeId.String(), string(TRx))
+       logMsg := func(les LEs) string {
+               return fmt.Sprintf("Ensuring directory %s existence", dirPath)
+       }
        if err := os.MkdirAll(dirPath, os.FileMode(0777)); err != nil {
-               ctx.LogE("dir-ensure", SDS{"dir": dirPath, "err": err}, "")
+               ctx.LogE("dir-ensure-mkdir", LEs{{"Dir", dirPath}}, err, logMsg)
                return err
        }
        fd, err := os.Open(dirPath)
        if err != nil {
-               ctx.LogE("dir-ensure", SDS{"dir": dirPath, "err": err}, "")
+               ctx.LogE("dir-ensure-open", LEs{{"Dir", dirPath}}, err, logMsg)
                return err
        }
-       fd.Close()
-       return nil
+       return fd.Close()
 }
 
-func CtxFromCmdline(cfgPath, spoolPath, logPath string, quiet, debug bool) (*Ctx, error) {
+func CtxFromCmdline(
+       cfgPath,
+       spoolPath,
+       logPath string,
+       quiet, showPrgrs, omitPrgrs, debug bool,
+) (*Ctx, error) {
        env := os.Getenv(CfgPathEnv)
        if env != "" {
                cfgPath = env
        }
+       if showPrgrs && omitPrgrs {
+               return nil, errors.New("simultaneous -progress and -noprogress")
+       }
        cfgRaw, err := ioutil.ReadFile(cfgPath)
        if err != nil {
                return nil, err
@@ -105,6 +121,12 @@ func CtxFromCmdline(cfgPath, spoolPath, logPath string, quiet, debug bool) (*Ctx
        } else {
                ctx.LogPath = logPath
        }
+       if showPrgrs {
+               ctx.ShowPrgrs = true
+       }
+       if quiet || omitPrgrs {
+               ctx.ShowPrgrs = false
+       }
        ctx.Quiet = quiet
        ctx.Debug = debug
        return ctx, nil