Refactor file paths and name (#150)

* Refactor file paths and names, and rename packages within files.

Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com>

* feat(album): add error handling for album pattern parsing

This commit adds error handling for parsing the album pattern in the deleteAlbum function. If the album pattern cannot be parsed, an error message is returned. This ensures that any errors in parsing the album pattern are properly handled.

Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com>

---------

Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com>

cmdtool/cmdalbum/cmdalbum.go → cmd/album/album.go

@@ -1,4 +1,4 @@
-package cmdalbum
+package album
 
 import (
 	"context"
@@ -52,9 +52,7 @@ func deleteAlbum(ctx context.Context, ic *immich.ImmichClient, log *logger.Log,
 	if len(args) > 0 {
 		re, err := regexp.Compile(args[0])
 		if err != nil {
-			if err != nil {
-				return fmt.Errorf("album pattern %q can't be parsed: %w", cmd.Arg(0), err)
-			}
+			return fmt.Errorf("album pattern %q can't be parsed: %w", cmd.Arg(0), err)
 		}
 		app.pattern = re
 	} else {

cmdduplicate/duplicate.go → cmd/duplicate/duplicate.go

@@ -1,7 +1,7 @@
 /*
 Check the list of photos to list and discard duplicates.
 */
-package cmdduplicate
+package duplicate
 
 import (
 	"context"

cmdmetadata/metadatacmd.go → cmd/metadata/metadata.go

@@ -1,4 +1,4 @@
-package cmdmetadata
+package metadata
 
 import (
 	"context"

cmdstack/cmdstack.go → cmd/stack/stack.go

@@ -1,4 +1,4 @@
-package cmdstack
+package stack
 
 import (
 	"context"

cmdtool/cmdtool.go → cmd/tool/tool.go

@@ -1,10 +1,10 @@
-package cmdtool
+package tool
 
 import (
 	"context"
 	"fmt"
 
-	"github.com/simulot/immich-go/cmdtool/cmdalbum"
+	"github.com/simulot/immich-go/cmd/album"
 	"github.com/simulot/immich-go/immich"
 	"github.com/simulot/immich-go/logger"
 )
@@ -15,7 +15,7 @@ func CommandTool(ctx context.Context, ic *immich.ImmichClient, logger *logger.Lo
 		args = args[1:]
 
 		if cmd == "album" {
-			return cmdalbum.AlbumCommand(ctx, ic, logger, args)
+			return album.AlbumCommand(ctx, ic, logger, args)
 		}
 	}
 

cmdupload/assets.go → cmd/upload/assets.go

@@ -1,4 +1,4 @@
-package cmdupload
+package upload
 
 import (
 	"fmt"

cmdupload/configuration.go → cmd/upload/configuration.go

@@ -1,4 +1,4 @@
-package cmdupload
+package upload
 
 import (
 	"errors"

cmdupload/e2e_upload_folder_test.go → cmd/upload/e2e_upload_folder_test.go

@@ -1,7 +1,7 @@
 //go:build e2e
 // +build e2e
 
-package cmdupload
+package upload
 
 import (
 	"context"

cmdupload/stringlist_test.go → cmd/upload/stringlist_test.go

@@ -1,4 +1,4 @@
-package cmdupload
+package upload
 
 import "testing"
 

cmdupload/upload.go → cmd/upload/upload.go

@@ -1,6 +1,6 @@
 // Command Upload
 
-package cmdupload
+package upload
 
 import (
 	"context"

cmdupload/upload_test.go → cmd/upload/upload_test.go

@@ -1,4 +1,4 @@
-package cmdupload
+package upload
 
 import (
 	"cmp"

main.go

@@ -10,11 +10,11 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/simulot/immich-go/cmdduplicate"
-	"github.com/simulot/immich-go/cmdmetadata"
-	"github.com/simulot/immich-go/cmdstack"
-	"github.com/simulot/immich-go/cmdtool"
-	"github.com/simulot/immich-go/cmdupload"
+	"github.com/simulot/immich-go/cmd/duplicate"
+	"github.com/simulot/immich-go/cmd/metadata"
+	"github.com/simulot/immich-go/cmd/stack"
+	"github.com/simulot/immich-go/cmd/tool"
+	"github.com/simulot/immich-go/cmd/upload"
 	"github.com/simulot/immich-go/helpers/myflag"
 	"github.com/simulot/immich-go/helpers/tzone"
 	"github.com/simulot/immich-go/immich"
@@ -168,15 +168,15 @@ func Run(ctx context.Context, log *logger.Log) (*logger.Log, error) {
 	cmd := flag.Args()[0]
 	switch cmd {
 	case "upload":
-		err = cmdupload.UploadCommand(ctx, app.Immich, app.Logger, flag.Args()[1:])
+		err = upload.UploadCommand(ctx, app.Immich, app.Logger, flag.Args()[1:])
 	case "duplicate":
-		err = cmdduplicate.DuplicateCommand(ctx, app.Immich, app.Logger, flag.Args()[1:])
+		err = duplicate.DuplicateCommand(ctx, app.Immich, app.Logger, flag.Args()[1:])
 	case "metadata":
-		err = cmdmetadata.MetadataCommand(ctx, app.Immich, app.Logger, flag.Args()[1:])
+		err = metadata.MetadataCommand(ctx, app.Immich, app.Logger, flag.Args()[1:])
 	case "stack":
-		err = cmdstack.NewStackCommand(ctx, app.Immich, app.Logger, flag.Args()[1:])
+		err = stack.NewStackCommand(ctx, app.Immich, app.Logger, flag.Args()[1:])
 	case "tool":
-		err = cmdtool.CommandTool(ctx, app.Immich, app.Logger, flag.Args()[1:])
+		err = tool.CommandTool(ctx, app.Immich, app.Logger, flag.Args()[1:])
 	default:
 		err = fmt.Errorf("unknown command: %q", cmd)
 	}