fix cache check for empty folder

Signed-off-by: Lan <[email protected]>

Author: liangyuanpeng

pkg/downloader/downloader.go

@@ -292,7 +292,10 @@ func (d *DepDownloader) Download(opts *DownloadOptions) error {
 
 	localPath := opts.LocalPath
 	cacheFullPath := opts.CachePath
-	if ok, err := features.Enabled(features.SupportNewStorage); err == nil && !ok && opts.EnableCache {
+	if ok, err := features.Enabled(features.SupportNewStorage); err == nil &&
+		!ok &&
+		opts.EnableCache &&
+		utils.DirExists(filepath.Join(localPath, constants.KCL_MOD)) {
 		if utils.DirExists(cacheFullPath) &&
 			// If the version in modspec is empty, meanings the latest version is needed.
 			// The latest version should be requested first and the cache should be updated.

pkg/downloader/downloader_test.go

@@ -86,7 +86,40 @@ func testGitDownloader(t *testing.T) {
 	assert.Equal(t, utils.DirExists(filepath.Join(path_git, "git", "src", gitHash, "kcl.mod")), true)
 }
 
+func testDepDownloader(t *testing.T) {
+	path_git := getTestDir("test_dep_downloader")
+	if err := os.MkdirAll(path_git, os.ModePerm); err != nil {
+		t.Fatal(err)
+	}
+
+	defer func() {
+		_ = os.RemoveAll(path_git)
+	}()
+	dep := NewOciDownloader("linux/amd64")
+	err := dep.Download(&DownloadOptions{
+		LocalPath:   path_git,
+		CachePath:   path_git,
+		EnableCache: true,
+		Source: Source{
+			ModSpec: &ModSpec{
+				Name:    "k8s",
+				Version: "1.28.1",
+			},
+			Oci: &Oci{
+				Reg:  "ghcr.io",
+				Repo: "kcl-lang/k8s",
+			},
+		},
+	})
+	assert.Equal(t, err, nil)
+	existFile, err := utils.Exists(path_git + "/kcl.mod")
+	assert.Equal(t, err, nil)
+	assert.Equal(t, existFile, true)
+}
+
+// go test -timeout 30s -run ^TestWithGlobalLock$ kcl-lang.io/kpm/pkg/downloader -v
 func TestWithGlobalLock(t *testing.T) {
 	test.RunTestWithGlobalLock(t, "TestOciDownloader", testOciDownloader)
 	test.RunTestWithGlobalLock(t, "TestGitDownloader", testGitDownloader)
+	test.RunTestWithGlobalLock(t, "TestDepDownloader", testDepDownloader)
 }

pkg/downloader/utils.go

@@ -59,40 +59,41 @@ func FindPackageByModSpec(root string, modSpec *ModSpec) (string, error) {
 		if err != nil {
 			return err
 		}
-		if info.IsDir() {
-			kclModPath := filepath.Join(path, constants.KCL_MOD)
-			if _, err := os.Stat(kclModPath); err == nil {
-				// If the package name and version are specified,
-				// we can directly check if the kcl.mod file matches the package.
-				if matchesPackageSpec(kclModPath, modSpec) {
-					result = path
-					return filepath.SkipAll
-				} else if modSpec.Version == "" {
-					// If the package name specified, but version are not specified,
-					if utils.MatchesPackageName(kclModPath, modSpec.Name) {
-						// load the version from the kcl.mod file
-						tmpSpec, err := loadModSpecFromKclMod(kclModPath)
-						if err != nil {
-							return err
-						}
-						// Remember the local path with the highest version
-						tmpVer, err := version.NewSemver(tmpSpec.Version)
+		if !info.IsDir() {
+			return nil
+		}
+		kclModPath := filepath.Join(path, constants.KCL_MOD)
+		if _, err := os.Stat(kclModPath); err == nil {
+			// If the package name and version are specified,
+			// we can directly check if the kcl.mod file matches the package.
+			if matchesPackageSpec(kclModPath, modSpec) {
+				result = path
+				return filepath.SkipAll
+			} else if modSpec.Version == "" {
+				// If the package name specified, but version are not specified,
+				if utils.MatchesPackageName(kclModPath, modSpec.Name) {
+					// load the version from the kcl.mod file
+					tmpSpec, err := loadModSpecFromKclMod(kclModPath)
+					if err != nil {
+						return err
+					}
+					// Remember the local path with the highest version
+					tmpVer, err := version.NewSemver(tmpSpec.Version)
+					if err != nil {
+						return err
+					}
+					if modVersion != "" {
+						modVer, err := version.NewSemver(modVersion)
 						if err != nil {
 							return err
 						}
-						if modVersion != "" {
-							modVer, err := version.NewSemver(modVersion)
-							if err != nil {
-								return err
-							}
-							if tmpVer.GreaterThan(modVer) {
-								modVersion = tmpSpec.Version
-								result = path
-							}
-						} else {
+						if tmpVer.GreaterThan(modVer) {
 							modVersion = tmpSpec.Version
 							result = path
 						}
+					} else {
+						modVersion = tmpSpec.Version
+						result = path
 					}
 				}
 			}