Merge pull request #1 from rapidclock/#9nkcy-move-adapters

moved output adapters to separate package #9nkcy

Author: rapidclock

octopus/outputadapter.go adapter/basicadapters.gooctopus/outputadapter.go renamed to adapter/basicadapters.go

@@ -1,28 +1,19 @@
-package octopus
+package adapter
 
 import (
 	"fmt"
 	"io"
 	"log"
 	"os"
-)
 
-// 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
-}
+	oct "github.com/rapidclock/web-octopus/octopus"
+)
 
 // StdOpAdapter is an output adapter that just prints the output onto the screen.
 type StdOpAdapter struct{}
 
-func (s *StdOpAdapter) Consume(quitCh <-chan bool) chan<- CrawlOutput {
-	listenCh := make(chan CrawlOutput)
+func (s *StdOpAdapter) Consume(quitCh <-chan bool) chan<- oct.CrawlOutput {
+	listenCh := make(chan oct.CrawlOutput)
 	go func() {
 		for {
 			select {
@@ -41,13 +32,13 @@ type FileWriterAdapter struct {
 	FilePath string
 }
 
-func (fw *FileWriterAdapter) Consume(quitCh <-chan bool) chan<- CrawlOutput {
-	listenCh := make(chan CrawlOutput)
+func (fw *FileWriterAdapter) Consume(quitCh <-chan bool) chan<- oct.CrawlOutput {
+	listenCh := make(chan oct.CrawlOutput)
 	fw.writeToFile(quitCh, listenCh)
 	return listenCh
 }
 
-func (fw *FileWriterAdapter) writeToFile(quitCh <-chan bool, ch <-chan CrawlOutput) {
+func (fw *FileWriterAdapter) writeToFile(quitCh <-chan bool, ch <-chan oct.CrawlOutput) {
 	fp, err := fw.getFilePointer()
 	if err != nil {
 		fp.Close()

octopus/models.go

@@ -46,3 +46,14 @@ 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
+}