Store type of Content-Type in cache dir

Signed-off-by: Anders F Björklund <[email protected]>

Author: afbjorklund

pkg/downloader/downloader.go

@@ -45,6 +45,7 @@ type Result struct {
 	Status          Status
 	CachePath       string // "/Users/foo/Library/Caches/lima/download/by-url-sha256/<SHA256_OF_URL>/data"
 	LastModified    string
+	ContentType     string
 	ValidatedDigest bool
 }
 
@@ -176,7 +177,7 @@ func Download(ctx context.Context, local, remote string, opts ...Opt) (*Result,
 	}
 
 	if o.cacheDir == "" {
-		if err := downloadHTTP(ctx, localPath, "", remote, o.description, o.expectedDigest); err != nil {
+		if err := downloadHTTP(ctx, localPath, "", "", remote, o.description, o.expectedDigest); err != nil {
 			return nil, err
 		}
 		res := &Result{
@@ -189,6 +190,7 @@ func Download(ctx context.Context, local, remote string, opts ...Opt) (*Result,
 	shad := cacheDirectoryPath(o.cacheDir, remote)
 	shadData := filepath.Join(shad, "data")
 	shadTime := filepath.Join(shad, "time")
+	shadType := filepath.Join(shad, "type")
 	shadDigest, err := cacheDigestPath(shad, o.expectedDigest)
 	if err != nil {
 		return nil, err
@@ -213,6 +215,7 @@ func Download(ctx context.Context, local, remote string, opts ...Opt) (*Result,
 			Status:          StatusUsedCache,
 			CachePath:       shadData,
 			LastModified:    shadTime,
+			ContentType:     shadType,
 			ValidatedDigest: o.expectedDigest != "",
 		}
 		return res, nil
@@ -227,7 +230,7 @@ func Download(ctx context.Context, local, remote string, opts ...Opt) (*Result,
 	if err := os.WriteFile(shadURL, []byte(remote), 0o644); err != nil {
 		return nil, err
 	}
-	if err := downloadHTTP(ctx, shadData, shadTime, remote, o.description, o.expectedDigest); err != nil {
+	if err := downloadHTTP(ctx, shadData, shadTime, shadType, remote, o.description, o.expectedDigest); err != nil {
 		return nil, err
 	}
 	// no need to pass the digest to copyLocal(), as we already verified the digest
@@ -243,6 +246,7 @@ func Download(ctx context.Context, local, remote string, opts ...Opt) (*Result,
 		Status:          StatusDownloaded,
 		CachePath:       shadData,
 		LastModified:    shadTime,
+		ContentType:     shadType,
 		ValidatedDigest: o.expectedDigest != "",
 	}
 	return res, nil
@@ -271,6 +275,7 @@ func Cached(remote string, opts ...Opt) (*Result, error) {
 	shad := cacheDirectoryPath(o.cacheDir, remote)
 	shadData := filepath.Join(shad, "data")
 	shadTime := filepath.Join(shad, "time")
+	shadType := filepath.Join(shad, "type")
 	shadDigest, err := cacheDigestPath(shad, o.expectedDigest)
 	if err != nil {
 		return nil, err
@@ -291,6 +296,7 @@ func Cached(remote string, opts ...Opt) (*Result, error) {
 		Status:          StatusUsedCache,
 		CachePath:       shadData,
 		LastModified:    shadTime,
+		ContentType:     shadType,
 		ValidatedDigest: o.expectedDigest != "",
 	}
 	return res, nil
@@ -300,6 +306,7 @@ func Cached(remote string, opts ...Opt) (*Result, error) {
 //   - "url" file contains the url
 //   - "data" file contains the data
 //   - "time" file contains the time (Last-Modified header)
+//   - "type" file contains the type (Content-Type header)
 func cacheDirectoryPath(cacheDir, remote string) string {
 	return filepath.Join(cacheDir, "download", "by-url-sha256", fmt.Sprintf("%x", sha256.Sum256([]byte(remote))))
 }
@@ -477,7 +484,7 @@ func validateLocalFileDigest(localPath string, expectedDigest digest.Digest) err
 	return nil
 }
 
-func downloadHTTP(ctx context.Context, localPath, lastModified, url, description string, expectedDigest digest.Digest) error {
+func downloadHTTP(ctx context.Context, localPath, lastModified, contentType, url, description string, expectedDigest digest.Digest) error {
 	if localPath == "" {
 		return fmt.Errorf("downloadHTTP: got empty localPath")
 	}
@@ -502,6 +509,12 @@ func downloadHTTP(ctx context.Context, localPath, lastModified, url, description
 			return err
 		}
 	}
+	if contentType != "" {
+		ct := resp.Header.Get("Content-Type")
+		if err := os.WriteFile(contentType, []byte(ct), 0o644); err != nil {
+			return err
+		}
+	}
 	defer resp.Body.Close()
 	bar, err := progressbar.New(resp.ContentLength)
 	if err != nil {