Skip to content

Commit 32bc044

Browse files
committed
Fix service key conflicts and update version to v0.6.2
1 parent d20d182 commit 32bc044

File tree

2 files changed

+30
-4
lines changed

2 files changed

+30
-4
lines changed

detectors/services.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ func (s *ServicesDetector) Detect(projectPath string) (map[string]string, error)
5858
for _, result := range projectResults {
5959
for _, service := range result.Services {
6060
if serviceData, exists := servicesData[service.Name]; exists {
61-
results[serviceData.Name] = serviceData.URL
61+
// Use service.Name (file key) as the key to avoid conflicts
62+
results[service.Name] = serviceData.URL
6263
}
6364
}
6465
}

main.go

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const (
4545
globalTemplatePath = ".sitedog/demo.html.tpl"
4646
authFilePath = ".sitedog/auth"
4747
apiBaseURL = "https://app.sitedog.io"
48-
Version = "v0.6.1"
48+
Version = "v0.6.2"
4949
)
5050

5151
func main() {
@@ -947,7 +947,13 @@ func analyzeProjectDependencies(projectPath string, languages []string, stackDat
947947
}
948948
existing.Packages = mergedPackages
949949
} else {
950-
servicesMap[service.Name] = &service
950+
// Create a copy to avoid pointer issues
951+
serviceCopy := ServiceDetection{
952+
Name: service.Name,
953+
Language: service.Language,
954+
Packages: service.Packages,
955+
}
956+
servicesMap[service.Name] = &serviceCopy
951957
}
952958
}
953959
}
@@ -1131,6 +1137,12 @@ func displayDetectorResults(results map[string]string) {
11311137
if serviceCount > 0 {
11321138
fmt.Printf("🔍 Detected %d service(s):\n", serviceCount)
11331139

1140+
// Load services data for display names
1141+
servicesData, err := loadServicesData()
1142+
if err != nil {
1143+
fmt.Printf("⚠️ Could not load services data: %v\n", err)
1144+
}
1145+
11341146
// Собираем и сортируем ключи (кроме repo)
11351147
var keys []string
11361148
for key := range results {
@@ -1143,7 +1155,20 @@ func displayDetectorResults(results map[string]string) {
11431155
// Выводим в отсортированном порядке
11441156
for _, key := range keys {
11451157
value := results[key]
1146-
displayName := getTechnologyDisplayName(key, value)
1158+
displayName := key
1159+
1160+
// Try to get proper display name from services data
1161+
if servicesData != nil {
1162+
if serviceData, exists := servicesData[key]; exists {
1163+
displayName = serviceData.Name
1164+
}
1165+
}
1166+
1167+
// Fallback to getTechnologyDisplayName for other technologies
1168+
if displayName == key {
1169+
displayName = getTechnologyDisplayName(key, value)
1170+
}
1171+
11471172
fmt.Printf(" 🔗 %s → %s\n", displayName, value)
11481173
}
11491174
}

0 commit comments

Comments
 (0)