X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-rm%2Fmain.go;h=25110f82fc83e568787d847796e15375a6ada0e5;hb=99c6aa8d7e77b37c58d9dc0c8f3f8ed6a94352f5;hp=911db6370b35ffc0d84ae2deeed65ea889f67562;hpb=271870ad4f56253e0918f673b90615e4749cf201;p=nncp.git diff --git a/src/cmd/nncp-rm/main.go b/src/cmd/nncp-rm/main.go index 911db63..25110f8 100644 --- a/src/cmd/nncp-rm/main.go +++ b/src/cmd/nncp-rm/main.go @@ -1,6 +1,6 @@ /* NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2020 Sergey Matveev +Copyright (C) 2016-2021 Sergey Matveev 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 @@ -24,9 +24,12 @@ import ( "log" "os" "path/filepath" + "regexp" + "strconv" "strings" + "time" - "go.cypherpunks.ru/nncp/v5" + "go.cypherpunks.ru/nncp/v7" ) func usage() { @@ -34,10 +37,14 @@ func usage() { fmt.Fprintf(os.Stderr, "nncp-rm -- remove packet\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] -tmp\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] -lock\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] -node NODE -part\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] -node NODE -seen\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] -node NODE {-rx|-tx}\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] -node NODE -pkt PKT\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -part\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -seen\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -nock\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -hdr\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -area\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} {-rx|-tx}\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -pkt PKT\n", os.Args[0]) + fmt.Fprintln(os.Stderr, "-older option's time units are: (s)econds, (m)inutes, (h)ours, (d)ays") fmt.Fprintln(os.Stderr, "Options:") flag.PrintDefaults() } @@ -45,13 +52,19 @@ func usage() { func main() { var ( cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") + doAll = flag.Bool("all", false, "Apply remove rules to all nodes") doTmp = flag.Bool("tmp", false, "Remove all temporary files") + doHdr = flag.Bool("hdr", false, "Remove all hdr/ files") doLock = flag.Bool("lock", false, "Remove all lock files") nodeRaw = flag.String("node", "", "Node to remove files in") doRx = flag.Bool("rx", false, "Process received packets") doTx = flag.Bool("tx", false, "Process transfered packets") doPart = flag.Bool("part", false, "Remove only .part files") - doSeen = flag.Bool("seen", false, "Remove only .seen files") + doSeen = flag.Bool("seen", false, "Remove only seen/ files") + doNoCK = flag.Bool("nock", false, "Remove only .nock files") + doArea = flag.Bool("area", false, "Remove only area/* seen files") + older = flag.String("older", "", "XXX{smhd}: only older than XXX number of time units") + dryRun = flag.Bool("dryrun", false, "Do not actually remove files") pktRaw = flag.String("pkt", "", "Packet to remove") spoolPath = flag.String("spool", "", "Override path to spool") quiet = flag.Bool("quiet", false, "Print only errors") @@ -59,6 +72,7 @@ func main() { 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 { @@ -76,6 +90,31 @@ func main() { } ctx.Umask() + var oldBoundaryRaw int + if *older != "" { + olderRe := regexp.MustCompile(`^(\d+)([smhd])$`) + matches := olderRe.FindStringSubmatch(*older) + if len(matches) != 1+2 { + log.Fatalln("can not parse -older") + } + oldBoundaryRaw, err = strconv.Atoi(matches[1]) + if err != nil { + log.Fatalln("can not parse -older:", err) + } + switch matches[2] { + case "s": + break + case "m": + oldBoundaryRaw *= 60 + case "h": + oldBoundaryRaw *= 60 * 60 + case "d": + oldBoundaryRaw *= 60 * 60 * 24 + } + } + oldBoundary := time.Second * time.Duration(oldBoundaryRaw) + + now := time.Now() if *doTmp { err = filepath.Walk( filepath.Join(ctx.Spool, "tmp"), @@ -86,7 +125,18 @@ func main() { if info.IsDir() { return nil } - ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "") + if now.Sub(info.ModTime()) < oldBoundary { + ctx.LogD("rm-skip", nncp.LEs{{K: "File", V: path}}, func(les nncp.LEs) string { + return fmt.Sprintf("File %s: too fresh, skipping", path) + }) + return nil + } + ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, func(les nncp.LEs) string { + return fmt.Sprintf("File %s: removed", path) + }) + if *dryRun { + return nil + } return os.Remove(path) }) if err != nil { @@ -103,7 +153,12 @@ func main() { return nil } if strings.HasSuffix(info.Name(), ".lock") { - ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "") + ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, func(les nncp.LEs) string { + return fmt.Sprintf("File %s: removed", path) + }) + if *dryRun { + return nil + } return os.Remove(path) } return nil @@ -113,54 +168,172 @@ func main() { } return } + var nodeId *nncp.NodeId if *nodeRaw == "" { - usage() - os.Exit(1) - } - node, err := ctx.FindNode(*nodeRaw) - if err != nil { - log.Fatalln("Invalid -node specified:", err) + if !*doAll { + usage() + os.Exit(1) + } + } else { + node, err := ctx.FindNode(*nodeRaw) + if err != nil { + log.Fatalln("Invalid -node specified:", err) + } + nodeId = node.Id } - remove := func(xx nncp.TRxTx) error { - return filepath.Walk( - filepath.Join(ctx.Spool, node.Id.String(), string(xx)), - func(path string, info os.FileInfo, err error) error { - if err != nil { - return err - } - if info.IsDir() { - return nil - } - if *doSeen && strings.HasSuffix(info.Name(), nncp.SeenSuffix) { - ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "") - return os.Remove(path) - } - if *doPart && strings.HasSuffix(info.Name(), nncp.PartSuffix) { - ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "") - return os.Remove(path) - } - if *pktRaw != "" && filepath.Base(info.Name()) == *pktRaw { - ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "") - return os.Remove(path) - } - if !*doSeen && - !*doPart && - (*doRx || *doTx) && - ((*doRx && xx == nncp.TRx) || (*doTx && xx == nncp.TTx)) { - ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "") - return os.Remove(path) - } + for _, node := range ctx.Neigh { + if nodeId != nil && node.Id != nodeId { + continue + } + remove := func(xx nncp.TRxTx) error { + p := filepath.Join(ctx.Spool, node.Id.String(), string(xx)) + if _, err := os.Stat(p); err != nil && os.IsNotExist(err) { return nil - }) - } - if *pktRaw != "" || *doRx || *doSeen || *doPart { - if err = remove(nncp.TRx); err != nil { - log.Fatalln("Can not remove:", err) + } + return filepath.Walk(p, + func(path string, info os.FileInfo, err error) error { + if err != nil { + return err + } + if info.IsDir() { + return nil + } + logMsg := func(les nncp.LEs) string { + return fmt.Sprintf("File %s: removed", path) + } + if now.Sub(info.ModTime()) < oldBoundary { + ctx.LogD("rm-skip", nncp.LEs{{K: "File", V: path}}, func(les nncp.LEs) string { + return fmt.Sprintf("File %s: too fresh, skipping", path) + }) + return nil + } + if (*doNoCK && strings.HasSuffix(info.Name(), nncp.NoCKSuffix)) || + (*doPart && strings.HasSuffix(info.Name(), nncp.PartSuffix)) { + ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg) + if *dryRun { + return nil + } + return os.Remove(path) + } + if *pktRaw != "" && filepath.Base(info.Name()) == *pktRaw { + ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg) + if *dryRun { + return nil + } + return os.Remove(path) + } + if !*doSeen && !*doNoCK && !*doHdr && !*doPart && + (*doRx || *doTx) && + ((*doRx && xx == nncp.TRx) || (*doTx && xx == nncp.TTx)) { + ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg) + if *dryRun { + return nil + } + return os.Remove(path) + } + return nil + }) } - } - if *pktRaw != "" || *doTx { - if err = remove(nncp.TTx); err != nil { - log.Fatalln("Can not remove:", err) + if *pktRaw != "" || *doRx || *doNoCK || *doPart { + if err = remove(nncp.TRx); err != nil { + log.Fatalln("Can not remove:", err) + } + } + if *pktRaw != "" || *doTx || *doHdr { + if err = remove(nncp.TTx); err != nil { + log.Fatalln("Can not remove:", err) + } + } + removeSub := func(p string, everything bool) error { + return filepath.Walk( + p, func(path string, info os.FileInfo, err error) error { + if err != nil { + if os.IsNotExist(err) { + return nil + } + return err + } + if info.IsDir() { + return nil + } + logMsg := func(les nncp.LEs) string { + return fmt.Sprintf("File %s: removed", path) + } + if everything { + ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg) + if *dryRun { + return nil + } + return os.Remove(path) + } + if now.Sub(info.ModTime()) < oldBoundary { + ctx.LogD( + "rm-skip", nncp.LEs{{K: "File", V: path}}, + func(les nncp.LEs) string { + return fmt.Sprintf("File %s: too fresh, skipping", path) + }, + ) + } else if !*dryRun { + return os.Remove(path) + } + return nil + }, + ) + } + if *doRx || *doSeen { + if err = removeSub(filepath.Join( + ctx.Spool, node.Id.String(), string(nncp.TRx), nncp.SeenDir, + ), *doSeen); err != nil { + log.Fatalln("Can not remove:", err) + } + } + if *doRx || *doHdr { + if err = removeSub(filepath.Join( + ctx.Spool, node.Id.String(), string(nncp.TRx), nncp.HdrDir, + ), *doHdr); err != nil { + log.Fatalln("Can not remove:", err) + } + } + if *doTx || *doHdr { + if err = removeSub(filepath.Join( + ctx.Spool, node.Id.String(), string(nncp.TTx), nncp.HdrDir, + ), *doHdr); err != nil { + log.Fatalln("Can not remove:", err) + } + } + if *doArea { + if err = filepath.Walk( + filepath.Join(ctx.Spool, node.Id.String(), nncp.AreaDir), + func(path string, info os.FileInfo, err error) error { + if err != nil { + if os.IsNotExist(err) { + return nil + } + return err + } + if info.IsDir() { + return nil + } + if now.Sub(info.ModTime()) < oldBoundary { + ctx.LogD("rm-skip", nncp.LEs{{K: "File", V: path}}, func(les nncp.LEs) string { + return fmt.Sprintf("File %s: too fresh, skipping", path) + }) + return nil + } + ctx.LogI( + "rm", + nncp.LEs{{K: "File", V: path}}, + func(les nncp.LEs) string { + return fmt.Sprintf("File %s: removed", path) + }, + ) + if *dryRun { + return nil + } + return os.Remove(path) + }); err != nil { + log.Fatalln("Can not remove:", err) + } } } }