feat: new cached files naming

Luca Bianconi · Luca Bianconi · commit 298e69fb239b · 2023-01-16T09:46:48.000+01:00
diff --git a/arduino/sketch/sketch.go b/arduino/sketch/sketch.go
@@ -303,7 +303,7 @@ func GenBuildPath(sketchPath *paths.Path) *paths.Path {
 	md5SumBytes := md5.Sum([]byte(path))
 	md5Sum := strings.ToUpper(hex.EncodeToString(md5SumBytes[:]))
 
-	return getSketchesCacheDir().Join("sketch-" + md5Sum)
+	return getSketchesCacheDir().Join(md5Sum)
 }
 
 func getSketchesCacheDir() *paths.Path {
diff --git a/arduino/sketch/sketch_test.go b/arduino/sketch/sketch_test.go
@@ -286,10 +286,10 @@ func TestNewSketchFolderSymlink(t *testing.T) {
 }
 
 func TestGenBuildPath(t *testing.T) {
-	want := paths.TempDir().Join("arduino", "sketches", "sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8")
+	want := paths.TempDir().Join("arduino", "sketches", "ACBD18DB4CC2F85CEDEF654FCCC4A4D8")
 	assert.True(t, GenBuildPath(paths.New("foo")).EquivalentTo(want))
 
-	want = paths.TempDir().Join("arduino", "sketches", "sketch-D41D8CD98F00B204E9800998ECF8427E")
+	want = paths.TempDir().Join("arduino", "sketches", "D41D8CD98F00B204E9800998ECF8427E")
 	assert.True(t, GenBuildPath(nil).EquivalentTo(want))
 }
 
diff --git a/buildcache/build_cache_test.go b/buildcache/build_cache_test.go
@@ -24,14 +24,14 @@ import (
 )
 
 func Test_UpdateLastUsedFileNotExisting(t *testing.T) {
-	testBuildDir := paths.New(t.TempDir(), "sketches", "sketch-xxx")
+	testBuildDir := paths.New(t.TempDir(), "sketches", "xxx")
 	require.NoError(t, testBuildDir.MkdirAll())
 	timeBeforeUpdating := time.Unix(0, 0)
 	requireCorrectUpdate(t, testBuildDir, timeBeforeUpdating)
 }
 
 func Test_UpdateLastUsedFileExisting(t *testing.T) {
-	testBuildDir := paths.New(t.TempDir(), "sketches", "sketch-xxx")
+	testBuildDir := paths.New(t.TempDir(), "sketches", "xxx")
 	require.NoError(t, testBuildDir.MkdirAll())
 
 	// create the file
diff --git a/internal/integrationtest/compile_1/compile_test.go b/internal/integrationtest/compile_1/compile_test.go
@@ -172,7 +172,7 @@ func compileWithSimpleSketchCustomEnv(t *testing.T, env *integrationtest.Environ
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino", "sketches", "sketch-"+sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketches", sketchPathMd5)
 	require.FileExists(t, buildDir.Join(sketchName+".ino.eep").String())
 	require.FileExists(t, buildDir.Join(sketchName+".ino.elf").String())
 	require.FileExists(t, buildDir.Join(sketchName+".ino.hex").String())
@@ -406,7 +406,7 @@ func compileWithOutputDirFlag(t *testing.T, env *integrationtest.Environment, cl
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino", "sketches", "sketch-"+sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketches", sketchPathMd5)
 	require.FileExists(t, buildDir.Join(sketchName+".ino.eep").String())
 	require.FileExists(t, buildDir.Join(sketchName+".ino.elf").String())
 	require.FileExists(t, buildDir.Join(sketchName+".ino.hex").String())
@@ -473,7 +473,7 @@ func compileWithCustomBuildPath(t *testing.T, env *integrationtest.Environment,
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino", "sketches", "sketch-"+sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketches", sketchPathMd5)
 	require.NoFileExists(t, buildDir.Join(sketchName+".ino.eep").String())
 	require.NoFileExists(t, buildDir.Join(sketchName+".ino.elf").String())
 	require.NoFileExists(t, buildDir.Join(sketchName+".ino.hex").String())
@@ -1007,7 +1007,7 @@ func compileWithInvalidBuildOptionJson(t *testing.T, env *integrationtest.Enviro
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino", "sketches", "sketch-"+sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketches", sketchPathMd5)
 
 	_, _, err = cli.Run("compile", "-b", fqbn, sketchPath.String(), "--verbose")
 	require.NoError(t, err)
diff --git a/internal/integrationtest/compile_2/compile_test.go b/internal/integrationtest/compile_2/compile_test.go
@@ -145,7 +145,7 @@ func recompileWithDifferentLibrary(t *testing.T, env *integrationtest.Environmen
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino", "sketches", "sketch-"+sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketches", sketchPathMd5)
 
 	// Compile sketch using library not managed by CLI
 	stdout, _, err := cli.Run("compile", "-b", fqbn, "--library", manuallyInstalledLibPath.String(), sketchPath.String(), "-v")
diff --git a/internal/integrationtest/core/core_test.go b/internal/integrationtest/core/core_test.go
@@ -253,7 +253,7 @@ func TestCoreInstallEsp32(t *testing.T) {
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino", "sketches", "sketch-"+sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketches", sketchPathMd5)
 	require.FileExists(t, buildDir.Join(sketchName+".ino.partitions.bin").String())
 }
 
diff --git a/internal/integrationtest/upload_mock/upload_mock_test.go b/internal/integrationtest/upload_mock/upload_mock_test.go
@@ -697,7 +697,7 @@ func TestUploadSketch(t *testing.T) {
 func generateBuildDir(sketchPath *paths.Path, t *testing.T) *paths.Path {
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
-	buildDir := paths.TempDir().Join("arduino", "sketches", "sketch-"+sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketches", sketchPathMd5)
 	require.NoError(t, buildDir.MkdirAll())
 	require.NoError(t, buildDir.ToAbs())
 	return buildDir
diff --git a/legacy/builder/phases/core_builder.go b/legacy/builder/phases/core_builder.go
@@ -149,10 +149,10 @@ func GetCachedCoreArchiveDirName(fqbn string, optimizationFlags string, coreFold
 		coreFolder = absCoreFolder
 	} // silently continue if absolute path can't be detected
 	hash := utils.MD5Sum([]byte(coreFolder.String() + optimizationFlags))
-	realName := "core_" + fqbnToUnderscore + "_" + hash
+	realName := fqbnToUnderscore + "_" + hash
 	if len(realName) > 100 {
 		// avoid really long names, simply hash the final part
-		realName = "core_" + utils.MD5Sum([]byte(fqbnToUnderscore+"_"+hash))
+		realName = utils.MD5Sum([]byte(fqbnToUnderscore + "_" + hash))
 	}
 	return realName
 }

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ func GenBuildPath(sketchPath paths.Path) paths.Path {`
`303`	`303`	`md5SumBytes := md5.Sum([]byte(path))`
`304`	`304`	`md5Sum := strings.ToUpper(hex.EncodeToString(md5SumBytes[:]))`
`305`	`305`
`306`		`- return getSketchesCacheDir().Join("sketch-" + md5Sum)`
	`306`	`+ return getSketchesCacheDir().Join(md5Sum)`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`func getSketchesCacheDir() *paths.Path {`
Original file line number	Diff line number	Diff line change
`@@ -286,10 +286,10 @@ func TestNewSketchFolderSymlink(t *testing.T) {`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`func TestGenBuildPath(t *testing.T) {`
`289`		`- want := paths.TempDir().Join("arduino", "sketches", "sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8")`
	`289`	`+ want := paths.TempDir().Join("arduino", "sketches", "ACBD18DB4CC2F85CEDEF654FCCC4A4D8")`
`290`	`290`	`assert.True(t, GenBuildPath(paths.New("foo")).EquivalentTo(want))`
`291`	`291`
`292`		`- want = paths.TempDir().Join("arduino", "sketches", "sketch-D41D8CD98F00B204E9800998ECF8427E")`
	`292`	`+ want = paths.TempDir().Join("arduino", "sketches", "D41D8CD98F00B204E9800998ECF8427E")`
`293`	`293`	`assert.True(t, GenBuildPath(nil).EquivalentTo(want))`
`294`	`294`	`}`
`295`	`295`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ import (`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func Test_UpdateLastUsedFileNotExisting(t *testing.T) {`
`27`		`- testBuildDir := paths.New(t.TempDir(), "sketches", "sketch-xxx")`
	`27`	`+ testBuildDir := paths.New(t.TempDir(), "sketches", "xxx")`
`28`	`28`	`require.NoError(t, testBuildDir.MkdirAll())`
`29`	`29`	`timeBeforeUpdating := time.Unix(0, 0)`
`30`	`30`	`requireCorrectUpdate(t, testBuildDir, timeBeforeUpdating)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func Test_UpdateLastUsedFileExisting(t *testing.T) {`
`34`		`- testBuildDir := paths.New(t.TempDir(), "sketches", "sketch-xxx")`
	`34`	`+ testBuildDir := paths.New(t.TempDir(), "sketches", "xxx")`
`35`	`35`	`require.NoError(t, testBuildDir.MkdirAll())`
`36`	`36`
`37`	`37`	`// create the file`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ func TestCoreInstallEsp32(t *testing.T) {`
`253`	`253`	`md5 := md5.Sum(([]byte(sketchPath.String())))`
`254`	`254`	`sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))`
`255`	`255`	`require.NotEmpty(t, sketchPathMd5)`
`256`		`- buildDir := paths.TempDir().Join("arduino", "sketches", "sketch-"+sketchPathMd5)`
	`256`	`+ buildDir := paths.TempDir().Join("arduino", "sketches", sketchPathMd5)`
`257`	`257`	`require.FileExists(t, buildDir.Join(sketchName+".ino.partitions.bin").String())`
`258`	`258`	`}`
`259`	`259`
Original file line number	Diff line number	Diff line change
`@@ -149,10 +149,10 @@ func GetCachedCoreArchiveDirName(fqbn string, optimizationFlags string, coreFold`
`149`	`149`	`coreFolder = absCoreFolder`
`150`	`150`	`} // silently continue if absolute path can't be detected`
`151`	`151`	`hash := utils.MD5Sum([]byte(coreFolder.String() + optimizationFlags))`
`152`		`- realName := "core_" + fqbnToUnderscore + "_" + hash`
	`152`	`+ realName := fqbnToUnderscore + "_" + hash`
`153`	`153`	`if len(realName) > 100 {`
`154`	`154`	`// avoid really long names, simply hash the final part`
`155`		`- realName = "core_" + utils.MD5Sum([]byte(fqbnToUnderscore+"_"+hash))`
	`155`	`+ realName = utils.MD5Sum([]byte(fqbnToUnderscore + "_" + hash))`
`156`	`156`	`}`
`157`	`157`	`return realName`
`158`	`158`	`}`