Modify httpClient package to use external clients

cmd/fetchImage/fetchImage.go

@@ -6,6 +6,7 @@ import (
 	"github.com/Miguel-Dorta/surveillance-cameras/internal"
 	"github.com/Miguel-Dorta/surveillance-cameras/pkg/utils"
 	"golang.org/x/sys/unix"
+	"net/http"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -17,6 +18,7 @@ var (
 	destinyDir, fileExtension      string
 	printVersion                   bool
 	tomorrow                       time.Time
+	httpClient = http.Client{Timeout: time.Second}
 )
 
 func init() {
@@ -68,7 +70,7 @@ MainLoop:
 		requestTime := time.Now()
 		updateDestinyDir(requestTime)
 
-		if err := utils.GetFileWithLogin(url, user, pass, getNewFilePath(path, requestTime)); err != nil {
+		if err := utils.GetFileWithLogin(url, user, pass, getNewFilePath(path, requestTime), httpClient); err != nil {
 			_, _ = fmt.Fprintf(os.Stderr, "error downloading image: %s", err)
 		}
 	}

cmd/fetchVideo/fetchVideo.go

@@ -10,6 +10,7 @@ import (
 	"github.com/Miguel-Dorta/surveillance-cameras/pkg/utils"
 	"io/ioutil"
 	"log"
+	"net/http"
 	"os"
 	"path/filepath"
 )
@@ -23,6 +24,7 @@ var (
 	url, user, pass, camName, destination string
 	printVersion bool
 	logErr = log.New(os.Stderr, "", 0)
+	httpC = http.Client{}
 )
 
 func init() {
@@ -58,8 +60,11 @@ func main() {
 	}
 	errFound := false
 	for _, link := range linkVideos {
-		pathToSave := getSavingPath(link.Text, camName, destination)
-		if err = utils.GetFileWithLogin(url + link.HREF, user, pass, pathToSave); err != nil {
+		pathToSave, err := createAndGetSavingPath(link.Text, camName, destination)
+		if err != nil {
+			logErr.Fatalf("cannot create parent directories of file \"%s\": %s", link.Text, err)
+		}
+		if err = utils.GetFileWithLogin(url + link.HREF, user, pass, pathToSave, httpC); err != nil {
 			logErr.Printf("error saving file in path \"%s\": %s", pathToSave, err)
 			errFound = true
 			continue
@@ -70,9 +75,13 @@ func main() {
 	}
 }
 
-func getSavingPath(filename, camName, destination string) string {
+func createAndGetSavingPath(filename, camName, destination string) (string, error) {
 	y, m, d, rest := cameras.GetInfoFromFilenameOWIPCAN45(filename)
-	return filepath.Join(destination, camName, "20" + y, m, d, rest)
+	parentDirPath := filepath.Join(destination, camName, "20" + y, m, d)
+	if err := os.MkdirAll(parentDirPath, 0755); err != nil {
+		return "", fmt.Errorf("error creating parent directories: %s", err)
+	}
+	return filepath.Join(parentDirPath, rest), nil
 }
 
 func getAllVideos(url, user, pass string) ([]html.A, error) {
@@ -116,7 +125,7 @@ func getVideoLinks(url, user, pass string) ([]html.A, error) {
 }
 
 func getPage(url, user, pass string) ([]byte, error) {
-	resp, err := httpClient.GetLogin(url, user, pass)
+	resp, err := httpClient.GetLogin(url, user, pass, httpC)
 	if err != nil {
 		return nil, fmt.Errorf("error getting page from URL \"%s\": %s", url, err)
 	}

pkg/httpClient/client.go

@@ -3,12 +3,9 @@ package httpClient
 import (
 	"fmt"
 	"net/http"
-	"time"
 )
 
-var c = http.Client{Timeout: time.Second}
-
-func GetLogin(url, user, pass string) (*http.Response, error) {
+func GetLogin(url, user, pass string, c http.Client) (*http.Response, error) {
 	req, err := http.NewRequest(http.MethodGet, url, nil)
 	if err != nil {
 		return nil, fmt.Errorf("error creating request: %s", err)

pkg/utils/files.go

@@ -5,6 +5,7 @@ import (
 	"github.com/Miguel-Dorta/surveillance-cameras/pkg/httpClient"
 	"golang.org/x/sys/unix"
 	"io"
+	"net/http"
 	"os"
 	"path/filepath"
 )
@@ -71,8 +72,8 @@ func Copy(origin, destiny string) error {
 	return nil
 }
 
-func GetFileWithLogin(url, user, pass, destination string) error {
-	resp, err := httpClient.GetLogin(url, user, pass)
+func GetFileWithLogin(url, user, pass, destination string, c http.Client) error {
+	resp, err := httpClient.GetLogin(url, user, pass, c)
 	if err != nil {
 		return fmt.Errorf("error doing http request to URL \"%s\": %s", url, err)
 	}