Merge pull request #9 from canaria-computer/dev1

version 1.2.0 unstable merge

Author: canaria-computer

README.md

@@ -1,40 +1,38 @@
 /*
-Copyright © 2025 NAME HERE <EMAIL ADDRESS>
-
+Copyright © 2025 canaria-computer
 */
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
 )
 
 // cacheCmd represents the cache command
 var cacheCmd = &cobra.Command{
 	Use:   "cache",
-	Short: "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("cache called")
-	},
-}
+	Short: "Manage cached access information",
+	Long: `Manage the cached access information used during evidence collection.
 
-func init() {
-	rootCmd.AddCommand(cacheCmd)
+The cache stores your IP address, geographic location, ISP, and ASN information
+to avoid repeated API calls to IP information providers. Cache is valid for 6 hours.
 
-	// Here you will define your flags and configuration settings.
+Available subcommands:
+  show    - Display current cached information
+  clear   - Remove cached information
+  refresh - Force refresh the cache with new data
 
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// cacheCmd.PersistentFlags().String("foo", "", "A help for foo")
+Examples:
+  # Show current cache
+  down-force cache show
 
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// cacheCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+  # Clear cache
+  down-force cache clear
+
+  # Refresh cache
+  down-force cache refresh
+`,
+}
+
+func init() {
+	rootCmd.AddCommand(cacheCmd)
 }

cmd/cache.go

@@ -1,40 +1,45 @@
 /*
-Copyright © 2025 NAME HERE <EMAIL ADDRESS>
-
+Copyright © 2025 canaria-computer
 */
 package cmd
 
 import (
-	"fmt"
+	"os"
 
+	"github.com/canaria-computer/down-force/internal/utils"
+	"github.com/charmbracelet/log"
 	"github.com/spf13/cobra"
 )
 
 // clearCmd represents the clear command
 var clearCmd = &cobra.Command{
 	Use:   "clear",
-	Short: "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("clear called")
-	},
+	Short: "Clear cached access information",
+	Long: `Remove the cached access information file.
+
+This forces the next evidence collection to fetch fresh access information
+from IP providers instead of using cached data.
+
+Example:
+  down-force cache clear
+`,
+	Run: runCacheClear,
 }
 
 func init() {
 	cacheCmd.AddCommand(clearCmd)
+}
 
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// clearCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// clearCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+func runCacheClear(cmd *cobra.Command, args []string) {
+	cachePath := utils.GetCachePath()
+	
+	if err := os.Remove(cachePath); err != nil {
+		if os.IsNotExist(err) {
+			log.Info("No cache to clear")
+			return
+		}
+		log.Fatalf("Failed to clear cache: %v", err)
+	}
+
+	log.Info("✅ Cache cleared successfully")
 }

cmd/clear.go

@@ -49,12 +49,10 @@ func init() {
 func runComplete(cmd *cobra.Command, args []string) {
 	configPath := args[0]
 
-	// Check if config file exists
 	if _, err := os.Stat(configPath); os.IsNotExist(err) {
 		log.Fatalf("❌ Config file not found: %s", configPath)
 	}
 
-	// Load and complete config
 	cfg, modified, err := config.LoadAndCompleteConfig(configPath)
 	if err != nil {
 		log.Fatalf("❌ Failed to load config: %v", err)
@@ -65,16 +63,16 @@ func runComplete(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	// Show what was completed
 	fmt.Println("📝 Changes to be applied:")
 	fmt.Println()
 
 	for _, ua := range cfg.UserAgents {
 		builtin := config.GetBuiltinUserAgent(ua.Name)
-		if builtin != nil && ua.UserAgentString == builtin.UserAgentString {
+		if builtin != nil && ua.UserAgentString == builtin.Name {
 			fmt.Printf("  • %s\n", ua.Name)
 			fmt.Printf("    UA: %s...\n", truncateString(ua.UserAgentString, 60))
-			fmt.Printf("    Viewport: %dx%d\n", ua.ViewportWidth, ua.ViewportHeight)
+			fmt.Printf("    Viewport (Horiz): %dx%d\n", ua.Screen.Horizontal.Width, ua.Screen.Horizontal.Height)
+			fmt.Printf("    Viewport (Vert):  %dx%d\n", ua.Screen.Vertical.Width, ua.Screen.Vertical.Height)
 			fmt.Println()
 		}
 	}
@@ -84,7 +82,6 @@ func runComplete(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	// Save the completed config
 	if err := config.SaveConfig(configPath, cfg); err != nil {
 		log.Fatalf("❌ Failed to save config: %v", err)
 	}

cmd/complete.go

@@ -0,0 +1,15 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+var configCmd = &cobra.Command{
+	Use:   "config",
+	Short: "Manage application configuration",
+	Long:  `Manage application behavior configuration. Validate, initialize, and view current configuration values.`,
+}
+
+func init() {
+	rootCmd.AddCommand(configCmd)
+}

cmd/config.go

@@ -0,0 +1,53 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/canaria-computer/down-force/internal/appconfig"
+	"github.com/charmbracelet/log"
+	"github.com/spf13/cobra"
+)
+
+var (
+	forceOverwrite bool
+)
+
+var configInitCmd = &cobra.Command{
+	Use:   "init",
+	Short: "Generate default configuration file",
+	Long:  `Generate default configuration file at ~/.config/down-force/config.yaml. Requires --force-overwrite flag to overwrite existing file.`,
+	RunE:  runConfigInit,
+}
+
+func init() {
+	configCmd.AddCommand(configInitCmd)
+	configInitCmd.Flags().BoolVar(&forceOverwrite, "force-overwrite", false, "Force overwrite existing configuration file")
+}
+
+func runConfigInit(cmd *cobra.Command, args []string) error {
+	configPath, err := appconfig.GetDefaultConfigPath()
+	if err != nil {
+		return fmt.Errorf("failed to get config path: %w", err)
+	}
+
+	if _, err := os.Stat(configPath); err == nil {
+		if !forceOverwrite {
+			return fmt.Errorf("config file already exists: %s\nUse --force-overwrite flag to overwrite existing file", configPath)
+		}
+		log.Warn("Overwriting existing configuration file", "path", configPath)
+	}
+
+	configDir := filepath.Dir(configPath)
+	if err := os.MkdirAll(configDir, 0700); err != nil {
+		return fmt.Errorf("failed to create config directory: %w", err)
+	}
+
+	if err := os.WriteFile(configPath, []byte(appconfig.ConfigTemplate), 0600); err != nil {
+		return fmt.Errorf("failed to write config file: %w", err)
+	}
+
+	log.Info("✓ Configuration file created", "path", configPath)
+	return nil
+}