fix: filter result if exported data is empty

pull/144/head
ᴍᴏᴏɴD4ʀᴋ 2 years ago
parent d1ae09d9e4
commit 7b8e2a3fd2
  1. 22
      internal/browingdata/bookmark/bookmark.go
  2. 6
      internal/browingdata/browsingdata.go
  3. 8
      internal/browingdata/cookie/cookie.go
  4. 8
      internal/browingdata/creditcard/creditcard.go
  5. 8
      internal/browingdata/download/download.go
  6. 8
      internal/browingdata/extension/extension.go
  7. 8
      internal/browingdata/history/history.go
  8. 8
      internal/browingdata/localstorage/localstorage.go
  9. 20
      internal/browingdata/password/password.go

@ -76,10 +76,23 @@ func getBookmarkChildren(value gjson.Result, w *ChromiumBookmark) (children gjso
return children return children
} }
func bookmarkType(a int64) string {
switch a {
case 1:
return "url"
default:
return "folder"
}
}
func (c *ChromiumBookmark) Name() string { func (c *ChromiumBookmark) Name() string {
return "bookmark" return "bookmark"
} }
func (c *ChromiumBookmark) Length() int {
return len(*c)
}
type FirefoxBookmark []bookmark type FirefoxBookmark []bookmark
const ( const (
@ -134,11 +147,6 @@ func (f *FirefoxBookmark) Name() string {
return "bookmark" return "bookmark"
} }
func bookmarkType(a int64) string { func (f *FirefoxBookmark) Length() int {
switch a { return len(*f)
case 1:
return "url"
default:
return "folder"
}
} }

@ -24,6 +24,8 @@ type Source interface {
Parse(masterKey []byte) error Parse(masterKey []byte) error
Name() string Name() string
Length() int
} }
func New(sources []item.Item) *Data { func New(sources []item.Item) *Data {
@ -47,6 +49,10 @@ func (d *Data) Output(dir, browserName, flag string) {
output := NewOutPutter(flag) output := NewOutPutter(flag)
for _, source := range d.sources { for _, source := range d.sources {
if source.Length() == 0 {
// if the length of the export data is 0, then it is not necessary to output
continue
}
filename := fileutil.Filename(browserName, source.Name(), output.Ext()) filename := fileutil.Filename(browserName, source.Name(), output.Ext())
f, err := output.CreateFile(dir, filename) f, err := output.CreateFile(dir, filename)

@ -93,6 +93,10 @@ func (c *ChromiumCookie) Name() string {
return "cookie" return "cookie"
} }
func (c *ChromiumCookie) Length() int {
return len(*c)
}
type FirefoxCookie []cookie type FirefoxCookie []cookie
const ( const (
@ -137,3 +141,7 @@ func (f *FirefoxCookie) Parse(masterKey []byte) error {
func (f *FirefoxCookie) Name() string { func (f *FirefoxCookie) Name() string {
return "cookie" return "cookie"
} }
func (f *FirefoxCookie) Length() int {
return len(*f)
}

@ -76,6 +76,10 @@ func (c *ChromiumCreditCard) Name() string {
return "creditcard" return "creditcard"
} }
func (c *ChromiumCreditCard) Length() int {
return len(*c)
}
type YandexCreditCard []card type YandexCreditCard []card
func (c *YandexCreditCard) Parse(masterKey []byte) error { func (c *YandexCreditCard) Parse(masterKey []byte) error {
@ -127,3 +131,7 @@ func (c *YandexCreditCard) Parse(masterKey []byte) error {
func (c *YandexCreditCard) Name() string { func (c *YandexCreditCard) Name() string {
return "creditcard" return "creditcard"
} }
func (c *YandexCreditCard) Length() int {
return len(*c)
}

@ -70,6 +70,10 @@ func (c *ChromiumDownload) Name() string {
return "download" return "download"
} }
func (c *ChromiumDownload) Length() int {
return len(*c)
}
type FirefoxDownload []download type FirefoxDownload []download
const ( const (
@ -131,3 +135,7 @@ func (f *FirefoxDownload) Parse(masterKey []byte) error {
func (f *FirefoxDownload) Name() string { func (f *FirefoxDownload) Name() string {
return "download" return "download"
} }
func (f *FirefoxDownload) Length() int {
return len(*f)
}

@ -50,6 +50,10 @@ func (c *ChromiumExtension) Name() string {
return "extension" return "extension"
} }
func (c *ChromiumExtension) Length() int {
return len(*c)
}
type FirefoxExtension []*extension type FirefoxExtension []*extension
func (f *FirefoxExtension) Parse(masterKey []byte) error { func (f *FirefoxExtension) Parse(masterKey []byte) error {
@ -73,3 +77,7 @@ func (f *FirefoxExtension) Parse(masterKey []byte) error {
func (f *FirefoxExtension) Name() string { func (f *FirefoxExtension) Name() string {
return "extension" return "extension"
} }
func (f *FirefoxExtension) Length() int {
return len(*f)
}

@ -65,6 +65,10 @@ func (c *ChromiumHistory) Name() string {
return "history" return "history"
} }
func (c *ChromiumHistory) Length() int {
return len(*c)
}
type FirefoxHistory []history type FirefoxHistory []history
const ( const (
@ -119,3 +123,7 @@ func (f *FirefoxHistory) Parse(masterKey []byte) error {
func (f *FirefoxHistory) Name() string { func (f *FirefoxHistory) Name() string {
return "history" return "history"
} }
func (f *FirefoxHistory) Length() int {
return len(*f)
}

@ -58,6 +58,10 @@ func (c *ChromiumLocalStorage) Name() string {
return "localStorage" return "localStorage"
} }
func (c *ChromiumLocalStorage) Length() int {
return len(*c)
}
func (s *storage) fillKey(b []byte) { func (s *storage) fillKey(b []byte) {
keys := bytes.Split(b, []byte("\x00")) keys := bytes.Split(b, []byte("\x00"))
if len(keys) == 1 && bytes.HasPrefix(keys[0], []byte("META:")) { if len(keys) == 1 && bytes.HasPrefix(keys[0], []byte("META:")) {
@ -142,3 +146,7 @@ func (s *storage) fillFirefox(originKey, key, value string) {
func (f *FirefoxLocalStorage) Name() string { func (f *FirefoxLocalStorage) Name() string {
return "localStorage" return "localStorage"
} }
func (f *FirefoxLocalStorage) Length() int {
return len(*f)
}

@ -90,6 +90,10 @@ func (c *ChromiumPassword) Name() string {
return "password" return "password"
} }
func (c *ChromiumPassword) Length() int {
return len(*c)
}
type YandexPassword []loginData type YandexPassword []loginData
const ( const (
@ -154,6 +158,10 @@ func (c *YandexPassword) Name() string {
return "password" return "password"
} }
func (c *YandexPassword) Length() int {
return len(*c)
}
type FirefoxPassword []loginData type FirefoxPassword []loginData
const ( const (
@ -224,10 +232,6 @@ func (f *FirefoxPassword) Parse(masterKey []byte) error {
return nil return nil
} }
func (f *FirefoxPassword) Name() string {
return "password"
}
func getFirefoxDecryptKey(key4file string) (item1, item2, a11, a102 []byte, err error) { func getFirefoxDecryptKey(key4file string) (item1, item2, a11, a102 []byte, err error) {
var keyDB *sql.DB var keyDB *sql.DB
keyDB, err = sql.Open("sqlite3", key4file) keyDB, err = sql.Open("sqlite3", key4file)
@ -278,3 +282,11 @@ func getFirefoxLoginData(loginJson string) (l []loginData, err error) {
} }
return l, nil return l, nil
} }
func (f *FirefoxPassword) Name() string {
return "password"
}
func (f *FirefoxPassword) Length() int {
return len(*f)
}

Loading…
Cancel
Save