fix: move cache to OciDownloader

Signed-off-by: zongz <zongzhe1024@163.com>
kcl-lang · Oct 23, 2024 · d3b0429 · d3b0429
1 parent 2bf947d
commit d3b0429
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 320 deletions.
diff --git a/pkg/client/deperated.go b/pkg/client/deperated.go
@@ -217,20 +217,10 @@ func (c *KpmClient) DownloadFromOci(dep *downloader.Oci, localPath string) (stri
 		return "", err
 	}
 
-	matches, _ := filepath.Glob(filepath.Join(localPath, "*.tar"))
-	if matches == nil || len(matches) != 1 {
-		// then try to glob tgz file
-		matches, _ = filepath.Glob(filepath.Join(localPath, "*.tgz"))
-		if matches == nil || len(matches) != 1 {
-			return "", reporter.NewErrorEvent(
-				reporter.InvalidKclPkg,
-				err,
-				fmt.Sprintf("failed to find the kcl package from '%s'.", localPath),
-			)
-		}
+	tarPath, err := utils.FindPkgArchive(localPath)
+	if err != nil {
+		return "", err
 	}
-
-	tarPath := matches[0]
 	if utils.IsTar(tarPath) {
 		err = utils.UnTarDir(tarPath, localPath)
 	} else {

diff --git a/pkg/downloader/cache.go b/pkg/downloader/cache.go
diff --git a/pkg/downloader/cache_test.go b/pkg/downloader/cache_test.go
diff --git a/pkg/downloader/downloader.go b/pkg/downloader/downloader.go
@@ -11,6 +11,7 @@ import (
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/otiai10/copy"
 	"kcl-lang.io/kpm/pkg/constants"
+	"kcl-lang.io/kpm/pkg/features"
 	"kcl-lang.io/kpm/pkg/git"
 	"kcl-lang.io/kpm/pkg/oci"
 	"kcl-lang.io/kpm/pkg/reporter"
@@ -291,44 +292,85 @@ func (d *OciDownloader) Download(opts DownloadOptions) error {
 		ociSource.Tag = tagSelected
 	}
 
-	reporter.ReportMsgTo(
-		fmt.Sprintf(
-			"downloading '%s:%s' from '%s/%s:%s'",
-			ociSource.Repo, ociSource.Tag, ociSource.Reg, ociSource.Repo, ociSource.Tag,
-		),
-		opts.LogWriter,
-	)
-
-	err = ociCli.Pull(localPath, ociSource.Tag)
-	if err != nil {
-		return err
-	}
+	if ok, err := features.Enabled(features.SupportNewStorage); err == nil && ok {
+		if opts.EnableCache {
+			hash, err := ociSource.Hash()
+			if err != nil {
+				return err
+			}
+			cacheFullPath := filepath.Join(opts.CachePath, hash)
+			localFullPath := filepath.Join(opts.LocalPath, hash)
+
+			if utils.DirExists(localFullPath) &&
+				utils.DirExists(filepath.Join(localFullPath, constants.KCL_MOD)) {
+				return nil
+			} else {
+				cacheTarPath, err := utils.FindPkgArchive(cacheFullPath)
+				if err != nil && errors.Is(err, utils.PkgArchiveNotFound) {
+					reporter.ReportMsgTo(
+						fmt.Sprintf(
+							"downloading '%s:%s' from '%s/%s:%s'",
+							ociSource.Repo, ociSource.Tag, ociSource.Reg, ociSource.Repo, ociSource.Tag,
+						),
+						opts.LogWriter,
+					)
+
+					err = ociCli.Pull(cacheFullPath, ociSource.Tag)
+					if err != nil {
+						return err
+					}
+					cacheTarPath, err = utils.FindPkgArchive(cacheFullPath)
+					if err != nil {
+						return err
+					}
+				} else if err != nil {
+					return err
+				}
 
-	matches, _ := filepath.Glob(filepath.Join(localPath, "*.tar"))
-	if matches == nil || len(matches) != 1 {
-		// then try to glob tgz file
-		matches, _ = filepath.Glob(filepath.Join(localPath, "*.tgz"))
-		if matches == nil || len(matches) != 1 {
-			return fmt.Errorf("failed to find the downloaded kcl package tar file in '%s'", localPath)
+				if utils.IsTar(cacheTarPath) {
+					err = utils.UnTarDir(cacheTarPath, localFullPath)
+				} else {
+					err = utils.ExtractTarball(cacheTarPath, localFullPath)
+				}
+				if err != nil {
+					return err
+				}
+			}
 		}
-	}
-
-	tarPath := matches[0]
-	if utils.IsTar(tarPath) {
-		err = utils.UnTarDir(tarPath, localPath)
 	} else {
-		err = utils.ExtractTarball(tarPath, localPath)
-	}
-	if err != nil {
-		return fmt.Errorf("failed to untar the kcl package tar from '%s' into '%s'", tarPath, localPath)
-	}
+		reporter.ReportMsgTo(
+			fmt.Sprintf(
+				"downloading '%s:%s' from '%s/%s:%s'",
+				ociSource.Repo, ociSource.Tag, ociSource.Reg, ociSource.Repo, ociSource.Tag,
+			),
+			opts.LogWriter,
+		)
 
-	// After untar the downloaded kcl package tar file, remove the tar file.
-	if utils.DirExists(tarPath) {
-		rmErr := os.Remove(tarPath)
-		if rmErr != nil {
-			return fmt.Errorf("failed to remove the downloaded kcl package tar file '%s'", tarPath)
+		err = ociCli.Pull(localPath, ociSource.Tag)
+		if err != nil {
+			return err
 		}
+		tarPath, err := utils.FindPkgArchive(localPath)
+		if err != nil {
+			return err
+		}
+		if utils.IsTar(tarPath) {
+			err = utils.UnTarDir(tarPath, localPath)
+		} else {
+			err = utils.ExtractTarball(tarPath, localPath)
+		}
+		if err != nil {
+			return fmt.Errorf("failed to untar the kcl package tar from '%s' into '%s'", tarPath, localPath)
+		}
+
+		// After untar the downloaded kcl package tar file, remove the tar file.
+		if utils.DirExists(tarPath) {
+			rmErr := os.Remove(tarPath)
+			if rmErr != nil {
+				return fmt.Errorf("failed to remove the downloaded kcl package tar file '%s'", tarPath)
+			}
+		}
+
 	}
 
 	return err