Move reader

handlers/html.go

@@ -1,4 +1,3 @@
-// Package handlers.
 package handlers
 
 import (

handlers/index.go

@@ -1,3 +1,4 @@
+// Package handlers provides HTTP handlers for the cam2ip application.
 package handlers
 
 import (

handlers/jpeg.go

@@ -5,16 +5,15 @@ import (
 	"net/http"
 
 	"github.com/gen2brain/cam2ip/image"
-	"github.com/gen2brain/cam2ip/reader"
 )
 
 // JPEG handler.
 type JPEG struct {
-	reader reader.ImageReader
+	reader ImageReader
 }
 
 // NewJPEG returns new JPEG handler.
-func NewJPEG(reader reader.ImageReader) *JPEG {
+func NewJPEG(reader ImageReader) *JPEG {
 	return &JPEG{reader}
 }
 

handlers/mjpeg.go

@@ -1,25 +1,24 @@
-// Package handlers.
 package handlers
 
 import (
 	"fmt"
-	"github.com/gen2brain/cam2ip/image"
-	"github.com/gen2brain/cam2ip/reader"
 	"log"
 	"mime/multipart"
 	"net/http"
 	"net/textproto"
 	"time"
+
+	"github.com/gen2brain/cam2ip/image"
 )
 
 // MJPEG handler.
 type MJPEG struct {
-	reader reader.ImageReader
+	reader ImageReader
 	delay  int
 }
 
 // NewMJPEG returns new MJPEG handler.
-func NewMJPEG(reader reader.ImageReader, delay int) *MJPEG {
+func NewMJPEG(reader ImageReader, delay int) *MJPEG {
 	return &MJPEG{reader, delay}
 }
 

handlers/reader.go

@@ -0,0 +1,14 @@
+package handlers
+
+import (
+	"image"
+)
+
+// ImageReader interface
+type ImageReader interface {
+	// Read reads next frame from camera/video and returns image.
+	Read() (img image.Image, err error)
+
+	// Close closes camera/video.
+	Close() error
+}

handlers/socket.go

@@ -10,17 +10,16 @@ import (
 	"github.com/coder/websocket"
 
 	"github.com/gen2brain/cam2ip/image"
-	"github.com/gen2brain/cam2ip/reader"
 )
 
 // Socket handler.
 type Socket struct {
-	reader reader.ImageReader
+	reader ImageReader
 	delay  int
 }
 
 // NewSocket returns new socket handler.
-func NewSocket(reader reader.ImageReader, delay int) *Socket {
+func NewSocket(reader ImageReader, delay int) *Socket {
 	return &Socket{reader, delay}
 }