Files
insertr/cmd/enhance.go
Joakim dbdd4361b7 Refactor architecture: eliminate auto-discovery and consolidate packages
- Remove auto-discovery entirely (~450 lines)
  * Delete internal/content/discoverer.go
  * Simplify enhancer to single-phase processing
  * Remove duplicate container expansion logic

- Consolidate repository implementations
  * Move internal/content/client.go → internal/db/http_client.go
  * Group all repository implementations in db/ package

- Add file utilities to engine following Go stdlib patterns
  * Add engine.ProcessFile() and ProcessDirectory() methods
  * Engine now handles both content processing AND file operations

- Move site management to dedicated package
  * Move internal/content/site_manager.go → internal/sites/manager.go
  * Clear separation of site lifecycle from content processing

- Preserve container expansion (syntactic sugar)
  * .insertr on containers still auto-applies to viable children
  * Container detection logic consolidated in engine/utils.go

Result: Clean architecture with single source of truth for .insertr processing
2025-10-19 22:37:26 +02:00

165 lines
5.0 KiB
Go

package cmd
import (
"fmt"
"log"
"os"
"path/filepath"
"strings"
"github.com/spf13/cobra"
"github.com/insertr/insertr/internal/config"
"github.com/insertr/insertr/internal/content"
"github.com/insertr/insertr/internal/db"
)
var enhanceCmd = &cobra.Command{
Use: "enhance [input-path]",
Short: "Enhance HTML files by injecting content from database",
Long: `Enhance processes HTML files and injects latest content from the database
while adding editing capabilities. This is the core build-time enhancement
process that transforms static HTML into an editable CMS.
The input can be either a directory (to enhance all HTML files) or a single
HTML file. Non-HTML files in directories are copied as-is.`,
Args: cobra.ExactArgs(1),
Run: runEnhance,
}
var (
outputDir string
)
func init() {
enhanceCmd.Flags().StringVarP(&outputDir, "output", "o", "./dist", "Output directory for enhanced files")
}
func runEnhance(cmd *cobra.Command, args []string) {
inputPath := args[0]
// Validate input path and determine if it's a file or directory
inputStat, err := os.Stat(inputPath)
if os.IsNotExist(err) {
log.Fatalf("Input path does not exist: %s", inputPath)
}
if err != nil {
log.Fatalf("Error accessing input path: %v", err)
}
isFile := !inputStat.IsDir()
if isFile {
// Validate that single files are HTML files
if !strings.HasSuffix(strings.ToLower(inputPath), ".html") {
log.Fatalf("Single file input must be an HTML file (.html extension): %s", inputPath)
}
}
// Load configuration
cfg, err := loadConfig()
if err != nil {
log.Fatalf("Failed to load configuration: %v", err)
}
// Override with flags if provided
if outputDir != "" {
// No output config in main config, use the flag value directly
} else {
outputDir = "./dist" // default
}
// Auto-derive site_id for demo paths or validate for production
if strings.Contains(inputPath, "/demos/") || strings.Contains(inputPath, "./demos/") {
// Auto-derive site_id from demo path
cfg.CLI.SiteID = content.DeriveOrValidateSiteID(inputPath, cfg.CLI.SiteID)
} else {
// Validate site_id for non-demo paths
if cfg.CLI.SiteID == "" || cfg.CLI.SiteID == "demo" {
log.Fatalf(`❌ site_id must be explicitly configured for non-demo sites.
💡 Examples:
# Set via command line:
insertr enhance --site-id mysite /path/to/site
# Set in insertr.yaml:
cli:
site_id: "mysite"
# Set via environment:
INSERTR_CLI_SITE_ID=mysite insertr enhance /path/to/site
🚀 For demo sites under demos/, site_id is auto-derived from the directory name.`)
}
}
// Create content client
var client db.ContentRepository
if cfg.API.URL != "" {
fmt.Printf("🌐 Using content API: %s\n", cfg.API.URL)
client = db.NewHTTPClient(cfg.API.URL, cfg.API.Key)
} else if cfg.Database.Path != "" {
fmt.Printf("🗄️ Using database: %s\n", cfg.Database.Path)
database, err := db.NewDatabase(cfg.Database.Path)
if err != nil {
log.Fatalf("Failed to initialize database: %v", err)
}
defer database.Close()
client = database.NewContentRepository()
} else {
panic("🧪 No database or API configured\n")
}
// Load site-specific configuration
enhancementConfig := content.EnhancementConfig{
Discovery: config.DiscoveryConfig{
Enabled: false, // Default: disabled for explicit class="insertr" markings only
Aggressive: false,
Containers: true,
Individual: true,
},
ContentInjection: true,
GenerateIDs: true,
}
// Override with site-specific discovery config if available
for _, site := range cfg.Server.Sites {
if site.SiteID == cfg.CLI.SiteID && site.Discovery != nil {
enhancementConfig.Discovery.Enabled = site.Discovery.Enabled
enhancementConfig.Discovery.Aggressive = site.Discovery.Aggressive
enhancementConfig.Discovery.Containers = site.Discovery.Containers
enhancementConfig.Discovery.Individual = site.Discovery.Individual
fmt.Printf("🔧 Site '%s': discovery.enabled=%v\n", cfg.CLI.SiteID, site.Discovery.Enabled)
break
}
}
// Create enhancer with loaded configuration
enhancer := content.NewEnhancer(client, cfg.CLI.SiteID, enhancementConfig)
fmt.Printf("🚀 Starting enhancement process...\n")
fmt.Printf("📁 Input: %s\n", inputPath)
fmt.Printf("📁 Output: %s\n", outputDir)
fmt.Printf("🏷️ Site ID: %s\n\n", cfg.CLI.SiteID)
// Enhance based on input type
if isFile {
// For single files, determine the output file path
outputFilePath := outputDir
if stat, err := os.Stat(outputDir); err == nil && stat.IsDir() {
// Output is a directory, use input filename in output directory
outputFilePath = filepath.Join(outputDir, filepath.Base(inputPath))
}
// If output doesn't exist or is a file, use it as-is as the output file path
if err := enhancer.EnhanceFile(inputPath, outputFilePath); err != nil {
log.Fatalf("Enhancement failed: %v", err)
}
} else {
if err := enhancer.EnhanceDirectory(inputPath, outputDir); err != nil {
log.Fatalf("Enhancement failed: %v", err)
}
}
fmt.Printf("\n✅ Enhancement complete! Enhanced files available in: %s\n", outputDir)
}