nixos-contrib/ficsit-cli-flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

fix: always close file after hashing (#53)

Browse source
This commit is contained in:
Vilsol 2023-12-29 07:15:18 -08:00 committed by GitHub
parent e313efdfec
commit da61008e32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
cli/cache/download.go vendored
View file

@ -143,22 +143,12 @@ func DownloadOrCache(cacheKey string, hash string, url string, updates chan<- ut
func downloadInternal(cacheKey string, location string, hash string, url string, updates chan<- utils.GenericProgress, downloadSemaphore chan int) (int64, error) { func downloadInternal(cacheKey string, location string, hash string, url string, updates chan<- utils.GenericProgress, downloadSemaphore chan int) (int64, error) {
stat, err := os.Stat(location) stat, err := os.Stat(location)
if err == nil { if err == nil {
existingHash := "" matches, err := compareHash(hash, location)
if hash != "" {
f, err := os.Open(location)
if err != nil { if err != nil {
return 0, fmt.Errorf("failed to open file: %s: %w", location, err) return 0, err
}
defer f.Close()
existingHash, err = utils.SHA256Data(f)
if err != nil {
return 0, fmt.Errorf("could not compute hash for file: %s: %w", location, err)
}
} }
if hash == existingHash { if matches {
return stat.Size(), nil return stat.Size(), nil
} }
@ -222,3 +212,22 @@ func downloadInternal(cacheKey string, location string, hash string, url string,
return resp.ContentLength, nil return resp.ContentLength, nil
} }
func compareHash(hash string, location string) (bool, error) {
existingHash := ""
if hash != "" {
f, err := os.Open(location)
if err != nil {
return false, fmt.Errorf("failed to open file: %s: %w", location, err)
}
defer f.Close()
existingHash, err = utils.SHA256Data(f)
if err != nil {
return false, fmt.Errorf("could not compute hash for file: %s: %w", location, err)
}
}
return hash == existingHash, nil
}