feat: wire V2 architecture into CLI entry point (#540)

* feat: wire V2 architecture into CLI entry point
* fix: warn and exit early when no browsers found

browser/browser.go

@@ -1,122 +1,104 @@
 package browser
 
 import (
+	"fmt"
 	"path/filepath"
 	"sort"
 	"strings"
 
 	"github.com/moond4rk/hackbrowserdata/browser/chromium"
 	"github.com/moond4rk/hackbrowserdata/browser/firefox"
-	"github.com/moond4rk/hackbrowserdata/browserdata"
 	"github.com/moond4rk/hackbrowserdata/log"
-	"github.com/moond4rk/hackbrowserdata/utils/fileutil"
-	"github.com/moond4rk/hackbrowserdata/utils/typeutil"
+	"github.com/moond4rk/hackbrowserdata/types"
 )
 
+// Browser is the interface that both chromium.Browser and firefox.Browser implement.
 type Browser interface {
-	// Name is browser's name
-	Name() string
-	// BrowsingData returns all browsing data in the browser.
-	BrowsingData(isFullExport bool) (*browserdata.BrowserData, error)
+	BrowserName() string
+	ProfileName() string
+	Extract(categories []types.Category) (*types.BrowserData, error)
 }
 
-// PickBrowsers returns a list of browsers that match the name and profile.
-func PickBrowsers(name, profile string) ([]Browser, error) {
+// PickBrowsers returns browsers matching the given name.
+// When name is "all", all known browsers are tried.
+// profilePath overrides the default user data directory (only when targeting a specific browser).
+func PickBrowsers(name, profilePath string) ([]Browser, error) {
+	return pickFromConfigs(platformBrowsers(), name, profilePath)
+}
+
+// pickFromConfigs is the testable core of PickBrowsers.
+func pickFromConfigs(configs []types.BrowserConfig, name, profilePath string) ([]Browser, error) {
+	name = strings.ToLower(name)
+
 	var browsers []Browser
-	clist := pickChromium(name, profile)
-	for _, b := range clist {
-		if b != nil {
-			browsers = append(browsers, b)
+	for _, cfg := range configs {
+		if name != "all" && cfg.Key != name {
+			continue
 		}
-	}
-	flist := pickFirefox(name, profile)
-	for _, b := range flist {
-		if b != nil {
-			browsers = append(browsers, b)
+
+		if profilePath != "" && name != "all" {
+			if cfg.Kind == types.KindFirefox {
+				cfg.UserDataDir = filepath.Dir(filepath.Clean(profilePath))
+			} else {
+				cfg.UserDataDir = profilePath
+			}
 		}
+
+		bs, err := newBrowsers(cfg)
+		if err != nil {
+			log.Errorf("browser %s: %v", cfg.Name, err)
+			continue
+		}
+		if len(bs) == 0 {
+			log.Debugf("browser %s not found at %s", cfg.Name, cfg.UserDataDir)
+			continue
+		}
+		browsers = append(browsers, bs...)
 	}
 	return browsers, nil
 }
 
-func pickChromium(name, profile string) []Browser {
-	var browsers []Browser
-	name = strings.ToLower(name)
-	if name == "all" {
-		for _, v := range chromiumList {
-			if !fileutil.IsDirExists(filepath.Clean(v.profilePath)) {
-				log.Warnf("find browser failed, profile folder does not exist, browser %s", v.name)
-				continue
-			}
-			multiChromium, err := chromium.New(v.name, v.storage, v.profilePath, v.dataTypes)
-			if err != nil {
-				log.Errorf("new chromium error %v", err)
-				continue
-			}
-			for _, b := range multiChromium {
-				log.Warnf("find browser success, browser %s", b.Name())
-				browsers = append(browsers, b)
-			}
-		}
-	}
-	if c, ok := chromiumList[name]; ok {
-		if profile == "" {
-			profile = c.profilePath
-		}
-		if !fileutil.IsDirExists(filepath.Clean(profile)) {
-			log.Errorf("find browser failed, profile folder does not exist, browser %s", c.name)
-		}
-		chromes, err := chromium.New(c.name, c.storage, profile, c.dataTypes)
+// newBrowsers dispatches to the correct engine based on BrowserKind.
+func newBrowsers(cfg types.BrowserConfig) ([]Browser, error) {
+	switch cfg.Kind {
+	case types.KindChromium, types.KindChromiumYandex, types.KindChromiumOpera:
+		bs, err := chromium.NewBrowsers(cfg)
 		if err != nil {
-			log.Errorf("new chromium error %v", err)
+			return nil, err
 		}
-		for _, chrome := range chromes {
-			log.Warnf("find browser success, browser %s", chrome.Name())
-			browsers = append(browsers, chrome)
+		browsers := make([]Browser, len(bs))
+		for i, b := range bs {
+			browsers[i] = b
 		}
+		return browsers, nil
+
+	case types.KindFirefox:
+		bs, err := firefox.NewBrowsers(cfg)
+		if err != nil {
+			return nil, err
+		}
+		browsers := make([]Browser, len(bs))
+		for i, b := range bs {
+			browsers[i] = b
+		}
+		return browsers, nil
+
+	default:
+		return nil, fmt.Errorf("unknown browser kind: %d", cfg.Kind)
 	}
-	return browsers
-}
-
-func pickFirefox(name, profile string) []Browser {
-	var browsers []Browser
-	name = strings.ToLower(name)
-	if name == "all" || name == "firefox" {
-		for _, v := range firefoxList {
-			if profile == "" {
-				profile = v.profilePath
-			} else {
-				profile = fileutil.ParentDir(profile)
-			}
-
-			if !fileutil.IsDirExists(filepath.Clean(profile)) {
-				log.Warnf("find browser failed, profile folder does not exist, browser %s", v.name)
-				continue
-			}
-
-			if multiFirefox, err := firefox.New(profile, v.dataTypes); err == nil {
-				for _, b := range multiFirefox {
-					log.Warnf("find browser success, browser %s", b.Name())
-					browsers = append(browsers, b)
-				}
-			} else {
-				log.Errorf("new firefox error %v", err)
-			}
-		}
-
-		return browsers
-	}
-
-	return nil
 }
 
+// ListBrowsers returns sorted keys of all platform browsers.
 func ListBrowsers() []string {
 	var l []string
-	l = append(l, typeutil.Keys(chromiumList)...)
-	l = append(l, typeutil.Keys(firefoxList)...)
+	for _, cfg := range platformBrowsers() {
+		l = append(l, cfg.Key)
+	}
 	sort.Strings(l)
 	return l
 }
 
+// Names returns a pipe-separated list of browser keys for CLI help text.
 func Names() string {
 	return strings.Join(ListBrowsers(), "|")
 }