Implement unified Discoverer + Enhancer architecture
- Rename AutoEnhancer to Discoverer with clear element discovery focus - Implement unified enhancement pipeline in Enhancer: * Phase 1: Element Discovery (configurable, respects existing insertr classes) * Phase 2: ID Generation via engine * Phase 3: Content Injection via engine - Add EnhancementConfig and DiscoveryConfig for flexible configuration - Update all method names and references (discoverNode, DiscoveryResult, etc.) - Support both manual class insertion and automatic discovery - Maintain single enhance command interface while providing unified internal pipeline - Update all constructors to use new configuration-based approach This establishes the clean Discoverer + Enhancer architecture discussed, with discovery as configurable first phase and enhancement as unified pipeline.
This commit is contained in:
@@ -2,49 +2,93 @@ package content
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"golang.org/x/net/html"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/insertr/insertr/internal/engine"
|
||||
)
|
||||
|
||||
// Enhancer combines parsing and content injection using unified engine
|
||||
// EnhancementConfig configures the enhancement pipeline
|
||||
type EnhancementConfig struct {
|
||||
Discovery DiscoveryConfig
|
||||
ContentInjection bool
|
||||
GenerateIDs bool
|
||||
}
|
||||
|
||||
// DiscoveryConfig configures element discovery
|
||||
type DiscoveryConfig struct {
|
||||
Enabled bool
|
||||
Aggressive bool
|
||||
Containers bool
|
||||
Individual bool
|
||||
}
|
||||
|
||||
// Enhancer combines discovery, ID generation, and content injection in unified pipeline
|
||||
type Enhancer struct {
|
||||
engine *engine.ContentEngine
|
||||
// injector functionality will be integrated into engine
|
||||
engine *engine.ContentEngine
|
||||
discoverer *Discoverer
|
||||
config EnhancementConfig
|
||||
siteID string
|
||||
}
|
||||
|
||||
// NewEnhancer creates a new HTML enhancer using unified engine
|
||||
func NewEnhancer(client engine.ContentClient, siteID string) *Enhancer {
|
||||
// Create database client for engine
|
||||
var engineClient engine.ContentClient
|
||||
if dbClient, ok := client.(*DatabaseClient); ok {
|
||||
engineClient = engine.NewDatabaseClient(dbClient.db)
|
||||
} else {
|
||||
// For non-database clients, we'll implement proper handling later
|
||||
engineClient = engine.NewDatabaseClient(nil) // This will need to be fixed
|
||||
}
|
||||
|
||||
// NewEnhancer creates a new HTML enhancer with unified pipeline
|
||||
func NewEnhancer(client engine.ContentClient, siteID string, config EnhancementConfig) *Enhancer {
|
||||
return &Enhancer{
|
||||
engine: engine.NewContentEngine(engineClient),
|
||||
engine: engine.NewContentEngine(client),
|
||||
discoverer: NewDiscoverer(),
|
||||
config: config,
|
||||
siteID: siteID,
|
||||
}
|
||||
}
|
||||
|
||||
// EnhanceFile processes an HTML file and injects content
|
||||
func (e *Enhancer) EnhanceFile(inputPath, outputPath string) error {
|
||||
// TODO: Implement with unified engine
|
||||
// For now, just copy the file to maintain functionality
|
||||
return e.copyFile(inputPath, outputPath)
|
||||
// NewDefaultEnhancer creates an enhancer with default configuration
|
||||
func NewDefaultEnhancer(client engine.ContentClient, siteID string) *Enhancer {
|
||||
defaultConfig := EnhancementConfig{
|
||||
Discovery: DiscoveryConfig{
|
||||
Enabled: true,
|
||||
Aggressive: false,
|
||||
Containers: true,
|
||||
Individual: true,
|
||||
},
|
||||
ContentInjection: true,
|
||||
GenerateIDs: true,
|
||||
}
|
||||
return NewEnhancer(client, siteID, defaultConfig)
|
||||
}
|
||||
|
||||
// EnhanceDirectory processes all HTML files in a directory
|
||||
// EnhanceFile processes a single HTML file through the complete pipeline
|
||||
func (e *Enhancer) EnhanceFile(inputPath, outputPath string) error {
|
||||
// Read HTML file
|
||||
htmlContent, err := os.ReadFile(inputPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("reading file %s: %w", inputPath, err)
|
||||
}
|
||||
|
||||
// Process through unified pipeline
|
||||
processedHTML, err := e.processHTML(htmlContent, filepath.Base(inputPath))
|
||||
if err != nil {
|
||||
return fmt.Errorf("processing HTML %s: %w", inputPath, err)
|
||||
}
|
||||
|
||||
// Create output directory
|
||||
if err := os.MkdirAll(filepath.Dir(outputPath), 0755); err != nil {
|
||||
return fmt.Errorf("creating output directory: %w", err)
|
||||
}
|
||||
|
||||
// Write processed HTML
|
||||
return os.WriteFile(outputPath, processedHTML, 0644)
|
||||
}
|
||||
|
||||
// EnhanceDirectory processes all files in a directory through the unified pipeline
|
||||
func (e *Enhancer) EnhanceDirectory(inputDir, outputDir string) error {
|
||||
// Create output directory
|
||||
if err := os.MkdirAll(outputDir, 0755); err != nil {
|
||||
return fmt.Errorf("creating output directory: %w", err)
|
||||
}
|
||||
|
||||
// Walk input directory and copy files for now
|
||||
// Walk input directory
|
||||
return filepath.Walk(inputDir, func(path string, info os.FileInfo, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -62,16 +106,96 @@ func (e *Enhancer) EnhanceDirectory(inputDir, outputDir string) error {
|
||||
return os.MkdirAll(outputPath, info.Mode())
|
||||
}
|
||||
|
||||
// Copy files (HTML processing will be implemented later)
|
||||
// Process HTML files through enhancement pipeline
|
||||
if strings.HasSuffix(strings.ToLower(path), ".html") {
|
||||
return e.EnhanceFile(path, outputPath)
|
||||
}
|
||||
|
||||
// Copy non-HTML files as-is
|
||||
return e.copyFile(path, outputPath)
|
||||
})
|
||||
}
|
||||
|
||||
// processHTML implements the unified enhancement pipeline
|
||||
func (e *Enhancer) processHTML(htmlContent []byte, filePath string) ([]byte, error) {
|
||||
var processedHTML []byte = htmlContent
|
||||
|
||||
// Phase 1: Element Discovery (if enabled)
|
||||
if e.config.Discovery.Enabled {
|
||||
discoveredHTML, err := e.discoverElements(processedHTML, filePath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("element discovery: %w", err)
|
||||
}
|
||||
processedHTML = discoveredHTML
|
||||
}
|
||||
|
||||
// Phase 2 & 3: ID Generation + Content Injection (via engine)
|
||||
if e.config.GenerateIDs || e.config.ContentInjection {
|
||||
enhancedHTML, err := e.enhanceWithEngine(processedHTML, filePath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("engine enhancement: %w", err)
|
||||
}
|
||||
processedHTML = enhancedHTML
|
||||
}
|
||||
|
||||
return processedHTML, nil
|
||||
}
|
||||
|
||||
// discoverElements adds insertr classes to viable elements
|
||||
func (e *Enhancer) discoverElements(htmlContent []byte, filePath string) ([]byte, error) {
|
||||
// Parse HTML
|
||||
doc, err := html.Parse(strings.NewReader(string(htmlContent)))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("parsing HTML: %w", err)
|
||||
}
|
||||
|
||||
// Find and mark viable elements
|
||||
result := &FileDiscoveryResult{Document: doc}
|
||||
e.discoverer.discoverNode(doc, result, e.config.Discovery.Aggressive)
|
||||
|
||||
// Render back to HTML
|
||||
var buf strings.Builder
|
||||
if err := html.Render(&buf, doc); err != nil {
|
||||
return nil, fmt.Errorf("rendering HTML: %w", err)
|
||||
}
|
||||
|
||||
return []byte(buf.String()), nil
|
||||
}
|
||||
|
||||
// enhanceWithEngine uses the unified engine for ID generation and content injection
|
||||
func (e *Enhancer) enhanceWithEngine(htmlContent []byte, filePath string) ([]byte, error) {
|
||||
// Determine processing mode
|
||||
var mode engine.ProcessMode
|
||||
if e.config.ContentInjection {
|
||||
mode = engine.Enhancement // ID generation + content injection
|
||||
} else {
|
||||
mode = engine.IDGeneration // ID generation only
|
||||
}
|
||||
|
||||
// Process with engine
|
||||
result, err := e.engine.ProcessContent(engine.ContentInput{
|
||||
HTML: htmlContent,
|
||||
FilePath: filePath,
|
||||
SiteID: e.siteID,
|
||||
Mode: mode,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("engine processing: %w", err)
|
||||
}
|
||||
|
||||
// Render enhanced document
|
||||
var buf strings.Builder
|
||||
if err := html.Render(&buf, result.Document); err != nil {
|
||||
return nil, fmt.Errorf("rendering enhanced HTML: %w", err)
|
||||
}
|
||||
|
||||
return []byte(buf.String()), nil
|
||||
}
|
||||
|
||||
// EnhanceInPlace performs in-place enhancement of static site files
|
||||
func (e *Enhancer) EnhanceInPlace(sitePath string, siteID string) error {
|
||||
// TODO: Implement with unified engine
|
||||
// For now, just log that enhancement was requested
|
||||
fmt.Printf("📄 Enhancement requested for site %s at %s (stub implementation)\n", siteID, sitePath)
|
||||
// TODO: Implement in-place enhancement using the unified pipeline
|
||||
fmt.Printf("📄 Enhancement requested for site %s at %s (unified pipeline implementation needed)\n", siteID, sitePath)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user