Fixed the errors and made the config have default values.

Author: ServerDeveloper9447

main.go

@@ -21,6 +21,20 @@ var (
 	config         Config
 	appdataDir     string
 	configFilePath string
+	defaultConfig  = Config{
+		SaveLocation: filepath.Join(os.Getenv("USERPROFILE"), "Desktop"),
+		RecordFunc:   true,
+		RecordingOpts: RecordingOptions{
+			FPS:          30,
+			CaptureMouse: true,
+			AudioDevice:  "",
+		},
+		HotkeyConfig: hotkeyConfig{
+			Modkeys:  []string{"ctrl", "shift"},
+			Finalkey: "3",
+			Note:     "DO NOT CHANGE ANYTHING MANUALLY IN THIS SECTION UNLESS YOU KNOW WHAT YOU'RE DOING. ALWAYS CHANGE THE HOTKEY VIA THE DEFAULT --hotkey FLAG",
+		},
+	}
 )
 
 func extractFFmpegExe(zipPath, destDir string) error {
@@ -61,10 +75,16 @@ type hotkeyConfig struct {
 }
 
 type Config struct {
-	SaveLocation  string            `json:"save_location"`
-	RecordFunc    bool              `json:"record_func_enabled"`
-	RecordingOpts *RecordingOptions `json:"recording_options,omitempty"`
-	HotkeyConfig  *hotkeyConfig     `json:"hotkey_config"`
+	SaveLocation  string           `json:"save_location"`
+	RecordFunc    bool             `json:"record_func_enabled"`
+	RecordingOpts RecordingOptions `json:"recording_options,omitempty"`
+	HotkeyConfig  hotkeyConfig     `json:"hotkey_config"`
+}
+
+type RecordingOptions struct {
+	FPS          int    `json:"fps"`
+	CaptureMouse bool   `json:"capture_mouse"`
+	AudioDevice  string `json:"audio_device"`
 }
 
 func initConfig() {
@@ -76,13 +96,7 @@ func initConfig() {
 	appdataDir = filepath.Join(appdataDir, "captr")
 	configFilePath = filepath.Join(appdataDir, ".captr_config.json")
 	if _, err := os.Stat(configFilePath); os.IsNotExist(err) {
-		home, _ := os.UserHomeDir()
-		config = Config{
-			SaveLocation:  filepath.Join(home, "Desktop"),
-			RecordFunc:    true,
-			RecordingOpts: nil,
-			HotkeyConfig:  nil,
-		}
+		config = defaultConfig
 		data, err := json.MarshalIndent(config, "", "  ")
 		if err != nil {
 			panic(err)
@@ -94,24 +108,59 @@ func initConfig() {
 		if err != nil {
 			panic(err)
 		}
-		if err := json.Unmarshal(data, &config); err != nil {
+		var loadedConfig Config
+		if err := json.Unmarshal(data, &loadedConfig); err != nil {
 			panic(err)
 		}
+
+		config = mergeConfig(defaultConfig, loadedConfig)
+		mergedData, err := json.MarshalIndent(config, "", "  ")
+		if err != nil {
+			panic(err)
+		}
+		os.WriteFile(configFilePath, mergedData, 0644)
 	}
 }
 
+func mergeConfig(defaultConfig, loadedConfig Config) Config {
+	if loadedConfig.SaveLocation == "" {
+		loadedConfig.SaveLocation = defaultConfig.SaveLocation
+	}
+	if !loadedConfig.RecordFunc {
+		loadedConfig.RecordFunc = defaultConfig.RecordFunc
+	}
+	if loadedConfig.RecordingOpts.FPS == 0 {
+		loadedConfig.RecordingOpts.FPS = defaultConfig.RecordingOpts.FPS
+	}
+	if !loadedConfig.RecordingOpts.CaptureMouse {
+		loadedConfig.RecordingOpts.CaptureMouse = defaultConfig.RecordingOpts.CaptureMouse
+	}
+	if loadedConfig.RecordingOpts.AudioDevice == "" {
+		loadedConfig.RecordingOpts.AudioDevice = defaultConfig.RecordingOpts.AudioDevice
+	}
+	if len(loadedConfig.HotkeyConfig.Modkeys) == 0 {
+		loadedConfig.HotkeyConfig.Modkeys = defaultConfig.HotkeyConfig.Modkeys
+	}
+	if loadedConfig.HotkeyConfig.Finalkey == "" {
+		loadedConfig.HotkeyConfig.Finalkey = defaultConfig.HotkeyConfig.Finalkey
+	}
+	if loadedConfig.HotkeyConfig.Note == "" {
+		loadedConfig.HotkeyConfig.Note = defaultConfig.HotkeyConfig.Note
+	}
+
+	return loadedConfig
+}
+
 func initDownloads() {
 	dwnPath := filepath.Join(appdataDir, "bin")
 	if _, err := os.Stat(filepath.Join(dwnPath, "ffmpeg.exe")); err == nil {
-		mergeRecordingDefaults()
 		return
 	}
 	if !config.RecordFunc {
 		return
 	}
 	cmd := exec.Command("ffmpeg", "-version")
 	if err := cmd.Run(); err == nil {
-		mergeRecordingDefaults()
 		return
 	}
 	fmt.Println("Captr requires ffmpeg to record videos. However, the screenshotting functionality is not affected.")
@@ -153,7 +202,6 @@ func initDownloads() {
 		}
 		extractFFmpegExe(filepath.Join(os.TempDir(), "ffmpeg_captr.zip"), dwnPath)
 		fmt.Printf("FFMPEG has been downloaded to %s", dwnPath)
-		mergeRecordingDefaults()
 	} else {
 		setConfig("record_func_enabled", false)
 	}
@@ -180,8 +228,9 @@ func init() {
 		// Declaring again for safety. Even if anything fails, atleast it won't delete your entire appdata directory
 		appdata, _ := os.UserConfigDir()
 		prompt := promptui.Prompt{
-			Label:     "Are you sure you want to reset Captr",
-			IsConfirm: true,
+			Label:       "Are you sure you want to reset Captr",
+			IsConfirm:   true,
+			HideEntered: true,
 		}
 		_, err := prompt.Run()
 		if err != nil {
@@ -199,9 +248,9 @@ func init() {
 	if *hotkeyConfigMode {
 		mods, finalkey := RegisterHotkey()
 		hotkeyConfig := hotkeyConfig{
-			Modkeys: mods,
+			Modkeys:  mods,
 			Finalkey: finalkey,
-			Note:  HOTKEY_WARNING,
+			Note:     HOTKEY_WARNING,
 		}
 		setConfig("hotkey_config", hotkeyConfig)
 		fmt.Println("Hotkeys have been registered successfully")

recscreen.go

@@ -1,9 +1,7 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
-	"os"
 	"os/exec"
 	"path/filepath"
 	"strconv"
@@ -16,18 +14,6 @@ import (
 	"golang.design/x/hotkey"
 )
 
-type RecordingOptions struct {
-	FPS          int    `json:"fps"`
-	CaptureMouse bool   `json:"capture_mouse"`
-	AudioDevice  string `json:"audio_device"`
-}
-
-var defaultOpts = map[string]any{
-	"fps":           30,
-	"capture_mouse": true,
-	"audio_device":  "",
-}
-
 var (
 	keys = map[string]hotkey.Key{
 		"a": hotkey.KeyA,
@@ -69,53 +55,7 @@ var (
 	}
 )
 
-func mergeRecordingDefaults() {
-	data, err := os.ReadFile(configFilePath)
-	if err != nil {
-		initConfig()
-		return
-	}
-
-	var config map[string]any
-	if err := json.Unmarshal(data, &config); err != nil {
-		fmt.Println("Error reading config:", err)
-		return
-	}
-
-	recRaw, ok := config["recording_options"]
-	if !ok {
-		config["recording_options"] = defaultOpts
-	} else {
-		recMap, ok := recRaw.(map[string]any)
-		if !ok {
-			fmt.Println("Error reading recording options")
-			return
-		}
-
-		changed := false
-		for k, v := range defaultOpts {
-			if _, exists := recMap[k]; !exists {
-				recMap[k] = v
-				changed = true
-			}
-		}
-
-		if changed {
-			config["recording_options"] = recMap
-		} else {
-			return
-		}
-	}
-
-	out, _ := json.MarshalIndent(config, "", "  ")
-	os.WriteFile(configFilePath, out, 0644)
-}
-
 func RecordDisplay() {
-	if config.HotkeyConfig != nil && (len(config.HotkeyConfig.Modkeys) == 0 || config.HotkeyConfig.Finalkey == "") {
-		fmt.Println("Invalid hotkey configured. Please reset Captr.")
-		os.Exit(1)
-	}
 	active_displays := robotgo.DisplaysNum()
 	displays := []string{"Display 1 (Primary)"}
 	for i := 2; i < active_displays; i++ {
@@ -161,35 +101,29 @@ func RecordDisplay() {
 	}
 
 	var modkeys []hotkey.Modifier
-	func() {
-		if config.HotkeyConfig == nil {
-			modkeys = []hotkey.Modifier{hotkey.ModCtrl, hotkey.ModAlt}
-		} else {
-			pressedKeys := map[string]bool{}
-			for _, key := range config.HotkeyConfig.Modkeys {
-				pressedKeys[key] = true
-			}
-			for _, mod := range []string{"ctrl", "alt", "shift"} {
-				if pressedKeys[mod] {
-					switch mod {
-					case "ctrl":
-						modkeys = append(modkeys, hotkey.ModCtrl)
-					case "alt":
-						modkeys = append(modkeys, hotkey.ModAlt)
-					case "shift":
-						modkeys = append(modkeys, hotkey.ModShift)
-					}
-				}
+	pressedKeys := map[string]bool{}
+	for _, key := range config.HotkeyConfig.Modkeys {
+		pressedKeys[key] = true
+	}
+	for _, mod := range []string{"ctrl", "alt", "shift"} {
+		if pressedKeys[mod] {
+			switch mod {
+			case "ctrl":
+				modkeys = append(modkeys, hotkey.ModCtrl)
+			case "alt":
+				modkeys = append(modkeys, hotkey.ModAlt)
+			case "shift":
+				modkeys = append(modkeys, hotkey.ModShift)
 			}
 		}
-	}()
-	fmt.Printf("Recording started. Press %s to stop\n", ternary(config.HotkeyConfig == nil, strings.Join([]string{"ctrl", "alt", "3"}, "+"), strings.Join(append(config.HotkeyConfig.Modkeys, config.HotkeyConfig.Finalkey), "+")))
+	}
+	fmt.Printf("Recording started. Press %s to stop\n", strings.Join(append(config.HotkeyConfig.Modkeys, config.HotkeyConfig.Finalkey), "+"))
 	tickStop := make(chan struct{})
 	ticker := time.NewTicker(time.Second)
 	defer ticker.Stop()
 	i := 0
 	last := []string{"🔴", "⚫"}
-	func() {
+	go func() {
 		for {
 			select {
 			case <-ticker.C:
@@ -199,7 +133,7 @@ func RecordDisplay() {
 			}
 		}
 	}()
-	hk := hotkey.New(modkeys, ternary(config.HotkeyConfig == nil, hotkey.Key3, keys[config.HotkeyConfig.Finalkey]))
+	hk := hotkey.New(modkeys, keys[config.HotkeyConfig.Finalkey])
 	err = hk.Register()
 	if err != nil {
 		fmt.Println("Error registering hotkey:", err)
@@ -208,10 +142,10 @@ func RecordDisplay() {
 	defer hk.Unregister()
 	keyChan := hk.Keydown()
 	for range keyChan {
-		fmt.Println("\nStopping recording...")
+		tickStop <- struct{}{}
 		stdin.Write([]byte("q"))
 		stdin.Close()
-		tickStop <- struct{}{}
+		fmt.Println("\nStopping recording...")
 		notification := toast.Notification{
 			AppID:               "Captr",
 			Title:               "Recording Stopped",