Joakim
1fa607c47c
- Auto-derive site_id from demo directory paths (demos/demo-site -> 'demo', demos/simple/test-simple -> 'simple') - Add validation requiring explicit site_id for non-demo paths with helpful error messages - Remove JavaScript 'demo' fallback and add proper error messaging for missing site_id - Ensure each demo site uses isolated content namespace to prevent content mixing Resolves issue where /sites/simple and /sites/demo both used site_id=demo
110 lines
3.1 KiB
Go
110 lines
3.1 KiB
Go
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
"log"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/viper"
|
|
|
|
"github.com/insertr/insertr/internal/content"
|
|
"github.com/insertr/insertr/internal/db"
|
|
"github.com/insertr/insertr/internal/engine"
|
|
)
|
|
|
|
var enhanceCmd = &cobra.Command{
|
|
Use: "enhance [input-dir]",
|
|
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.`,
|
|
Args: cobra.ExactArgs(1),
|
|
Run: runEnhance,
|
|
}
|
|
|
|
var (
|
|
outputDir string
|
|
)
|
|
|
|
func init() {
|
|
enhanceCmd.Flags().StringVarP(&outputDir, "output", "o", "./dist", "Output directory for enhanced files")
|
|
|
|
// Bind flags to viper
|
|
viper.BindPFlag("cli.output", enhanceCmd.Flags().Lookup("output"))
|
|
}
|
|
|
|
func runEnhance(cmd *cobra.Command, args []string) {
|
|
inputDir := args[0]
|
|
|
|
// Validate input directory
|
|
if _, err := os.Stat(inputDir); os.IsNotExist(err) {
|
|
log.Fatalf("Input directory does not exist: %s", inputDir)
|
|
}
|
|
|
|
// Get configuration values
|
|
dbPath := viper.GetString("database.path")
|
|
apiURL := viper.GetString("api.url")
|
|
apiKey := viper.GetString("api.key")
|
|
siteID := viper.GetString("cli.site_id")
|
|
outputDir := viper.GetString("cli.output")
|
|
|
|
// Auto-derive site_id for demo paths or validate for production
|
|
if strings.Contains(inputDir, "/demos/") {
|
|
// Auto-derive site_id from demo path
|
|
siteID = content.DeriveOrValidateSiteID(inputDir, siteID)
|
|
} else {
|
|
// Validate site_id for non-demo paths
|
|
if siteID == "" || 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 engine.ContentClient
|
|
if apiURL != "" {
|
|
fmt.Printf("🌐 Using content API: %s\n", apiURL)
|
|
client = content.NewHTTPClient(apiURL, apiKey)
|
|
} else if dbPath != "" {
|
|
fmt.Printf("🗄️ Using database: %s\n", dbPath)
|
|
database, err := db.NewDatabase(dbPath)
|
|
if err != nil {
|
|
log.Fatalf("Failed to initialize database: %v", err)
|
|
}
|
|
defer database.Close()
|
|
client = content.NewDatabaseClient(database)
|
|
} else {
|
|
fmt.Printf("🧪 No database or API configured, using mock content\n")
|
|
client = content.NewMockClient()
|
|
}
|
|
|
|
// Create enhancer
|
|
enhancer := content.NewDefaultEnhancer(client, siteID)
|
|
|
|
fmt.Printf("🚀 Starting enhancement process...\n")
|
|
fmt.Printf("📁 Input: %s\n", inputDir)
|
|
fmt.Printf("📁 Output: %s\n", outputDir)
|
|
fmt.Printf("🏷️ Site ID: %s\n\n", siteID)
|
|
|
|
// Enhance directory
|
|
if err := enhancer.EnhanceDirectory(inputDir, outputDir); err != nil {
|
|
log.Fatalf("Enhancement failed: %v", err)
|
|
}
|
|
|
|
fmt.Printf("\n✅ Enhancement complete! Enhanced files available in: %s\n", outputDir)
|
|
}
|