refactor: format code with interface, Close #22

This commit is contained in:
ᴍᴏᴏɴD4ʀᴋ
2020-08-01 02:36:44 +08:00
parent 5936e17e26
commit 2b2cc13cff
9 changed files with 637 additions and 703 deletions
+30 -46
View File
@@ -3,62 +3,63 @@ package common
import (
"bytes"
"encoding/json"
"errors"
"fmt"
"os"
"sort"
"hack-browser-data/log"
"hack-browser-data/utils"
"github.com/jszwec/csvutil"
)
var (
utf8Bom = []byte{239, 187, 191}
errWriteToFile = errors.New("write to file failed")
utf8Bom = []byte{239, 187, 191}
prefix = "[x]: "
)
func (b *Bookmarks) OutPutJson(browser, dir string) error {
func (b *bookmarks) outPutJson(browser, dir string) error {
filename := utils.FormatFileName(dir, browser, "bookmark", "json")
sort.Slice(b.bookmarks, func(i, j int) bool {
return b.bookmarks[i].ID < b.bookmarks[j].ID
})
err := writeToJson(filename, b.bookmarks)
if err != nil {
log.Error(errWriteToFile)
return err
}
fmt.Printf("%s Get %d bookmarks, filename is %s \n", log.Prefix, len(b.bookmarks), filename)
fmt.Printf("%s Get %d bookmarks, filename is %s \n", prefix, len(b.bookmarks), filename)
return nil
}
func (h *History) OutPutJson(browser, dir string) error {
func (h *historyData) outPutJson(browser, dir string) error {
filename := utils.FormatFileName(dir, browser, "history", "json")
sort.Slice(h.history, func(i, j int) bool {
return h.history[i].VisitCount > h.history[j].VisitCount
})
err := writeToJson(filename, h.history)
if err != nil {
log.Error(errWriteToFile)
return err
}
fmt.Printf("%s Get %d history, filename is %s \n", log.Prefix, len(h.history), filename)
fmt.Printf("%s Get %d history, filename is %s \n", prefix, len(h.history), filename)
return nil
}
func (l *Logins) OutPutJson(browser, dir string) error {
func (p *passwords) outPutJson(browser, dir string) error {
filename := utils.FormatFileName(dir, browser, "password", "json")
err := writeToJson(filename, l.logins)
err := writeToJson(filename, p.logins)
if err != nil {
log.Error(errWriteToFile)
return err
}
fmt.Printf("%s Get %d passwords, filename is %s \n", log.Prefix, len(l.logins), filename)
fmt.Printf("%s Get %d passwords, filename is %s \n", prefix, len(p.logins), filename)
return nil
}
func (c *Cookies) OutPutJson(browser, dir string) error {
func (c *cookies) outPutJson(browser, dir string) error {
filename := utils.FormatFileName(dir, browser, "cookie", "json")
err := writeToJson(filename, c.cookies)
if err != nil {
log.Error(errWriteToFile)
return err
}
fmt.Printf("%s Get %d cookies, filename is %s \n", log.Prefix, len(c.cookies), filename)
fmt.Printf("%s Get %d cookies, filename is %s \n", prefix, len(c.cookies), filename)
return nil
}
@@ -67,69 +68,59 @@ func writeToJson(filename string, data interface{}) error {
if err != nil {
return err
}
defer func() {
if err := f.Close(); err != nil {
log.Error(err)
}
}()
defer f.Close()
w := new(bytes.Buffer)
enc := json.NewEncoder(w)
enc.SetEscapeHTML(false)
enc.SetIndent("", "\t")
err = enc.Encode(data)
if err != nil {
log.Debug(err)
return err
}
_, err = f.Write(w.Bytes())
if err != nil {
log.Error(err)
return err
}
return nil
}
func (b *Bookmarks) OutPutCsv(browser, dir string) error {
func (b *bookmarks) outPutCsv(browser, dir string) error {
filename := utils.FormatFileName(dir, browser, "bookmark", "csv")
if err := writeToCsv(filename, b.bookmarks); err != nil {
log.Error(errWriteToFile)
return err
}
fmt.Printf("%s Get %d bookmarks, filename is %s \n", log.Prefix, len(b.bookmarks), filename)
fmt.Printf("%s Get %d bookmarks, filename is %s \n", prefix, len(b.bookmarks), filename)
return nil
}
func (h *History) OutPutCsv(browser, dir string) error {
func (h *historyData) outPutCsv(browser, dir string) error {
filename := utils.FormatFileName(dir, browser, "history", "csv")
if err := writeToCsv(filename, h.history); err != nil {
log.Error(errWriteToFile)
return err
}
fmt.Printf("%s Get %d history, filename is %s \n", log.Prefix, len(h.history), filename)
fmt.Printf("%s Get %d history, filename is %s \n", prefix, len(h.history), filename)
return nil
}
func (l *Logins) OutPutCsv(browser, dir string) error {
func (p *passwords) outPutCsv(browser, dir string) error {
filename := utils.FormatFileName(dir, browser, "password", "csv")
if err := writeToCsv(filename, l.logins); err != nil {
log.Error(errWriteToFile)
if err := writeToCsv(filename, p.logins); err != nil {
return err
}
fmt.Printf("%s Get %d passwords, filename is %s \n", log.Prefix, len(l.logins), filename)
fmt.Printf("%s Get %d passwords, filename is %s \n", prefix, len(p.logins), filename)
return nil
}
func (c *Cookies) OutPutCsv(browser, dir string) error {
func (c *cookies) outPutCsv(browser, dir string) error {
filename := utils.FormatFileName(dir, browser, "cookie", "csv")
var tempSlice []cookies
var tempSlice []cookie
for _, v := range c.cookies {
tempSlice = append(tempSlice, v...)
}
if err := writeToCsv(filename, tempSlice); err != nil {
log.Error(errWriteToFile)
return err
}
fmt.Printf("%s Get %d cookies, filename is %s \n", log.Prefix, len(c.cookies), filename)
fmt.Printf("%s Get %d cookies, filename is %s \n", prefix, len(c.cookies), filename)
return nil
}
@@ -137,17 +128,11 @@ func writeToCsv(filename string, data interface{}) error {
var d []byte
f, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0644)
if err != nil {
log.Errorf("create file %s fail %s", filename, err)
return err
}
defer func() {
if err := f.Close(); err != nil {
log.Error(err)
}
}()
defer f.Close()
_, err = f.Write(utf8Bom)
if err != nil {
log.Error(err)
return err
}
d, err = csvutil.Marshal(data)
@@ -156,7 +141,6 @@ func writeToCsv(filename string, data interface{}) error {
}
_, err = f.Write(d)
if err != nil {
log.Error(err)
return err
}
return nil