From ff740d65a7f2020f4b4a0e47f981ef150b03f7af Mon Sep 17 00:00:00 2001 From: Amrit Panesar Date: Tue, 10 Aug 2021 03:15:50 -0700 Subject: [PATCH] add module file, add gob dump example, update the default datetime format --- example/dumper/main.go | 29 +++++++++++++++++++++++++++++ example/{ => scraper}/main.go | 7 ++++--- go.mod | 5 +++++ go.sum | 12 ++++++++++++ message.go | 2 +- scraper.go | 2 +- 6 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 example/dumper/main.go rename example/{ => scraper}/main.go (89%) create mode 100644 go.mod create mode 100644 go.sum diff --git a/example/dumper/main.go b/example/dumper/main.go new file mode 100644 index 0000000..1957dcd --- /dev/null +++ b/example/dumper/main.go @@ -0,0 +1,29 @@ +package main + +import ( + cboxscraper "github.com/Neo-Desktop/go-cbox-scraper" + + "fmt" + "log" + "sort" +) + +func main() { + info := cboxscraper.CBoxServerInfo{} + scraper := cboxscraper.NewScraper(info, -1, -1) + + err := scraper.Load("../test.gob") + if err != nil { + log.Println("Load failed:", err) + } + + keys := make([]int, 0, len(scraper.Messages)) + for k := range scraper.Messages { + keys = append(keys, k) + } + sort.Sort(sort.Reverse(sort.IntSlice(keys))) + + for _, k := range keys { + fmt.Println(scraper.Messages[k]) + } +} diff --git a/example/main.go b/example/scraper/main.go similarity index 89% rename from example/main.go rename to example/scraper/main.go index b8cdb54..bf9706f 100644 --- a/example/main.go +++ b/example/scraper/main.go @@ -1,8 +1,9 @@ package main import ( - cboxscraper "github.com/Neo-Desktop/go-cbox-scraper" "log" + + cboxscraper "github.com/Neo-Desktop/go-cbox-scraper" ) func main() { @@ -17,7 +18,7 @@ func main() { scraper := cboxscraper.NewScraper(info, -1, -1) - err := scraper.Load("test.gob") + err := scraper.Load("../test.gob") if err != nil { log.Println("Load failed:", err) } @@ -30,7 +31,7 @@ func main() { // change this value before saving scraper.Debug = true - err = scraper.Save("test.gob") + err = scraper.Save("../test.gob") if err != nil { log.Println("Save failed:", err) } diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..7121d33 --- /dev/null +++ b/go.mod @@ -0,0 +1,5 @@ +module github.com/Neo-Desktop/go-cbox-scraper + +go 1.16 + +require github.com/PuerkitoBio/goquery v1.7.1 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..986201f --- /dev/null +++ b/go.sum @@ -0,0 +1,12 @@ +github.com/PuerkitoBio/goquery v1.7.1 h1:oE+T06D+1T7LNrn91B4aERsRIeCLJ/oPSa6xB9FPnz4= +github.com/PuerkitoBio/goquery v1.7.1/go.mod h1:XY0pP4kfraEmmV1O7Uf6XyjoslwsneBbgeDjLYuN8xY= +github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE= +github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/message.go b/message.go index c1316eb..da45851 100644 --- a/message.go +++ b/message.go @@ -13,5 +13,5 @@ type CBoxMessage struct { } func (m *CBoxMessage) String() string { - return fmt.Sprintf("%d - %s - %s - %s", m.MessageID, m.DateTime.Format(time.Stamp), m.Username, m.Message) + return fmt.Sprintf("#%d [%s] <%s> %s", m.MessageID, m.DateTime.Format(CboxDatetimeFormat), m.Username, m.Message) } diff --git a/scraper.go b/scraper.go index 952ca19..6365964 100644 --- a/scraper.go +++ b/scraper.go @@ -6,7 +6,7 @@ import ( "time" ) -const CboxDatetimeFormat = "_2 Jan 06, 03:04 PM" +const CboxDatetimeFormat = "2006-01-02 03:04PM" type CBoxScraper struct { SmallestMessageID int