From ec30c6e4b22d2e1ec05436ea8dabfbfd90dd2ebc Mon Sep 17 00:00:00 2001
From: Amrit Panesar <me@amrit.pw>
Date: Thu, 29 Oct 2020 15:37:03 -0700
Subject: [PATCH] finalize debug logging

---
 .idea/go-cbox-scraper.iml |   8 ++++++++
 .idea/modules.xml         |   8 ++++++++
 .idea/vcs.xml             |   6 ++++++
 example/gd.gob            | Bin 0 -> 12383 bytes
 example/main.go           |   4 ++--
 page.go                   |   5 +----
 scraper.go                |  31 ++++++++++---------------------
 serverInfo.go             |  22 ++++++++++++++++++++++
 8 files changed, 57 insertions(+), 27 deletions(-)
 create mode 100644 .idea/go-cbox-scraper.iml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 example/gd.gob

diff --git a/.idea/go-cbox-scraper.iml b/.idea/go-cbox-scraper.iml
new file mode 100644
index 0000000..c956989
--- /dev/null
+++ b/.idea/go-cbox-scraper.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..5eaeb4b
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/go-cbox-scraper.iml" filepath="$PROJECT_DIR$/.idea/go-cbox-scraper.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/example/gd.gob b/example/gd.gob
new file mode 100644
index 0000000000000000000000000000000000000000..390605abd42767d504c8cfda25e5755946c86e97
GIT binary patch
literal 12383
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

literal 0
HcmV?d00001

diff --git a/example/main.go b/example/main.go
index 48c2083..d836a22 100644
--- a/example/main.go
+++ b/example/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	cboxscraper ".."
+	cboxscraper "github.com/Neo-Desktop/go-cbox-scraper"
 	"log"
 )
 
@@ -12,7 +12,7 @@ func main() {
 		WebHostID: 6,
 		BoxID:     850801,
 		BoxTag:    "hD3VIj",
-		Debug:     true,
+		Debug:     false,
 	}
 
 	scraper := cboxscraper.NewScraper(info, -1, -1)
diff --git a/page.go b/page.go
index 1c49714..815444e 100644
--- a/page.go
+++ b/page.go
@@ -3,7 +3,6 @@ package go_cbox_scraper
 import (
 	"errors"
 	"fmt"
-	"log"
 	"net/http"
 	"net/url"
 	"regexp"
@@ -136,9 +135,7 @@ func (p *CBoxPage) FetchNext() error {
 }
 
 func (p *CBoxPage) request(request *http.Request) (*goquery.Document, error) {
-	if p.Debug {
-		log.Println(request.URL.String())
-	}
+	p.debugPrintln(request.URL.String())
 
 	httpClient := &http.Client{
 		Timeout: 30 * time.Second,
diff --git a/scraper.go b/scraper.go
index be6035c..952ca19 100644
--- a/scraper.go
+++ b/scraper.go
@@ -2,7 +2,6 @@ package go_cbox_scraper
 
 import (
 	"encoding/gob"
-	"log"
 	"os"
 	"time"
 )
@@ -26,16 +25,12 @@ func NewScraper(cboxServerInfo CBoxServerInfo, smallestID int, largestID int) *C
 }
 
 func (s *CBoxScraper) sleep() {
-	if s.Debug {
-		log.Println("Sleeping 10 seconds...")
-	}
+	s.debugPrintln("Sleeping 10 seconds...")
 	time.Sleep(10 * time.Second)
 }
 
 func (s *CBoxScraper) Scrape(updatesOnly bool) error {
-	if s.Debug {
-		log.Println("Scraper Started...")
-	}
+	s.debugPrintln("Scraper Started...")
 
 	page := NewCBoxPage(s.CBoxServerInfo)
 
@@ -44,16 +39,12 @@ func (s *CBoxScraper) Scrape(updatesOnly bool) error {
 		return err
 	}
 
-	if s.Debug {
-		log.Printf("Main fetched, scraped %d messages\n", len(page.Messages))
-		log.Printf("\tpage smallestID: %d - scraper smallestID: %d\n", page.SmallestID(), s.SmallestMessageID)
-		log.Printf("\tpage largestID: %d - scraper LargestID: %d\n", page.LargestID(), s.LargestMessageID)
-	}
+	s.debugPrintf("Main fetched, scraped %d messages\n", len(page.Messages))
+	s.debugPrintf("\tpage smallestID: %d - scraper smallestID: %d\n", page.SmallestID(), s.SmallestMessageID)
+	s.debugPrintf("\tpage largestID: %d - scraper LargestID: %d\n", page.LargestID(), s.LargestMessageID)
 
 	if updatesOnly && s.LargestMessageID < page.SmallestID() {
-		if s.Debug {
-			log.Println("Scraper: Case 3 - lots of new messages")
-		}
+		s.debugPrintln("Scraper: Case 3 - lots of new messages")
 		s.sleep()
 		for s.LargestMessageID < page.smallestID {
 			err := page.FetchPrevious()
@@ -64,11 +55,11 @@ func (s *CBoxScraper) Scrape(updatesOnly bool) error {
 		}
 		s.merge(page.Messages)
 	} else if updatesOnly && s.LargestMessageID < page.LargestID() {
-		log.Println("Scraper: Case 2 - Some new Messages")
+		s.debugPrintln("Scraper: Case 2 - Some new Messages")
 		// merge what we retrieved
 		s.merge(page.Messages)
 	} else if !updatesOnly {
-		log.Println("Scraper: Case 4 - fetch all")
+		s.debugPrintln("Scraper: Case 4 - fetch all")
 		s.sleep()
 		for {
 			err := page.FetchPrevious()
@@ -79,12 +70,10 @@ func (s *CBoxScraper) Scrape(updatesOnly bool) error {
 		}
 		s.merge(page.Messages)
 	} else {
-		log.Println("Scraper: Case 0 - no update")
+		s.debugPrintln("Scraper: Case 0 - no update")
 	}
 
-	if s.Debug {
-		log.Printf("Archives fetched, scraped %d messages - page smallestID: %d\n", len(page.Messages), page.SmallestID())
-	}
+	s.debugPrintf("Archives fetched, scraped %d messages - page smallestID: %d\n", len(page.Messages), page.SmallestID())
 
 	return nil
 }
diff --git a/serverInfo.go b/serverInfo.go
index 9439e1b..08c81a9 100644
--- a/serverInfo.go
+++ b/serverInfo.go
@@ -1,8 +1,30 @@
 package go_cbox_scraper
 
+import (
+	"log"
+)
+
 type CBoxServerInfo struct {
 	WebHostID int
 	BoxID     int
 	BoxTag    string
 	Debug     bool
 }
+
+func (c *CBoxServerInfo) debugPrint(args ... interface{}) {
+	if c.Debug {
+		log.Print(args...)
+	}
+}
+
+func (c *CBoxServerInfo) debugPrintf(format string, args ... interface{}) {
+	if c.Debug {
+		log.Printf(format, args...)
+	}
+}
+
+func (c *CBoxServerInfo) debugPrintln(args ... interface{}) {
+	if c.Debug {
+		log.Println(args...)
+	}
+}
\ No newline at end of file