Renamed utils

Author: sam-laister

cmd/cli/main.go

@@ -7,9 +7,9 @@ import (
 	"os"
 	"time"
 
+	mvgoutils "github.com/2024-dissertation/openmvgo/pkg/mvgoutils"
 	"github.com/2024-dissertation/openmvgo/pkg/openmvg"
 	"github.com/2024-dissertation/openmvgo/pkg/openmvs"
-	"github.com/2024-dissertation/openmvgo/pkg/utils"
 	"github.com/urfave/cli/v3"
 )
 
@@ -52,7 +52,7 @@ func main() {
 			fmt.Printf("Output Directory: %s\n", outputDir)
 
 			// Setup Utils
-			utils := utils.NewUtils()
+			utils := mvgoutils.NewMvgoUtils()
 
 			timestamp := time.Now().Unix()
 

pkg/utils/utils.go renamed to pkg/mvgoutils/mvgoutils.go

@@ -1,7 +1,7 @@
-package utils
+package mvgoutils
 
 //go:generate mockgen -source=./utils.go -destination=../../mocks/mock_utils.go -package=mocks
-type UtilsInterface interface {
+type OpenmvgoUtilsInterface interface {
 	Check(e error)
 	RunCommand(name string, args []string) error
 	EnsureDir(path string) error

pkg/utils/utils_impl.go renamed to pkg/mvgoutils/mvgoutils_impl.go

@@ -1,4 +1,4 @@
-package utils
+package mvgoutils
 
 import (
 	"fmt"
@@ -9,21 +9,21 @@ import (
 	"path/filepath"
 )
 
-type UtilsImpl struct{}
+type MvgoUtilsImpl struct{}
 
-func NewUtils() UtilsInterface {
-	return &UtilsImpl{}
+func NewMvgoUtils() OpenmvgoUtilsInterface {
+	return &MvgoUtilsImpl{}
 }
 
-func (u *UtilsImpl) Check(e error) {
+func (u *MvgoUtilsImpl) Check(e error) {
 	if e != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", e)
 		panic(e)
 	}
 }
 
 // RunCommand runs a command with arguments and prints its stdout/stderr in real-time.
-func (u *UtilsImpl) RunCommand(name string, args []string) error {
+func (u *MvgoUtilsImpl) RunCommand(name string, args []string) error {
 	cmd := exec.Command(name, args...)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -37,7 +37,7 @@ func (u *UtilsImpl) RunCommand(name string, args []string) error {
 }
 
 // EnsureDir creates the directory (and parent dirs) if it doesn't exist.
-func (u *UtilsImpl) EnsureDir(path string) error {
+func (u *MvgoUtilsImpl) EnsureDir(path string) error {
 	abs, err := filepath.Abs(path)
 	if err != nil {
 		return fmt.Errorf("could not resolve absolute path: %w", err)
@@ -53,7 +53,7 @@ func (u *UtilsImpl) EnsureDir(path string) error {
 }
 
 // DownloadFile downloads a file from the given URL and saves it to a temporary file.
-func (u *UtilsImpl) DownloadFile(url string) (string, error) {
+func (u *MvgoUtilsImpl) DownloadFile(url string) (string, error) {
 	resp, err := http.Get(url)
 	if err != nil {
 		return "", fmt.Errorf("failed to download file from %s: %w", url, err)
@@ -80,7 +80,7 @@ func (u *UtilsImpl) DownloadFile(url string) (string, error) {
 	return out.Name(), nil
 }
 
-func (u *UtilsImpl) CopyFile(src, dst string) error {
+func (u *MvgoUtilsImpl) CopyFile(src, dst string) error {
 	fmt.Printf("→ Copying file from %s to %s\n", src, dst)
 	input, err := os.ReadFile(src)
 	if err != nil {

pkg/openmvg/openmvg_impl.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/2024-dissertation/openmvgo/pkg/utils"
+	"github.com/2024-dissertation/openmvgo/pkg/mvgoutils"
 )
 
 // Config for running the OpenMVG pipeline
@@ -27,11 +27,14 @@ func NewOpenMVGConfig(inputDir string, outputDir string, cameraDBFile *string) O
 }
 
 type AppFileServiceImpl struct {
-	Utils  utils.UtilsInterface
+	Utils  mvgoutils.OpenmvgoUtilsInterface
 	Config OpenMVGConfig
 }
 
-func NewOpenMVGService(config OpenMVGConfig, utils utils.UtilsInterface) AppFileServiceImpl {
+func NewOpenMVGService(config OpenMVGConfig, utils mvgoutils.OpenmvgoUtilsInterface) AppFileServiceImpl {
+	if utils == nil {
+		utils = mvgoutils.NewMvgoUtils()
+	}
 
 	// Pre run folder checks
 	if config.InputDir == "" || config.OutputDir == "" {

pkg/openmvs/openmvs_impl.go

@@ -3,7 +3,7 @@ package openmvs
 import (
 	"fmt"
 
-	"github.com/2024-dissertation/openmvgo/pkg/utils"
+	"github.com/2024-dissertation/openmvgo/pkg/mvgoutils"
 )
 
 // Config object
@@ -24,12 +24,16 @@ func NewOpenMVSConfig(outputDir string, buildDir string, maxThreads int) *OpenMV
 
 // OpenMVSService interface implementation
 type OpenMVSServiceImpl struct {
-	Utils  utils.UtilsInterface
+	Utils  mvgoutils.OpenmvgoUtilsInterface
 	Config *OpenMVSConfig
 }
 
 // Helper function to create a new OpenMVSServiceImpl
-func NewOpenMVSService(config *OpenMVSConfig, utils utils.UtilsInterface) OpenMVSServiceImpl {
+func NewOpenMVSService(config *OpenMVSConfig, utils mvgoutils.OpenmvgoUtilsInterface) OpenMVSServiceImpl {
+	if utils == nil {
+		utils = mvgoutils.NewMvgoUtils()
+	}
+
 	if config.OutputDir == "" {
 		utils.Check(fmt.Errorf("input directory must be specified"))
 	}