added --silent and register values in windows registry keys
All checks were successful
/ test-on-windows (push) Successful in 20s
/ test-on-alpine (push) Successful in 4s

This commit is contained in:
partisan 2025-02-16 22:57:24 +01:00
parent 48473f98c5
commit ca57775f8f
7 changed files with 402 additions and 165 deletions

View file

@ -10,7 +10,7 @@ import (
"strings"
)
// DecompressPackage determines the package format and decompresses it
// DecompressPackage now passes UpdateProgress to decompressTarGz.
func DecompressPackage(downloadDir, packageName, arch, osName, pkgType, release, version string) (string, error) {
// 1) Construct the .tar.gz name
expectedFileName := fmt.Sprintf(
@ -35,7 +35,7 @@ func DecompressPackage(downloadDir, packageName, arch, osName, pkgType, release,
}
// 3) Decompress everything into `decompressDir`
if err := decompressTarGz(packagePath, decompressDir); err != nil {
if err := decompressTarGz(packagePath, decompressDir, UpdateProgress); err != nil {
return "", fmt.Errorf("failed to decompress: %w", err)
}
@ -43,14 +43,28 @@ func DecompressPackage(downloadDir, packageName, arch, osName, pkgType, release,
return decompressDir, nil
}
func decompressTarGz(srcFile, destDir string) error {
// decompressTarGz takes an additional updateProgress callback to report progress.
func decompressTarGz(srcFile, destDir string, updateProgress func(int, string)) error {
f, err := os.Open(srcFile)
if err != nil {
return err
}
defer f.Close()
gzr, err := gzip.NewReader(f)
fileInfo, err := f.Stat()
if err != nil {
return err
}
totalSize := fileInfo.Size()
// Wrap the file reader so we can track progress.
progressReader := &ProgressReader{
Reader: f,
Total: totalSize,
Callback: updateProgress,
}
gzr, err := gzip.NewReader(progressReader)
if err != nil {
return err
}
@ -73,6 +87,11 @@ func decompressTarGz(srcFile, destDir string) error {
return err
}
case tar.TypeReg:
outPath := filepath.Join(destDir, header.Name)
// Ensure the parent directory exists
if err := os.MkdirAll(filepath.Dir(outPath), 0755); err != nil {
return err
}
outFile, err := os.Create(outPath)
if err != nil {
return err
@ -83,8 +102,38 @@ func decompressTarGz(srcFile, destDir string) error {
return err
}
default:
// huh
// ignoring other types for now
}
// Update progress after extracting each file.
if updateProgress != nil {
percent := int((progressReader.BytesRead * 100) / totalSize)
updateProgress(percent, fmt.Sprintf("Extracted: %s", header.Name))
}
}
// Final update: extraction complete.
if updateProgress != nil {
updateProgress(100, "Extraction complete")
}
return nil
}
// ProgressReader wraps an io.Reader to count bytes and update progress.
type ProgressReader struct {
io.Reader
Total int64
BytesRead int64
Callback func(int, string)
}
func (pr *ProgressReader) Read(p []byte) (int, error) {
n, err := pr.Reader.Read(p)
pr.BytesRead += int64(n)
if pr.Callback != nil && pr.Total > 0 {
percent := int((pr.BytesRead * 100) / pr.Total)
pr.Callback(percent, "Decompressing...")
}
return n, err
}