wip

Author: andrzej-janczak

cmd/cmdutils/flags.go

@@ -0,0 +1,16 @@
+package cmdutils
+
+import (
+	"codacy/cli-v2/domain"
+
+	"github.com/spf13/cobra"
+)
+
+// AddCloudFlags adds the common cloud-related flags to a cobra command.
+// The flags will be bound to the provided flags struct.
+func AddCloudFlags(cmd *cobra.Command, flags *domain.InitFlags) {
+	cmd.Flags().StringVar(&flags.ApiToken, "api-token", "", "Optional Codacy API token. If defined, configurations will be fetched from Codacy")
+	cmd.Flags().StringVar(&flags.Provider, "provider", "", "Provider (e.g., gh, bb, gl) to fetch configurations from Codacy. Required when api-token is provided")
+	cmd.Flags().StringVar(&flags.Organization, "organization", "", "Remote organization name to fetch configurations from Codacy. Required when api-token is provided")
+	cmd.Flags().StringVar(&flags.Repository, "repository", "", "Remote repository name to fetch configurations from Codacy. Required when api-token is provided")
+}

cmd/config.go

@@ -9,6 +9,7 @@ import (
 	"sort"
 	"strings"
 
+	"codacy/cli-v2/cmd/cmdutils"
 	"codacy/cli-v2/cmd/configsetup"
 	codacyclient "codacy/cli-v2/codacy-client"
 	"codacy/cli-v2/config"
@@ -258,15 +259,38 @@ func detectLanguagesInPath(rootPath string, toolLangMap map[string]domain.ToolLa
 		return nil, fmt.Errorf("failed to detect file extensions in path %s: %w", rootPath, err)
 	}
 
-	// Map extensions to languages
+	// Map only found extensions to languages
 	for ext := range extCount {
 		if langs, ok := extToLang[ext]; ok {
+			// Log which extensions map to which languages for debugging
+			logger.Debug("Found files with extension", logrus.Fields{
+				"extension": ext,
+				"count":     extCount[ext],
+				"languages": langs,
+			})
 			for _, lang := range langs {
 				detectedLangs[lang] = struct{}{}
 			}
 		}
 	}
 
+	// Log the final set of detected languages with their corresponding extensions
+	if len(detectedLangs) > 0 {
+		langToExts := make(map[string][]string)
+		for ext, count := range extCount {
+			if langs, ok := extToLang[ext]; ok {
+				for _, lang := range langs {
+					langToExts[lang] = append(langToExts[lang], fmt.Sprintf("%s (%d files)", ext, count))
+				}
+			}
+		}
+
+		logger.Debug("Detected languages in path", logrus.Fields{
+			"languages_with_files": langToExts,
+			"path":                 discoverPath,
+		})
+	}
+
 	return detectedLangs, nil
 }
 
@@ -623,22 +647,13 @@ func getRecognizableExtensions(extCount map[string]int, toolLangMap map[string]d
 }
 
 func init() {
-	// Define flags for the config reset command. These are the same flags used by the init command.
-	configResetCmd.Flags().StringVar(&configResetInitFlags.ApiToken, "api-token", "", "Optional Codacy API token. If defined, configurations will be fetched from Codacy.")
-	configResetCmd.Flags().StringVar(&configResetInitFlags.Provider, "provider", "", "Provider (e.g., gh, bb, gl) to fetch configurations from Codacy. Required when api-token is provided.")
-	configResetCmd.Flags().StringVar(&configResetInitFlags.Organization, "organization", "", "Remote organization name to fetch configurations from Codacy. Required when api-token is provided.")
-	configResetCmd.Flags().StringVar(&configResetInitFlags.Repository, "repository", "", "Remote repository name to fetch configurations from Codacy. Required when api-token is provided.")
-
-	// Add the reset subcommand to the config command
-	configCmd.AddCommand(configResetCmd)
-	// Add the discover subcommand to the config command
-	configCmd.AddCommand(configDiscoverCmd)
-	// Add the config command to the root command
-	rootCmd.AddCommand(configCmd)
+	// Add cloud-related flags to both commands
+	cmdutils.AddCloudFlags(configResetCmd, &configResetInitFlags)
+	cmdutils.AddCloudFlags(configDiscoverCmd, &configResetInitFlags)
 
-	// Add cloud-related flags to the discover command
-	configDiscoverCmd.Flags().StringVar(&configResetInitFlags.ApiToken, "api-token", "", "Optional Codacy API token. If defined, configurations will be fetched from Codacy.")
-	configDiscoverCmd.Flags().StringVar(&configResetInitFlags.Provider, "provider", "", "Provider (e.g., gh, bb, gl) to fetch configurations from Codacy. Required when api-token is provided.")
-	configDiscoverCmd.Flags().StringVar(&configResetInitFlags.Organization, "organization", "", "Remote organization name to fetch configurations from Codacy. Required when api-token is provided.")
-	configDiscoverCmd.Flags().StringVar(&configResetInitFlags.Repository, "repository", "", "Remote repository name to fetch configurations from Codacy. Required when api-token is provided.")
+	// Add subcommands to config command
+	configCmd.AddCommand(configResetCmd, configDiscoverCmd)
+
+	// Add config command to root
+	rootCmd.AddCommand(configCmd)
 }

cmd/init.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"codacy/cli-v2/cmd/cmdutils"
 	"codacy/cli-v2/cmd/configsetup"
 	"codacy/cli-v2/config"
 	"codacy/cli-v2/domain"
@@ -14,10 +15,8 @@ import (
 var initFlags domain.InitFlags
 
 func init() {
-	initCmd.Flags().StringVar(&initFlags.ApiToken, "api-token", "", "optional codacy api token, if defined configurations will be fetched from codacy")
-	initCmd.Flags().StringVar(&initFlags.Provider, "provider", "", "provider (gh/bb/gl) to fetch configurations from codacy, required when api-token is provided")
-	initCmd.Flags().StringVar(&initFlags.Organization, "organization", "", "remote organization name to fetch configurations from codacy, required when api-token is provided")
-	initCmd.Flags().StringVar(&initFlags.Repository, "repository", "", "remote repository name to fetch configurations from codacy, required when api-token is provided")
+	// Add cloud-related flags
+	cmdutils.AddCloudFlags(initCmd, &initFlags)
 	rootCmd.AddCommand(initCmd)
 }