/*
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
}
fd, err := TempFile(jobsPath, "")
if err == nil {
- ctx.LogD("tmp", SDS{"src": fd.Name()}, "created")
+ ctx.LogD("tmp", LEs{{"Src", fd.Name()}}, "created")
}
return fd, err
}
}
func (tmp *TmpFileWHash) Cancel() {
- tmp.Fd.Truncate(0)
- tmp.Fd.Close()
- os.Remove(tmp.Fd.Name())
+ tmp.Fd.Truncate(0) // #nosec G104
+ tmp.Fd.Close() // #nosec G104
+ os.Remove(tmp.Fd.Name()) // #nosec G104
+}
+
+func DirSync(dirPath string) error {
+ fd, err := os.Open(dirPath)
+ if err != nil {
+ return err
+ }
+ err = fd.Sync()
+ if err != nil {
+ fd.Close() // #nosec G104
+ return err
+ }
+ return fd.Close()
+}
+
+func (tmp *TmpFileWHash) Checksum() string {
+ return Base32Codec.EncodeToString(tmp.Hsh.Sum(nil))
}
func (tmp *TmpFileWHash) Commit(dir string) error {
return err
}
if err = tmp.W.Flush(); err != nil {
- tmp.Fd.Close()
+ tmp.Fd.Close() // #nosec G104
return err
}
if err = tmp.Fd.Sync(); err != nil {
- tmp.Fd.Close()
+ tmp.Fd.Close() // #nosec G104
+ return err
+ }
+ if err = tmp.Fd.Close(); err != nil {
+ return err
+ }
+ checksum := tmp.Checksum()
+ tmp.ctx.LogD("tmp", LEs{{"Src", tmp.Fd.Name()}, {"Dst", checksum}}, "commit")
+ if err = os.Rename(tmp.Fd.Name(), filepath.Join(dir, checksum)); err != nil {
return err
}
- tmp.Fd.Close()
- checksum := ToBase32(tmp.Hsh.Sum(nil))
- tmp.ctx.LogD("tmp", SDS{"src": tmp.Fd.Name(), "dst": checksum}, "commit")
- return os.Rename(tmp.Fd.Name(), filepath.Join(dir, checksum))
+ return DirSync(dir)
}