refactor: add provider software folder

cmd/hack-browser-data/main.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"strings"
 
-	"hack-browser-data/internal/browser"
 	"hack-browser-data/internal/log"
+	"hack-browser-data/internal/provider"
 	"hack-browser-data/internal/utils/fileutil"
 
 	"github.com/urfave/cli/v2"
@@ -29,11 +29,11 @@ func Execute() {
 		Name:      "hack-browser-data",
 		Usage:     "Export passwords/cookies/history/bookmarks from browser",
 		UsageText: "[hack-browser-data -b chrome -f json -dir results -cc]\nExport all browingdata(password/cookie/history/bookmark) from browser\nGithub Link: https://github.com/moonD4rk/HackBrowserData",
-		Version:   "0.4.3",
+		Version:   "0.4.4",
 		Flags: []cli.Flag{
 			&cli.BoolFlag{Name: "verbose", Aliases: []string{"vv"}, Destination: &verbose, Value: false, Usage: "verbose"},
 			&cli.BoolFlag{Name: "compress", Aliases: []string{"zip"}, Destination: &compress, Value: false, Usage: "compress result to zip"},
-			&cli.StringFlag{Name: "browser", Aliases: []string{"b"}, Destination: &browserName, Value: "all", Usage: "available browsers: all|" + strings.Join(browser.ListBrowser(), "|")},
+			&cli.StringFlag{Name: "browser", Aliases: []string{"b"}, Destination: &browserName, Value: "all", Usage: "available browsers: all|" + strings.Join(provider.ListBrowsers(), "|")},
 			&cli.StringFlag{Name: "results-dir", Aliases: []string{"dir"}, Destination: &outputDir, Value: "results", Usage: "export dir"},
 			&cli.StringFlag{Name: "format", Aliases: []string{"f"}, Destination: &outputFormat, Value: "csv", Usage: "file name csv|json"},
 			&cli.StringFlag{Name: "profile-path", Aliases: []string{"p"}, Destination: &profilePath, Value: "", Usage: "custom profile dir path, get with chrome://version"},
@@ -45,11 +45,8 @@ func Execute() {
 			} else {
 				log.Init("notice")
 			}
-			var (
-				browsers []browser.Browser
-				err      error
-			)
-			browsers, err = browser.PickBrowser(browserName, profilePath)
+
+			browsers, err := provider.PickBrowsers(browserName, profilePath)
 			if err != nil {
 				log.Error(err)
 			}

internal/browser/browser.go

@@ -0,0 +1,12 @@
+package browser
+
+import (
+	"hack-browser-data/internal/browingdata"
+)
+
+type Browser interface {
+	// Name is browser's name
+	Name() string
+	// BrowsingData returns all browsing data in the browser.
+	BrowsingData() (*browingdata.Data, error)
+}

internal/provider/chromium/chromium.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"hack-browser-data/internal/browingdata"
+	"hack-browser-data/internal/browser"
 	"hack-browser-data/internal/item"
 	"hack-browser-data/internal/utils/fileutil"
 	"hack-browser-data/internal/utils/typeutil"
@@ -21,7 +22,7 @@ type chromium struct {
 }
 
 // New create instance of chromium browser, fill item's path if item is existed.
-func New(name, storage, profilePath string, items []item.Item) ([]*chromium, error) {
+func New(name, storage, profilePath string, items []item.Item) ([]browser.Browser, error) {
 	c := &chromium{
 		name:        name,
 		storage:     storage,
@@ -32,7 +33,7 @@ func New(name, storage, profilePath string, items []item.Item) ([]*chromium, err
 	if err != nil {
 		return nil, err
 	}
-	chromiumList := make([]*chromium, 0, len(multiItemPaths))
+	chromiumList := make([]browser.Browser, 0, len(multiItemPaths))
 	for user, itemPaths := range multiItemPaths {
 		chromiumList = append(chromiumList, &chromium{
 			name:      fileutil.BrowserName(name, user),

internal/provider/firefox/firefox.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 
 	"hack-browser-data/internal/browingdata"
+	"hack-browser-data/internal/browser"
 	"hack-browser-data/internal/item"
 	"hack-browser-data/internal/utils/fileutil"
 	"hack-browser-data/internal/utils/typeutil"
@@ -24,7 +25,7 @@ type firefox struct {
 var ErrProfilePathNotFound = errors.New("profile path not found")
 
 // New returns a new firefox instance.
-func New(name, storage, profilePath string, items []item.Item) ([]*firefox, error) {
+func New(name, storage, profilePath string, items []item.Item) ([]browser.Browser, error) {
 	f := &firefox{
 		name:        name,
 		storage:     storage,
@@ -36,7 +37,7 @@ func New(name, storage, profilePath string, items []item.Item) ([]*firefox, erro
 		return nil, err
 	}
 
-	firefoxList := make([]*firefox, 0, len(multiItemPaths))
+	firefoxList := make([]browser.Browser, 0, len(multiItemPaths))
 	for name, itemPaths := range multiItemPaths {
 		firefoxList = append(firefoxList, &firefox{
 			name:      fmt.Sprintf("firefox-%s", name),

internal/provider/provider.go

@@ -98,7 +98,7 @@ func pickFirefox(name, profile string) []browser.Browser {
 	return nil
 }
 
-func ListBrowser() []string {
+func ListBrowsers() []string {
 	var l []string
 	l = append(l, typeutil.Keys(chromiumList)...)
 	l = append(l, typeutil.Keys(firefoxList)...)