From d1b6ae381cbd339abc67d318d82a081918622f1b Mon Sep 17 00:00:00 2001
From: eyedeekay <hankhill19580@gmail.com>
Date: Fri, 9 May 2025 22:46:45 -0400
Subject: [PATCH] Refine defaults

---
 cmd/github-sync/main.go | 45 -----------------------------------------
 pkg/config/config.go    | 37 ++++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/cmd/github-sync/main.go b/cmd/github-sync/main.go
index bbe8a6c..9b4c4d9 100644
--- a/cmd/github-sync/main.go
+++ b/cmd/github-sync/main.go
@@ -5,9 +5,7 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"os/exec"
 	"os/signal"
-	"strings"
 	"syscall"
 
 	"github.com/go-i2p/go-github-sync/pkg/config"
@@ -57,18 +55,6 @@ func run(ctx context.Context, log *logger.Logger) error {
 	if err != nil {
 		return fmt.Errorf("failed to load configuration: %w", err)
 	}
-
-	// Auto-detect GitHub remote if mirror is not specified
-	if cfg.MirrorRepo == "" {
-		mirrorRepo, err := detectGithubRemote(ctx)
-		if err != nil {
-			log.Debug("Failed to auto-detect GitHub remote", "error", err)
-		} else if mirrorRepo != "" {
-			cfg.MirrorRepo = mirrorRepo
-			log.Info("Auto-detected GitHub mirror repository", "mirror_repo", cfg.MirrorRepo)
-		}
-	}
-
 	log.Info("Configuration loaded successfully",
 		"primary_repo", cfg.PrimaryRepo,
 		"mirror_repo", cfg.MirrorRepo,
@@ -126,34 +112,3 @@ func run(ctx context.Context, log *logger.Logger) error {
 
 	return nil
 }
-
-// detectGithubRemote attempts to detect a GitHub remote URL from the current git repository
-func detectGithubRemote(ctx context.Context) (string, error) {
-	// Execute git remote -v command
-	cmd := exec.CommandContext(ctx, "git", "remote", "-v")
-	output, err := cmd.Output()
-	if err != nil {
-		return "", fmt.Errorf("failed to execute git remote command: %w", err)
-	}
-
-	// Parse the output to find GitHub remotes
-	lines := strings.Split(string(output), "\n")
-	for _, line := range lines {
-		if strings.Contains(line, "github.com") && strings.Contains(line, "(push)") {
-			// Extract the GitHub repository URL
-			parts := strings.Fields(line)
-			if len(parts) >= 2 {
-				url := parts[1]
-				// Convert SSH URL to HTTPS URL if needed
-				if strings.HasPrefix(url, "git@github.com:") {
-					url = strings.Replace(url, "git@github.com:", "https://github.com/", 1)
-				}
-				// Remove .git suffix if present
-				url = strings.TrimSuffix(url, ".git")
-				return url, nil
-			}
-		}
-	}
-
-	return "", fmt.Errorf("no GitHub remote found")
-}
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 6c63699..308bad6 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -4,6 +4,7 @@ package config
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -50,17 +51,16 @@ var (
 // AddFlags adds the configuration flags to the given command.
 func AddFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVarP(&primaryRepo, "primary", "p", "", "Primary repository URL (required)")
-	cmd.Flags().StringVarP(&mirrorRepo, "mirror", "m", "", "GitHub mirror repository URL (required)")
+	cmd.Flags().StringVarP(&mirrorRepo, "mirror", "m", detectGithubRemote(), "GitHub mirror repository URL (required)")
 	cmd.Flags().StringVar(&primaryBranch, "primary-branch", "main", "Primary repository branch name")
 	cmd.Flags().StringVar(&mirrorBranch, "mirror-branch", "main", "GitHub mirror repository branch name")
 	cmd.Flags().StringVarP(&syncInterval, "interval", "i", "hourly", "Sync interval (hourly, daily, weekly)")
 	cmd.Flags().BoolVar(&forceSync, "force", true, "Force sync by overwriting mirror with primary content")
-	cmd.Flags().StringVarP(&outputFile, "output", "o", "", "Output file for workflow YAML (writes to stdout if not specified)")
+	cmd.Flags().StringVarP(&outputFile, "output", "o", ".github/workflows/sync.yaml", "Output file for workflow YAML (writes to stdout if not specified)")
 	cmd.Flags().BoolVar(&setupWorkflow, "setup", false, "Automatically setup the workflow in the GitHub repository")
 	cmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "Enable verbose logging")
 
 	cmd.MarkFlagRequired("primary")
-	cmd.MarkFlagRequired("mirror")
 }
 
 // Load parses the flags and environment variables to build the configuration.
@@ -106,3 +106,34 @@ func Load() (*Config, error) {
 
 	return &config, nil
 }
+
+// detectGithubRemote attempts to detect a GitHub remote URL from the current git repository
+func detectGithubRemote() string {
+	// Execute git remote -v command
+	cmd := exec.Command("git", "remote", "-v")
+	output, err := cmd.Output()
+	if err != nil {
+		return ""
+	}
+
+	// Parse the output to find GitHub remotes
+	lines := strings.Split(string(output), "\n")
+	for _, line := range lines {
+		if strings.Contains(line, "github.com") && strings.Contains(line, "(push)") {
+			// Extract the GitHub repository URL
+			parts := strings.Fields(line)
+			if len(parts) >= 2 {
+				url := parts[1]
+				// Convert SSH URL to HTTPS URL if needed
+				if strings.HasPrefix(url, "git@github.com:") {
+					url = strings.Replace(url, "git@github.com:", "https://github.com/", 1)
+				}
+				// Remove .git suffix if present
+				url = strings.TrimSuffix(url, ".git")
+				return url
+			}
+		}
+	}
+
+	return ""
+}