feat(cli): initialize content filtering in main application

commit: eff419b7ee5db065466b67b5acf44dd60e83fee0
author: brice · 10mo ago · 2025-12-18 18:02 UTC
committer: brice · 10mo ago · 2025-12-18 18:51 UTC
parent: 5f7dbbb
signature: unsigned

1 file · +25 -0

M cmd/dumber/main.go +25 -0


@@ -14,6 +14,7 @@ import (
14	14		"github.com/bnema/dumber/internal/infrastructure/clipboard"
15	15		"github.com/bnema/dumber/internal/infrastructure/config"
16	16		"github.com/bnema/dumber/internal/infrastructure/favicon"
	17	+	"github.com/bnema/dumber/internal/infrastructure/filtering"
17	18		"github.com/bnema/dumber/internal/infrastructure/media"
18	19		"github.com/bnema/dumber/internal/infrastructure/persistence/sqlite"
19	20		"github.com/bnema/dumber/internal/infrastructure/webkit"

@@ -150,6 +151,24 @@ func runGUI() {
150	151		logger.Fatal().Err(err).Msg("failed to initialize WebKit context")
151	152		}
152	153
	154	+	// Content filtering (ad blocking)
	155	+	filterStoreDir := filepath.Join(dataDir, "filters", "store")
	156	+	filterJSONDir := filepath.Join(dataDir, "filters", "json")
	157	+	filterManager, err := filtering.NewManager(filtering.ManagerConfig{
	158	+	StoreDir: filterStoreDir,
	159	+	JSONDir: filterJSONDir,
	160	+	Enabled: cfg.ContentFiltering.Enabled,
	161	+	AutoUpdate: cfg.ContentFiltering.AutoUpdate,
	162	+	})
	163	+	if err != nil {
	164	+	logger.Warn().Err(err).Msg("failed to create filter manager, continuing without content filtering")
	165	+	} else {
	166	+	// Fast init: load compiled filters if cached
	167	+	if err := filterManager.Initialize(ctx); err != nil {
	168	+	logger.Warn().Err(err).Msg("failed to initialize filters, will load async")
	169	+	}
	170	+	}
	171	+
153	172		// Register dumb:// scheme handler for serving embedded webui
154	173		schemeHandler := webkit.NewDumbSchemeHandler(ctx)
155	174		schemeHandler.SetAssets(assets.WebUIAssets)

@@ -169,6 +188,11 @@ func runGUI() {
169	188		poolCfg := webkit.DefaultPoolConfig()
170	189		pool := webkit.NewWebViewPool(ctx, wkCtx, settings, poolCfg, injector, messageRouter)
171	190
	191	+	// Set filter applier on the pool if filtering is enabled
	192	+	if filterManager != nil {
	193	+	pool.SetFilterApplier(filterManager)
	194	+	}
	195	+
172	196		// Create use cases
173	197		idCounter := uint64(0)
174	198		idGenerator := func() string {

@@ -214,6 +238,7 @@ func runGUI() {
214	238		// Infrastructure Adapters
215	239		Clipboard: clipboardAdapter,
216	240		FaviconService: faviconService,
	241	+	FilterManager: filterManager,
217	242		}
218	243
219	244		// Run the application


@@ -14,6 +14,7 @@ import (
14	"github.com/bnema/dumber/internal/infrastructure/clipboard"	14		"github.com/bnema/dumber/internal/infrastructure/clipboard"
15	"github.com/bnema/dumber/internal/infrastructure/config"	15		"github.com/bnema/dumber/internal/infrastructure/config"
16	"github.com/bnema/dumber/internal/infrastructure/favicon"	16		"github.com/bnema/dumber/internal/infrastructure/favicon"
		17	+	"github.com/bnema/dumber/internal/infrastructure/filtering"
17	"github.com/bnema/dumber/internal/infrastructure/media"	18		"github.com/bnema/dumber/internal/infrastructure/media"
18	"github.com/bnema/dumber/internal/infrastructure/persistence/sqlite"	19		"github.com/bnema/dumber/internal/infrastructure/persistence/sqlite"
19	"github.com/bnema/dumber/internal/infrastructure/webkit"	20		"github.com/bnema/dumber/internal/infrastructure/webkit"

@@ -150,6 +151,24 @@ func runGUI() {
150	logger.Fatal().Err(err).Msg("failed to initialize WebKit context")	151		logger.Fatal().Err(err).Msg("failed to initialize WebKit context")
151	}	152		}
152		153
		154	+	// Content filtering (ad blocking)
		155	+	filterStoreDir := filepath.Join(dataDir, "filters", "store")
		156	+	filterJSONDir := filepath.Join(dataDir, "filters", "json")
		157	+	filterManager, err := filtering.NewManager(filtering.ManagerConfig{
		158	+	StoreDir: filterStoreDir,
		159	+	JSONDir: filterJSONDir,
		160	+	Enabled: cfg.ContentFiltering.Enabled,
		161	+	AutoUpdate: cfg.ContentFiltering.AutoUpdate,
		162	+	})
		163	+	if err != nil {
		164	+	logger.Warn().Err(err).Msg("failed to create filter manager, continuing without content filtering")
		165	+	} else {
		166	+	// Fast init: load compiled filters if cached
		167	+	if err := filterManager.Initialize(ctx); err != nil {
		168	+	logger.Warn().Err(err).Msg("failed to initialize filters, will load async")
		169	+	}
		170	+	}
		171	+
153	// Register dumb:// scheme handler for serving embedded webui	172		// Register dumb:// scheme handler for serving embedded webui
154	schemeHandler := webkit.NewDumbSchemeHandler(ctx)	173		schemeHandler := webkit.NewDumbSchemeHandler(ctx)
155	schemeHandler.SetAssets(assets.WebUIAssets)	174		schemeHandler.SetAssets(assets.WebUIAssets)

@@ -169,6 +188,11 @@ func runGUI() {
169	poolCfg := webkit.DefaultPoolConfig()	188		poolCfg := webkit.DefaultPoolConfig()
170	pool := webkit.NewWebViewPool(ctx, wkCtx, settings, poolCfg, injector, messageRouter)	189		pool := webkit.NewWebViewPool(ctx, wkCtx, settings, poolCfg, injector, messageRouter)
171		190
		191	+	// Set filter applier on the pool if filtering is enabled
		192	+	if filterManager != nil {
		193	+	pool.SetFilterApplier(filterManager)
		194	+	}
		195	+
172	// Create use cases	196		// Create use cases
173	idCounter := uint64(0)	197		idCounter := uint64(0)
174	idGenerator := func() string {	198		idGenerator := func() string {

@@ -214,6 +238,7 @@ func runGUI() {
214	// Infrastructure Adapters	238		// Infrastructure Adapters
215	Clipboard: clipboardAdapter,	239		Clipboard: clipboardAdapter,
216	FaviconService: faviconService,	240		FaviconService: faviconService,
		241	+	FilterManager: filterManager,
217	}	242		}
218		243
219	// Run the application	244		// Run the application