moved interface outputadapter to octopus package

Author: droidgod

adapter/outputadapter.go adapter/basicadapters.goadapter/outputadapter.go renamed to adapter/basicadapters.go

@@ -9,17 +9,6 @@ import (
 	oct "github.com/rapidclock/web-octopus/octopus"
 )
 
-// OutputAdapter is the interface for the Adapter that is used to handle
-// output from the Octopus Crawler.
-// The contract stipulates that the crawler provides the channel
-// to listen for a quit command.
-// The crawler pumps its output onto the returned channel of the Consume method.
-// Implementers of the interface should listen on this channel for output from
-// the crawler.
-type OutputAdapter interface {
-	Consume(quitCh <-chan bool) chan<- oct.CrawlOutput
-}
-
 // StdOpAdapter is an output adapter that just prints the output onto the screen.
 type StdOpAdapter struct{}
 

octopus/models.go

@@ -3,8 +3,6 @@ package octopus
 import (
 	"io"
 	"time"
-
-	"github.com/rapidclock/web-octopus/adapter"
 )
 
 // Node is used to represent each crawled link and its associated depth of crawl.
@@ -41,10 +39,21 @@ type CrawlOptions struct {
 	CrawlRate          time.Duration
 	RespectRobots      bool
 	IncludeBody        bool
-	OpAdapter          adapter.OutputAdapter
+	OpAdapter          OutputAdapter
 }
 
 type CrawlOutput struct {
 	Node
 	Body io.ReadCloser
 }
+
+// OutputAdapter is the interface for the Adapter that is used to handle
+// output from the Octopus Crawler.
+// The contract stipulates that the crawler provides the channel
+// to listen for a quit command.
+// The crawler pumps its output onto the returned channel of the Consume method.
+// Implementers of the interface should listen on this channel for output from
+// the crawler.
+type OutputAdapter interface {
+	Consume(quitCh <-chan bool) chan<- CrawlOutput
+}