Merge pull request #1165 from wakatime/bugfix/random-projects

Prevent random project name when nowhere to save wakatime-project file

Author: alanhamlett

pkg/language/language.go

@@ -133,6 +133,10 @@ func detectSpecialCases(ctx context.Context, fp string) (heartbeat.Language, boo
 
 // folderContainsCFiles returns true, if filder contains c files.
 func folderContainsCFiles(ctx context.Context, dir string) bool {
+	if dir == "" {
+		return false
+	}
+
 	logger := log.Extract(ctx)
 
 	extensions, err := loadFolderExtensions(dir)
@@ -152,6 +156,10 @@ func folderContainsCFiles(ctx context.Context, dir string) bool {
 
 // folderContainsCFiles returns true, if filder contains c++ files.
 func folderContainsCPPFiles(ctx context.Context, dir string) bool {
+	if dir == "" {
+		return false
+	}
+
 	logger := log.Extract(ctx)
 
 	extensions, err := loadFolderExtensions(dir)

pkg/project/project.go

@@ -322,6 +322,11 @@ func DetectWithRevControl(
 }
 
 func obfuscateProjectName(ctx context.Context, folder string) string {
+	// when folder unknown, use Unknown Project (https://github.com/wakatime/wakatime-cli/issues/1164)
+	if folder == "" {
+		return ""
+	}
+
 	// prevent overwriting existing project files, use Unknown Project instead
 	if fileOrDirExists(filepath.Join(folder, WakaTimeProjectFile)) {
 		return ""

pkg/project/project_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"strings"
 	"testing"
@@ -25,6 +26,7 @@ func TestWithDetection_EntityNotFile(t *testing.T) {
 		Heartbeats  []heartbeat.Heartbeat
 		Override    string
 		Alternative string
+		Config      project.Config
 		Expected    heartbeat.Heartbeat
 	}{
 		"entity not file override takes precedence": {
@@ -69,11 +71,28 @@ func TestWithDetection_EntityNotFile(t *testing.T) {
 				Project:    heartbeat.PointerTo(""),
 			},
 		},
+		"entity not file with project obfuscation": {
+			Heartbeats: []heartbeat.Heartbeat{
+				{
+					Entity:          "github.com",
+					EntityType:      heartbeat.AppType,
+					ProjectOverride: "billing",
+				},
+			},
+			Config: project.Config{HideProjectNames: []regex.Regex{regex.NewRegexpWrap(regexp.MustCompile(".*"))}},
+			Expected: heartbeat.Heartbeat{
+				Branch:          heartbeat.PointerTo(""),
+				Entity:          "github.com",
+				EntityType:      heartbeat.AppType,
+				Project:         heartbeat.PointerTo(""),
+				ProjectOverride: "billing",
+			},
+		},
 	}
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			opt := project.WithDetection(project.Config{})
+			opt := project.WithDetection(test.Config)
 
 			handle := opt(func(_ context.Context, hh []heartbeat.Heartbeat) ([]heartbeat.Result, error) {
 				assert.Equal(t, []heartbeat.Heartbeat{