From c65215b2ac7e44773d7e50927269d3dab4c7899c Mon Sep 17 00:00:00 2001 From: b1ackd0t <28790446+rodneyosodo@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:41:10 +0300 Subject: [PATCH] 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> --- .../cmdalbum.go => cmd/album/album.go | 6 ++---- {cmdduplicate => cmd/duplicate}/duplicate.go | 2 +- .../metadata/metadata.go | 2 +- cmdstack/cmdstack.go => cmd/stack/stack.go | 2 +- cmdtool/cmdtool.go => cmd/tool/tool.go | 6 +++--- .../PXL_20231006_063000139.jpg | Bin .../PXL_20231006_063000139.jpg.json | 0 .../PXL_20231006_063029647.jpg | Bin .../PXL_20231006_063029647.jpg.json | 0 .../PXL_20231006_063108407.jpg | Bin .../PXL_20231006_063108407.jpg.json | 0 .../PXL_20231006_063121958.jpg | Bin .../PXL_20231006_063121958.jpg.json | 0 .../PXL_20231006_063357420.jpg | Bin .../PXL_20231006_063357420.jpg.json | 0 .../PXL_20231006_063536303.jpg | Bin .../PXL_20231006_063536303.jpg.json | 0 .../PXL_20231006_063851485.jpg | Bin .../PXL_20231006_063851485.jpg.json | 0 .../PXL_20231006_063909898.LS.mp4 | Bin .../PXL_20231006_063909898.LS.mp4.json | 0 .../m\303\251tadonn\303\251es.json" | 0 .../PXL_20231006_063000139.jpg | Bin .../PXL_20231006_063000139.jpg.json | 0 .../PXL_20231006_063528961.jpg | Bin .../PXL_20231006_063528961.jpg.json | 0 .../Sans titre(9)/PXL_20231006_063108407.jpg | Bin .../PXL_20231006_063108407.jpg.json | 0 .../m\303\251tadonn\303\251es.json" | 0 .../Takeout3/Photos from 2023/DSC_0238(1).JPG | 0 .../Takeout3/Photos from 2023/DSC_0238.JPG | 0 .../Photos from 2023/DSC_0238.JPG(1).json | 0 .../Photos from 2023/DSC_0238.JPG.json | 0 .../Takeout3/Photos from 2023/DSC_0238_1.JPG | 0 .../Photos from 2023/DSC_0238_1.JPG.json | 0 .../high/AlbumA/PXL_20231006_063000139.jpg | Bin .../high/AlbumA/PXL_20231006_063029647.jpg | Bin .../high/AlbumA/PXL_20231006_063108407.jpg | Bin .../high/AlbumA/PXL_20231006_063121958.jpg | Bin .../high/AlbumA/PXL_20231006_063357420.jpg | Bin .../high/AlbumB/PXL_20231006_063528961.jpg | Bin .../high/AlbumB/PXL_20231006_063536303.jpg | Bin .../high/AlbumB/PXL_20231006_063851485.jpg | Bin .../folder/low/PXL_20231006_063000139.jpg | Bin .../folder/low/PXL_20231006_063029647.jpg | Bin .../folder/low/PXL_20231006_063108407.jpg | Bin .../folder/low/PXL_20231006_063121958.jpg | Bin .../folder/low/PXL_20231006_063357420.jpg | Bin .../folder/low/PXL_20231006_063528961.jpg | Bin .../folder/low/PXL_20231006_063536303.jpg | Bin .../folder/low/PXL_20231006_063851485.jpg | Bin {cmdupload => cmd/upload}/assets.go | 2 +- {cmdupload => cmd/upload}/configuration.go | 2 +- .../upload}/e2e_upload_folder_test.go | 2 +- {cmdupload => cmd/upload}/stringlist_test.go | 2 +- {cmdupload => cmd/upload}/upload.go | 2 +- {cmdupload => cmd/upload}/upload_test.go | 2 +- main.go | 20 +++++++++--------- 58 files changed, 24 insertions(+), 26 deletions(-) rename cmdtool/cmdalbum/cmdalbum.go => cmd/album/album.go (94%) rename {cmdduplicate => cmd/duplicate}/duplicate.go (99%) rename cmdmetadata/metadatacmd.go => cmd/metadata/metadata.go (99%) rename cmdstack/cmdstack.go => cmd/stack/stack.go (99%) rename cmdtool/cmdtool.go => cmd/tool/tool.go (75%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063000139.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063000139.jpg.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063029647.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063029647.jpg.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063108407.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063108407.jpg.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063121958.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063121958.jpg.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063357420.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063357420.jpg.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063536303.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063536303.jpg.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063851485.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063851485.jpg.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4 (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4.json (100%) rename "cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/m\303\251tadonn\303\251es.json" => "cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/m\303\251tadonn\303\251es.json" (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063000139.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063000139.jpg.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063528961.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063528961.jpg.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/PXL_20231006_063108407.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/PXL_20231006_063108407.jpg.json (100%) rename "cmdupload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/m\303\251tadonn\303\251es.json" => "cmd/upload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/m\303\251tadonn\303\251es.json" (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout3/Photos from 2023/DSC_0238(1).JPG (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG(1).json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout3/Photos from 2023/DSC_0238_1.JPG (100%) rename {cmdupload => cmd/upload}/TEST_DATA/Takeout3/Photos from 2023/DSC_0238_1.JPG.json (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/high/AlbumA/PXL_20231006_063000139.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/high/AlbumA/PXL_20231006_063029647.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/high/AlbumA/PXL_20231006_063108407.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/high/AlbumA/PXL_20231006_063121958.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/high/AlbumA/PXL_20231006_063357420.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/high/AlbumB/PXL_20231006_063528961.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/high/AlbumB/PXL_20231006_063536303.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/high/AlbumB/PXL_20231006_063851485.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/low/PXL_20231006_063000139.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/low/PXL_20231006_063029647.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/low/PXL_20231006_063108407.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/low/PXL_20231006_063121958.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/low/PXL_20231006_063357420.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/low/PXL_20231006_063528961.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/low/PXL_20231006_063536303.jpg (100%) rename {cmdupload => cmd/upload}/TEST_DATA/folder/low/PXL_20231006_063851485.jpg (100%) rename {cmdupload => cmd/upload}/assets.go (98%) rename {cmdupload => cmd/upload}/configuration.go (98%) rename {cmdupload => cmd/upload}/e2e_upload_folder_test.go (99%) rename {cmdupload => cmd/upload}/stringlist_test.go (98%) rename {cmdupload => cmd/upload}/upload.go (99%) rename {cmdupload => cmd/upload}/upload_test.go (99%) diff --git a/cmdtool/cmdalbum/cmdalbum.go b/cmd/album/album.go similarity index 94% rename from cmdtool/cmdalbum/cmdalbum.go rename to cmd/album/album.go index 5be2a87..8488850 100644 --- a/cmdtool/cmdalbum/cmdalbum.go +++ b/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 { diff --git a/cmdduplicate/duplicate.go b/cmd/duplicate/duplicate.go similarity index 99% rename from cmdduplicate/duplicate.go rename to cmd/duplicate/duplicate.go index b3ea7d0..783f29d 100644 --- a/cmdduplicate/duplicate.go +++ b/cmd/duplicate/duplicate.go @@ -1,7 +1,7 @@ /* Check the list of photos to list and discard duplicates. */ -package cmdduplicate +package duplicate import ( "context" diff --git a/cmdmetadata/metadatacmd.go b/cmd/metadata/metadata.go similarity index 99% rename from cmdmetadata/metadatacmd.go rename to cmd/metadata/metadata.go index 315542d..371e719 100644 --- a/cmdmetadata/metadatacmd.go +++ b/cmd/metadata/metadata.go @@ -1,4 +1,4 @@ -package cmdmetadata +package metadata import ( "context" diff --git a/cmdstack/cmdstack.go b/cmd/stack/stack.go similarity index 99% rename from cmdstack/cmdstack.go rename to cmd/stack/stack.go index a27f774..daf3c21 100644 --- a/cmdstack/cmdstack.go +++ b/cmd/stack/stack.go @@ -1,4 +1,4 @@ -package cmdstack +package stack import ( "context" diff --git a/cmdtool/cmdtool.go b/cmd/tool/tool.go similarity index 75% rename from cmdtool/cmdtool.go rename to cmd/tool/tool.go index 34a6e0e..fbb5a5b 100644 --- a/cmdtool/cmdtool.go +++ b/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) } } diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063000139.jpg b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063000139.jpg similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063000139.jpg rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063000139.jpg diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063000139.jpg.json b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063000139.jpg.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063000139.jpg.json rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063000139.jpg.json diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063029647.jpg b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063029647.jpg similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063029647.jpg rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063029647.jpg diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063029647.jpg.json b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063029647.jpg.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063029647.jpg.json rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063029647.jpg.json diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063108407.jpg b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063108407.jpg similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063108407.jpg rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063108407.jpg diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063108407.jpg.json b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063108407.jpg.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063108407.jpg.json rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063108407.jpg.json diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063121958.jpg b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063121958.jpg similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063121958.jpg rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063121958.jpg diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063121958.jpg.json b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063121958.jpg.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063121958.jpg.json rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063121958.jpg.json diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063357420.jpg b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063357420.jpg similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063357420.jpg rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063357420.jpg diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063357420.jpg.json b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063357420.jpg.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063357420.jpg.json rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063357420.jpg.json diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063536303.jpg b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063536303.jpg similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063536303.jpg rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063536303.jpg diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063536303.jpg.json b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063536303.jpg.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063536303.jpg.json rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063536303.jpg.json diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063851485.jpg b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063851485.jpg similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063851485.jpg rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063851485.jpg diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063851485.jpg.json b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063851485.jpg.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063851485.jpg.json rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063851485.jpg.json diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4 b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4 similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4 rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4 diff --git a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4.json b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4.json rename to cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4.json diff --git "a/cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/m\303\251tadonn\303\251es.json" "b/cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/m\303\251tadonn\303\251es.json" similarity index 100% rename from "cmdupload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/m\303\251tadonn\303\251es.json" rename to "cmd/upload/TEST_DATA/Takeout1/Google Photos/Album test 6-10-23/m\303\251tadonn\303\251es.json" diff --git a/cmdupload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063000139.jpg b/cmd/upload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063000139.jpg similarity index 100% rename from cmdupload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063000139.jpg rename to cmd/upload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063000139.jpg diff --git a/cmdupload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063000139.jpg.json b/cmd/upload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063000139.jpg.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063000139.jpg.json rename to cmd/upload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063000139.jpg.json diff --git a/cmdupload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063528961.jpg b/cmd/upload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063528961.jpg similarity index 100% rename from cmdupload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063528961.jpg rename to cmd/upload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063528961.jpg diff --git a/cmdupload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063528961.jpg.json b/cmd/upload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063528961.jpg.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063528961.jpg.json rename to cmd/upload/TEST_DATA/Takeout2/Google Photos/Photos from 2023/PXL_20231006_063528961.jpg.json diff --git a/cmdupload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/PXL_20231006_063108407.jpg b/cmd/upload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/PXL_20231006_063108407.jpg similarity index 100% rename from cmdupload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/PXL_20231006_063108407.jpg rename to cmd/upload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/PXL_20231006_063108407.jpg diff --git a/cmdupload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/PXL_20231006_063108407.jpg.json b/cmd/upload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/PXL_20231006_063108407.jpg.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/PXL_20231006_063108407.jpg.json rename to cmd/upload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/PXL_20231006_063108407.jpg.json diff --git "a/cmdupload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/m\303\251tadonn\303\251es.json" "b/cmd/upload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/m\303\251tadonn\303\251es.json" similarity index 100% rename from "cmdupload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/m\303\251tadonn\303\251es.json" rename to "cmd/upload/TEST_DATA/Takeout2/Google Photos/Sans titre(9)/m\303\251tadonn\303\251es.json" diff --git a/cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238(1).JPG b/cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238(1).JPG similarity index 100% rename from cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238(1).JPG rename to cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238(1).JPG diff --git a/cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG b/cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG similarity index 100% rename from cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG rename to cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG diff --git a/cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG(1).json b/cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG(1).json similarity index 100% rename from cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG(1).json rename to cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG(1).json diff --git a/cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG.json b/cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG.json rename to cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238.JPG.json diff --git a/cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238_1.JPG b/cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238_1.JPG similarity index 100% rename from cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238_1.JPG rename to cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238_1.JPG diff --git a/cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238_1.JPG.json b/cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238_1.JPG.json similarity index 100% rename from cmdupload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238_1.JPG.json rename to cmd/upload/TEST_DATA/Takeout3/Photos from 2023/DSC_0238_1.JPG.json diff --git a/cmdupload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063000139.jpg b/cmd/upload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063000139.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063000139.jpg rename to cmd/upload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063000139.jpg diff --git a/cmdupload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063029647.jpg b/cmd/upload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063029647.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063029647.jpg rename to cmd/upload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063029647.jpg diff --git a/cmdupload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063108407.jpg b/cmd/upload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063108407.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063108407.jpg rename to cmd/upload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063108407.jpg diff --git a/cmdupload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063121958.jpg b/cmd/upload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063121958.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063121958.jpg rename to cmd/upload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063121958.jpg diff --git a/cmdupload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063357420.jpg b/cmd/upload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063357420.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063357420.jpg rename to cmd/upload/TEST_DATA/folder/high/AlbumA/PXL_20231006_063357420.jpg diff --git a/cmdupload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063528961.jpg b/cmd/upload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063528961.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063528961.jpg rename to cmd/upload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063528961.jpg diff --git a/cmdupload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063536303.jpg b/cmd/upload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063536303.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063536303.jpg rename to cmd/upload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063536303.jpg diff --git a/cmdupload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063851485.jpg b/cmd/upload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063851485.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063851485.jpg rename to cmd/upload/TEST_DATA/folder/high/AlbumB/PXL_20231006_063851485.jpg diff --git a/cmdupload/TEST_DATA/folder/low/PXL_20231006_063000139.jpg b/cmd/upload/TEST_DATA/folder/low/PXL_20231006_063000139.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/low/PXL_20231006_063000139.jpg rename to cmd/upload/TEST_DATA/folder/low/PXL_20231006_063000139.jpg diff --git a/cmdupload/TEST_DATA/folder/low/PXL_20231006_063029647.jpg b/cmd/upload/TEST_DATA/folder/low/PXL_20231006_063029647.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/low/PXL_20231006_063029647.jpg rename to cmd/upload/TEST_DATA/folder/low/PXL_20231006_063029647.jpg diff --git a/cmdupload/TEST_DATA/folder/low/PXL_20231006_063108407.jpg b/cmd/upload/TEST_DATA/folder/low/PXL_20231006_063108407.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/low/PXL_20231006_063108407.jpg rename to cmd/upload/TEST_DATA/folder/low/PXL_20231006_063108407.jpg diff --git a/cmdupload/TEST_DATA/folder/low/PXL_20231006_063121958.jpg b/cmd/upload/TEST_DATA/folder/low/PXL_20231006_063121958.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/low/PXL_20231006_063121958.jpg rename to cmd/upload/TEST_DATA/folder/low/PXL_20231006_063121958.jpg diff --git a/cmdupload/TEST_DATA/folder/low/PXL_20231006_063357420.jpg b/cmd/upload/TEST_DATA/folder/low/PXL_20231006_063357420.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/low/PXL_20231006_063357420.jpg rename to cmd/upload/TEST_DATA/folder/low/PXL_20231006_063357420.jpg diff --git a/cmdupload/TEST_DATA/folder/low/PXL_20231006_063528961.jpg b/cmd/upload/TEST_DATA/folder/low/PXL_20231006_063528961.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/low/PXL_20231006_063528961.jpg rename to cmd/upload/TEST_DATA/folder/low/PXL_20231006_063528961.jpg diff --git a/cmdupload/TEST_DATA/folder/low/PXL_20231006_063536303.jpg b/cmd/upload/TEST_DATA/folder/low/PXL_20231006_063536303.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/low/PXL_20231006_063536303.jpg rename to cmd/upload/TEST_DATA/folder/low/PXL_20231006_063536303.jpg diff --git a/cmdupload/TEST_DATA/folder/low/PXL_20231006_063851485.jpg b/cmd/upload/TEST_DATA/folder/low/PXL_20231006_063851485.jpg similarity index 100% rename from cmdupload/TEST_DATA/folder/low/PXL_20231006_063851485.jpg rename to cmd/upload/TEST_DATA/folder/low/PXL_20231006_063851485.jpg diff --git a/cmdupload/assets.go b/cmd/upload/assets.go similarity index 98% rename from cmdupload/assets.go rename to cmd/upload/assets.go index a407336..96fb192 100644 --- a/cmdupload/assets.go +++ b/cmd/upload/assets.go @@ -1,4 +1,4 @@ -package cmdupload +package upload import ( "fmt" diff --git a/cmdupload/configuration.go b/cmd/upload/configuration.go similarity index 98% rename from cmdupload/configuration.go rename to cmd/upload/configuration.go index 958a7b6..21ab3ea 100644 --- a/cmdupload/configuration.go +++ b/cmd/upload/configuration.go @@ -1,4 +1,4 @@ -package cmdupload +package upload import ( "errors" diff --git a/cmdupload/e2e_upload_folder_test.go b/cmd/upload/e2e_upload_folder_test.go similarity index 99% rename from cmdupload/e2e_upload_folder_test.go rename to cmd/upload/e2e_upload_folder_test.go index d8569d2..82b2695 100644 --- a/cmdupload/e2e_upload_folder_test.go +++ b/cmd/upload/e2e_upload_folder_test.go @@ -1,7 +1,7 @@ //go:build e2e // +build e2e -package cmdupload +package upload import ( "context" diff --git a/cmdupload/stringlist_test.go b/cmd/upload/stringlist_test.go similarity index 98% rename from cmdupload/stringlist_test.go rename to cmd/upload/stringlist_test.go index d6a7c6e..0e2136f 100644 --- a/cmdupload/stringlist_test.go +++ b/cmd/upload/stringlist_test.go @@ -1,4 +1,4 @@ -package cmdupload +package upload import "testing" diff --git a/cmdupload/upload.go b/cmd/upload/upload.go similarity index 99% rename from cmdupload/upload.go rename to cmd/upload/upload.go index 05fb1c2..7e286cb 100644 --- a/cmdupload/upload.go +++ b/cmd/upload/upload.go @@ -1,6 +1,6 @@ // Command Upload -package cmdupload +package upload import ( "context" diff --git a/cmdupload/upload_test.go b/cmd/upload/upload_test.go similarity index 99% rename from cmdupload/upload_test.go rename to cmd/upload/upload_test.go index b3f8131..541f108 100644 --- a/cmdupload/upload_test.go +++ b/cmd/upload/upload_test.go @@ -1,4 +1,4 @@ -package cmdupload +package upload import ( "cmp" diff --git a/main.go b/main.go index fa16d6c..8317201 100644 --- a/main.go +++ b/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) }