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

@@ -1,5 +1,4 @@
-// Package reader.
-package reader
+package handlers
 
 import (
 	"image"

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}
 }
 

server/server.go

@@ -9,7 +9,6 @@ import (
 	"github.com/abbot/go-http-auth"
 
 	"github.com/gen2brain/cam2ip/handlers"
-	"github.com/gen2brain/cam2ip/reader"
 )
 
 // Server struct.
@@ -31,14 +30,13 @@ type Server struct {
 	NoWebGL   bool
 	Timestamp bool
 
-	FileName string
-
-	Reader reader.ImageReader
+	Reader handlers.ImageReader
 }
 
 // NewServer returns new Server.
 func NewServer() *Server {
 	s := &Server{}
+
 	return s
 }
 
@@ -78,6 +76,7 @@ func newAuthHandler(handler http.Handler, authenticator *auth.BasicAuth) http.Ha
 			w.Header().Set("WWW-Authenticate", fmt.Sprintf("Basic realm=\"%s\"", authenticator.Realm))
 			if authenticator.CheckAuth(r) == "" {
 				http.Error(w, "401 Unauthorized", http.StatusUnauthorized)
+
 				return
 			}
 		}