Merge branch 'fix/logbug' into master

This commit is contained in:
ᴍᴏᴏɴD4ʀᴋ
2022-10-24 14:04:12 +08:00
committed by GitHub
14 changed files with 151 additions and 148 deletions
+5 -8
View File
@@ -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)
}