Merge pull request #413 from sky126/master

gocolly · Dec 10, 2019 · 051af19 · 051af19
2 parents e910bad + 0b194cd
commit 051af19
Show file tree

Hide file tree

Showing 35 changed files with 41 additions and 40 deletions.
diff --git a/_examples/basic/basic.go b/_examples/basic/basic.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/_examples/coursera_courses/coursera_courses.go b/_examples/coursera_courses/coursera_courses.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 // Course stores information about a coursera course

diff --git a/_examples/cryptocoinmarketcap/cryptocoinmarketcap.go b/_examples/cryptocoinmarketcap/cryptocoinmarketcap.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/_examples/error_handling/error_handling.go b/_examples/error_handling/error_handling.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/_examples/factba.se/factbase.go b/_examples/factba.se/factbase.go
@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"strconv"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 var baseSearchURL = "https://factba.se/json/json-transcript.php?q=&f=&dt=&p="

diff --git a/_examples/google_groups/google_groups.go b/_examples/google_groups/google_groups.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 // Mail is the container of a single e-mail

diff --git a/_examples/hackernews_comments/hackernews_comments.go b/_examples/hackernews_comments/hackernews_comments.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 type comment struct {

diff --git a/_examples/instagram/instagram.go b/_examples/instagram/instagram.go
@@ -10,7 +10,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 // "id": user id, "after": end cursor

diff --git a/_examples/local_files/local_files.go b/_examples/local_files/local_files.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/_examples/login/login.go b/_examples/login/login.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/_examples/max_depth/max_depth.go b/_examples/max_depth/max_depth.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/_examples/multipart/multipart.go b/_examples/multipart/multipart.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func generateFormData() map[string][]byte {

diff --git a/_examples/openedx_courses/openedx_courses.go b/_examples/openedx_courses/openedx_courses.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 // DATE_FORMAT default format date used in openedx

diff --git a/_examples/parallel/parallel.go b/_examples/parallel/parallel.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/_examples/proxy_switcher/proxy_switcher.go b/_examples/proxy_switcher/proxy_switcher.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"log"
 
-	"github.com/gocolly/colly"
-	"github.com/gocolly/colly/proxy"
+	"github.com/gocolly/colly/v2"
+	"github.com/gocolly/colly/v2/proxy"
 )
 
 func main() {

diff --git a/_examples/queue/queue.go b/_examples/queue/queue.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gocolly/colly"
-	"github.com/gocolly/colly/queue"
+	"github.com/gocolly/colly/v2"
+	"github.com/gocolly/colly/v2/queue"
 )
 
 func main() {

diff --git a/_examples/random_delay/random_delay.go b/_examples/random_delay/random_delay.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gocolly/colly"
-	"github.com/gocolly/colly/debug"
+	"github.com/gocolly/colly/v2"
+	"github.com/gocolly/colly/v2/debug"
 )
 
 func main() {

diff --git a/_examples/rate_limit/rate_limit.go b/_examples/rate_limit/rate_limit.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gocolly/colly"
-	"github.com/gocolly/colly/debug"
+	"github.com/gocolly/colly/v2"
+	"github.com/gocolly/colly/v2/debug"
 )
 
 func main() {

diff --git a/_examples/reddit/reddit.go b/_examples/reddit/reddit.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 type item struct {

diff --git a/_examples/request_context/request_context.go b/_examples/request_context/request_context.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/_examples/scraper_server/scraper_server.go b/_examples/scraper_server/scraper_server.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 type pageInfo struct {

diff --git a/_examples/shopify_sitemap/shopify_sitemap.go b/_examples/shopify_sitemap/shopify_sitemap.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/_examples/url_filter/url_filter.go b/_examples/url_filter/url_filter.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/_examples/xkcd_store/xkcd_store.go b/_examples/xkcd_store/xkcd_store.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/cmd/colly/colly.go b/cmd/colly/colly.go
@@ -29,7 +29,7 @@ var scraperHeadTemplate = `package main
 import (
 	"log"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 func main() {

diff --git a/colly.go b/colly.go
@@ -41,8 +41,8 @@ import (
 	"github.com/PuerkitoBio/goquery"
 	"github.com/antchfx/htmlquery"
 	"github.com/antchfx/xmlquery"
-	"github.com/gocolly/colly/debug"
-	"github.com/gocolly/colly/storage"
+	"github.com/gocolly/colly/v2/debug"
+	"github.com/gocolly/colly/v2/storage"
 	"github.com/kennygrant/sanitize"
 	"github.com/temoto/robotstxt"
 	"google.golang.org/appengine/urlfetch"
@@ -368,7 +368,7 @@ func Debugger(d debug.Debugger) CollectorOption {
 // Init initializes the Collector's private variables and sets default
 // configuration for the Collector
 func (c *Collector) Init() {
-	c.UserAgent = "colly - https://github.com/gocolly/colly"
+	c.UserAgent = "colly - https://github.com/gocolly/colly/v2"
 	c.MaxDepth = 0
 	c.store = &storage.InMemoryStorage{}
 	c.store.Init()

diff --git a/colly_test.go b/colly_test.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/PuerkitoBio/goquery"
 
-	"github.com/gocolly/colly/debug"
+	"github.com/gocolly/colly/v2/debug"
 )
 
 var serverIndexResponse = []byte("hello world\n")

diff --git a/extensions/random_user_agent.go b/extensions/random_user_agent.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math/rand"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 var uaGens = []func() string{

diff --git a/extensions/referer.go b/extensions/referer.go
@@ -1,7 +1,7 @@
 package extensions
 
 import (
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 // Referer sets valid Referer HTTP header to requests.

diff --git a/extensions/url_length_filter.go b/extensions/url_length_filter.go
@@ -1,7 +1,7 @@
 package extensions
 
 import (
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 // URLLengthFilter filters out requests with URLs longer than URLLengthLimit

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/gocolly/colly
+module github.com/gocolly/colly/v2
 
 go 1.12
 

diff --git a/go.sum b/go.sum
@@ -12,6 +12,7 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gocolly/colly v1.2.0 h1:qRz9YAn8FIH0qzgNUw+HT9UN7wm1oF9OBAilwEWpyrI=
 github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/jawher/mow.cli v1.1.0 h1:NdtHXRc0CwZQ507wMvQ/IS+Q3W3x2fycn973/b8Zuk8=

diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -20,7 +20,7 @@ import (
 	"net/url"
 	"sync/atomic"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 type roundRobinSwitcher struct {

diff --git a/queue/queue.go b/queue/queue.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 )
 
 const stop = true

diff --git a/xmlelement_test.go b/xmlelement_test.go
@@ -16,7 +16,7 @@ package colly_test
 
 import (
 	"github.com/antchfx/htmlquery"
-	"github.com/gocolly/colly"
+	"github.com/gocolly/colly/v2"
 	"reflect"
 	"strings"
 	"testing"