lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

engine: resources: Display bytes copied when making a file

Browse Source
This commit is contained in:
James Shubin
2024-08-06 15:24:45 -04:00
parent 80178422db
commit 562eb643fc
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/resources/file.go
View File

@@ -550,11 +550,16 @@ func (obj *FileRes) fileCheckApply(ctx context.Context, apply bool, src io.ReadS
obj.init.Logf("fileCheckApply: %v -> %s", src, dst) obj.init.Logf("fileCheckApply: %v -> %s", src, dst)
} }
length := int64(-1)
srcFile, isFile := src.(*os.File) srcFile, isFile := src.(*os.File)
_, isBytes := src.(*bytes.Reader) // supports seeking! srcReader, isBytes := src.(*bytes.Reader) // supports seeking!
if !isFile && !isBytes { if !isFile && !isBytes {
return "", false, fmt.Errorf("can't open src as either file or buffer") return "", false, fmt.Errorf("can't open src as either file or buffer")
} }
if isBytes {
length = int64(srcReader.Len())
}
var srcStat os.FileInfo var srcStat os.FileInfo
if isFile { if isFile {
@@ -567,6 +572,8 @@ func (obj *FileRes) fileCheckApply(ctx context.Context, apply bool, src io.ReadS
if !srcStat.Mode().IsRegular() { // can't copy non-regular files or dirs if !srcStat.Mode().IsRegular() { // can't copy non-regular files or dirs
return "", false, fmt.Errorf("non-regular src file: %s (%q)", srcStat.Name(), srcStat.Mode()) return "", false, fmt.Errorf("non-regular src file: %s (%q)", srcStat.Name(), srcStat.Mode())
} }
length = srcStat.Size()
} }
dstFile, err := os.Open(dst) dstFile, err := os.Open(dst)
@@ -671,9 +678,12 @@ func (obj *FileRes) fileCheckApply(ctx context.Context, apply bool, src io.ReadS
// syscall.Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) // syscall.Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
// TODO: should we offer a way to cancel the copy on ^C ? // TODO: should we offer a way to cancel the copy on ^C ?
if obj.init.Debug { if isFile {
obj.init.Logf("copy: %v -> %s", src, dst) obj.init.Logf("copy %d bytes from: %v", length, src)
} else if isBytes {
obj.init.Logf("copy %d bytes", length)
} }
if n, err := io.Copy(dstFile, src); err != nil { if n, err := io.Copy(dstFile, src); err != nil {
return sha256sum, false, err return sha256sum, false, err
} else if obj.init.Debug { } else if obj.init.Debug {