fix a few pieces

Author: davidnewhall

cameras.go

@@ -109,10 +109,7 @@ func (c *Camera) SaveVideo(ops *VidOps, length time.Duration, maxsize int64, out
 // StreamMJPG makes a web request to retrieve a motion JPEG stream.
 // Returns an io.ReadCloser that will (hopefully) never end.
 func (c *Camera) StreamMJPG(ops *VidOps) (io.ReadCloser, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), c.server.config.Timeout)
-	defer cancel()
-
-	resp, err := c.server.GetContext(ctx, "++video", c.makeRequestParams(ops))
+	resp, err := c.server.Get("++video", c.makeRequestParams(ops))
 	if err != nil {
 		return nil, fmt.Errorf("getting video: %w", err)
 	}
@@ -123,10 +120,7 @@ func (c *Camera) StreamMJPG(ops *VidOps) (io.ReadCloser, error) {
 // StreamH264 makes a web request to retrieve an H264 stream.
 // Returns an io.ReadCloser that will (hopefully) never end.
 func (c *Camera) StreamH264(ops *VidOps) (io.ReadCloser, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), c.server.config.Timeout)
-	defer cancel()
-
-	resp, err := c.server.GetContext(ctx, "++stream", c.makeRequestParams(ops))
+	resp, err := c.server.Get("++stream", c.makeRequestParams(ops))
 	if err != nil {
 		return nil, fmt.Errorf("getting stream: %w", err)
 	}
@@ -137,10 +131,7 @@ func (c *Camera) StreamH264(ops *VidOps) (io.ReadCloser, error) {
 // StreamG711 makes a web request to retrieve an G711 audio stream.
 // Returns an io.ReadCloser that will (hopefully) never end.
 func (c *Camera) StreamG711() (io.ReadCloser, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), c.server.config.Timeout)
-	defer cancel()
-
-	resp, err := c.server.GetContext(ctx, "++audio", c.makeRequestParams(nil))
+	resp, err := c.server.Get("++audio", c.makeRequestParams(nil))
 	if err != nil {
 		return nil, fmt.Errorf("getting audio: %w", err)
 	}
@@ -169,7 +160,7 @@ func (c *Camera) PostG711(audio io.ReadCloser) ([]byte, error) {
 func (c *Camera) GetJPEG(ops *VidOps) (image.Image, error) {
 	ops.FPS = -1 // not used for single image
 
-	ctx, cancel := context.WithTimeout(context.Background(), c.server.config.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), c.server.TimeoutDur())
 	defer cancel()
 
 	resp, err := c.server.GetContext(ctx, "++image", c.makeRequestParams(ops))

files.go

@@ -3,7 +3,6 @@ package securityspy
 /* This file handles all file transfers for media saved by security spy. */
 
 import (
-	"context"
 	"encoding/xml"
 	"fmt"
 	"io"
@@ -169,10 +168,7 @@ func (f *File) Get(highBandwidth bool) (io.ReadCloser, error) {
 		uri = strings.Replace(f.Link.HREF, "++getfile/", "++getfilehb/", 1)
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), f.server.config.Timeout)
-	defer cancel()
-
-	resp, err := f.server.GetContext(ctx, uri, make(url.Values))
+	resp, err := f.server.Get(uri, make(url.Values))
 	if err != nil {
 		return nil, fmt.Errorf("getting file: %w", err)
 	}

mocks/api.go

@@ -31,7 +31,7 @@ func NewMust(c *server.Config) *Server {
 	}
 
 	// Assign all the sub-interface structs.
-	server := &Server{config: c, API: c, Encoder: DefaultEncoder}
+	server := &Server{API: c, Encoder: DefaultEncoder}
 	server.Files = &Files{server: server}
 	server.Events = &Events{
 		server:     server,

securityspy.go

@@ -19,7 +19,6 @@ import (
 type Server struct {
 	server.API
 	Encoder      string
-	config       *server.Config
 	Files        *Files      // Files interface.
 	Events       *Events     // Events interface.
 	Cameras      *Cameras    // Cameras & PTZ interfaces.

securityspy_types.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"time"
 )
 
 // API interface is provided only to allow overriding local methods during local testing.
@@ -19,6 +20,7 @@ type API interface {
 	Post(apiPath string, params url.Values, post io.ReadCloser) (body []byte, err error)
 	GetXML(apiPath string, params url.Values, v interface{}) (err error)
 	SimpleReq(apiURI string, params url.Values, cameraNum int) error
+	TimeoutDur() time.Duration
 	BaseURL() string
 	Auth() string
 }

server/interface.go

@@ -59,6 +59,11 @@ func (s *Config) Auth() string {
 	return s.Password
 }
 
+// TimeoutDur returns the configured timeout.
+func (s *Config) TimeoutDur() time.Duration {
+	return s.Timeout
+}
+
 func (s *Config) GetContext(ctx context.Context, apiPath string, params url.Values) (*http.Response, error) {
 	s.getClient()