Merge branch 'feature-#58---add-filter-on-directories-during-the-impo…

…rt' into Fix-for-#69----Panic--runtime-error--slice-bounds-out-of-range---29--

.goreleaser.yaml

@@ -20,6 +20,8 @@ builds:
       - amd64
       - arm
       - arm64      
+    flags:
+      - -trimpath
     ldflags:
     - '-s -w "-extldflags=-static" -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=goreleaser'
 

assets/files/localassets.go

@@ -3,7 +3,9 @@ package files
 import (
 	"context"
 	"immich-go/assets"
+	"immich-go/helpers/fshelper"
 	"immich-go/immich/metadata"
+	"immich-go/logger"
 	"io/fs"
 	"path"
 	"path/filepath"
@@ -14,12 +16,14 @@ import (
 type LocalAssetBrowser struct {
 	fsys   fs.FS
 	albums map[string]string
+	log    logger.Logger
 }
 
-func NewLocalFiles(ctx context.Context, fsys fs.FS) (*LocalAssetBrowser, error) {
+func NewLocalFiles(ctx context.Context, fsys fs.FS, log logger.Logger) (*LocalAssetBrowser, error) {
 	return &LocalAssetBrowser{
 		fsys:   fsys,
 		albums: map[string]string{},
+		log:    log,
 	}, nil
 }
 
@@ -54,6 +58,11 @@ func (la *LocalAssetBrowser) Browse(ctx context.Context) chan *assets.LocalAsset
 					return nil
 				}
 
+				ext := path.Ext(name)
+				if _, err := fshelper.MimeFromExt(strings.ToLower(ext)); err != nil {
+					return nil
+				}
+				la.log.Debug("file '%s'", name)
 				f := assets.LocalAssetFile{
 					FSys:     la.fsys,
 					FileName: name,
@@ -76,12 +85,8 @@ func (la *LocalAssetBrowser) Browse(ctx context.Context) chan *assets.LocalAsset
 							f.DateTaken = time.Now()
 						}
 					}
-					_, err = fs.Stat(la.fsys, name+".xmp")
-					if err == nil {
-						f.SideCar = &metadata.SideCar{
-							FileName: name + ".xmp",
-							OnFSsys:  true,
-						}
+					if !la.checkSidecar(&f, name+".xmp") {
+						la.checkSidecar(&f, strings.TrimSuffix(name, ext)+".xmp")
 					}
 				}
 				fileChan <- &f
@@ -104,6 +109,19 @@ func (la *LocalAssetBrowser) Browse(ctx context.Context) chan *assets.LocalAsset
 	return fileChan
 }
 
+func (la *LocalAssetBrowser) checkSidecar(f *assets.LocalAssetFile, name string) bool {
+	_, err := fs.Stat(la.fsys, name+".xmp")
+	if err == nil {
+		la.log.Debug("  found sidecar: '%s'", name)
+		f.SideCar = &metadata.SideCar{
+			FileName: name + ".xmp",
+			OnFSsys:  true,
+		}
+		return true
+	}
+	return false
+}
+
 func (la *LocalAssetBrowser) addAlbum(dir string) {
 	base := path.Base(dir)
 	la.albums[dir] = base

assets/files/localassets_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"immich-go/assets/files"
+	"immich-go/logger"
 	"path"
 	"reflect"
 	"sort"
@@ -73,7 +74,7 @@ func TestLocalAssets(t *testing.T) {
 			}
 			ctx := context.Background()
 
-			b, err := files.NewLocalFiles(ctx, fsys)
+			b, err := files.NewLocalFiles(ctx, fsys, logger.NoLogger{})
 			if err != nil {
 				t.Error(err)
 			}

assets/gp/googlephotos.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"immich-go/assets"
 	"immich-go/helpers/fshelper"
+	"immich-go/logger"
 	"io/fs"
 	"path"
 	"strings"
@@ -16,6 +17,7 @@ type Takeout struct {
 	filesByDir  map[string][]fileKey         // files name mapped by dir
 	jsonByYear  map[jsonKey]*GoogleMetaData  // JSON by year of capture and full path
 	albumsByDir map[string]assets.LocalAlbum // album title mapped by dir
+	log         logger.Logger
 }
 
 type fileKey struct {
@@ -31,12 +33,13 @@ type Album struct {
 	Title string
 }
 
-func NewTakeout(ctx context.Context, fsys fs.FS) (*Takeout, error) {
+func NewTakeout(ctx context.Context, fsys fs.FS, log logger.Logger) (*Takeout, error) {
 	to := Takeout{
 		fsys:        fsys,
 		filesByDir:  map[string][]fileKey{},
 		jsonByYear:  map[jsonKey]*GoogleMetaData{},
 		albumsByDir: map[string]assets.LocalAlbum{},
+		log:         log,
 	}
 	err := to.walk(ctx, fsys)
 
@@ -49,6 +52,7 @@ func (to *Takeout) walk(ctx context.Context, fsys fs.FS) error {
 		if err != nil {
 			return err
 		}
+		to.log.Debug("walk file '%s'", name)
 		select {
 		case <-ctx.Done():
 			// Check if the context has been cancelled
@@ -116,17 +120,21 @@ func (to *Takeout) Browse(ctx context.Context) chan *assets.LocalAssetFile {
 	go func() {
 		defer close(c)
 		for k, md := range to.jsonByYear {
+			to.log.Debug("Checking '%s', %d", k.name, k.year)
 			assets := to.jsonAssets(k, md)
 			for _, a := range assets {
 				fk := fileKey{name: path.Base(a.FileName), size: int64(a.FileSize)}
 				if _, exist := passed[fk]; !exist {
+					to.log.Debug("  associated with '%s'", fk.name)
 					passed[fk] = nil
 					select {
 					case <-ctx.Done():
 						return
 					default:
 						c <- a
 					}
+				} else {
+					to.log.Debug("  associated with '%s', but already seen", fk.name)
 				}
 			}
 		}

assets/gp/testgp_bigread_test.go

@@ -6,6 +6,7 @@ package gp
 import (
 	"context"
 	"immich-go/helpers/fshelper"
+	"immich-go/logger"
 	"path/filepath"
 	"testing"
 )
@@ -19,7 +20,7 @@ func TestReadBigTakeout(t *testing.T) {
 	cnt := 0
 	fsyss, err := fshelper.ParsePath(m, true)
 	for _, fsys := range fsyss {
-		to, err := NewTakeout(context.Background(), fsys)
+		to, err := NewTakeout(context.Background(), fsys, logger.NoLogger{})
 		if err != nil {
 			t.Error(err)
 			return

assets/gp/testgp_test.go

@@ -2,6 +2,7 @@ package gp
 
 import (
 	"context"
+	"immich-go/logger"
 	"path"
 	"reflect"
 	"testing"
@@ -85,7 +86,7 @@ func TestBrowse(t *testing.T) {
 			}
 			ctx := context.Background()
 
-			b, err := NewTakeout(ctx, fsys)
+			b, err := NewTakeout(ctx, fsys, logger.NoLogger{})
 			if err != nil {
 				t.Error(err)
 			}
@@ -160,7 +161,7 @@ func TestAlbums(t *testing.T) {
 				t.Error(fsys.err)
 				return
 			}
-			b, err := NewTakeout(ctx, fsys)
+			b, err := NewTakeout(ctx, fsys, logger.NoLogger{})
 			if err != nil {
 				t.Error(err)
 			}

cmdduplicate/duplicate.go

@@ -8,7 +8,7 @@ import (
 	"flag"
 	"immich-go/helpers/gen"
 	"immich-go/immich"
-	"immich-go/immich/logger"
+	"immich-go/logger"
 	"immich-go/ui"
 	"path"
 	"sort"
@@ -18,7 +18,7 @@ import (
 )
 
 type DuplicateCmd struct {
-	logger *logger.Logger
+	logger *logger.Log
 	Immich *immich.ImmichClient // Immich client
 
 	AssumeYes      bool             // When true, doesn't ask to the user
@@ -34,7 +34,7 @@ type duplicateKey struct {
 	Name string
 }
 
-func NewDuplicateCmd(ctx context.Context, ic *immich.ImmichClient, logger *logger.Logger, args []string) (*DuplicateCmd, error) {
+func NewDuplicateCmd(ctx context.Context, ic *immich.ImmichClient, logger *logger.Log, args []string) (*DuplicateCmd, error) {
 	cmd := flag.NewFlagSet("duplicate", flag.ExitOnError)
 	validRange := immich.DateRange{}
 	validRange.Set("1850-01-04,2030-01-01")
@@ -57,7 +57,7 @@ func NewDuplicateCmd(ctx context.Context, ic *immich.ImmichClient, logger *logge
 	return &app, err
 }
 
-func DuplicateCommand(ctx context.Context, ic *immich.ImmichClient, log *logger.Logger, args []string) error {
+func DuplicateCommand(ctx context.Context, ic *immich.ImmichClient, log *logger.Log, args []string) error {
 	app, err := NewDuplicateCmd(ctx, ic, log, args)
 	if err != nil {
 		return err

cmdmetadata/metadatacmd.go

@@ -5,8 +5,8 @@ import (
 	"flag"
 	"immich-go/helpers/docker"
 	"immich-go/immich"
-	"immich-go/immich/logger"
 	"immich-go/immich/metadata"
+	"immich-go/logger"
 	"math"
 	"path"
 	"strings"
@@ -15,14 +15,14 @@ import (
 
 type MetadataCmd struct {
 	Immich                 *immich.ImmichClient // Immich client
-	Log                    *logger.Logger
+	Log                    *logger.Log
 	DryRun                 bool
 	MissingDateDespiteName bool
 	MissingDate            bool
 	DockerHost             string
 }
 
-func NewMetadataCmd(ctx context.Context, ic *immich.ImmichClient, logger *logger.Logger, args []string) (*MetadataCmd, error) {
+func NewMetadataCmd(ctx context.Context, ic *immich.ImmichClient, logger *logger.Log, args []string) (*MetadataCmd, error) {
 	var err error
 	cmd := flag.NewFlagSet("metadata", flag.ExitOnError)
 	app := MetadataCmd{
@@ -38,7 +38,7 @@ func NewMetadataCmd(ctx context.Context, ic *immich.ImmichClient, logger *logger
 	return &app, err
 }
 
-func MetadataCommand(ctx context.Context, ic *immich.ImmichClient, log *logger.Logger, args []string) error {
+func MetadataCommand(ctx context.Context, ic *immich.ImmichClient, log *logger.Log, args []string) error {
 	app, err := NewMetadataCmd(ctx, ic, log, args)
 	if err != nil {
 		return err

cmdstack/cmdstack.go

@@ -5,7 +5,7 @@ import (
 	"flag"
 	"immich-go/helpers/stacking"
 	"immich-go/immich"
-	"immich-go/immich/logger"
+	"immich-go/logger"
 	"immich-go/ui"
 	"path"
 	"sort"
@@ -14,13 +14,13 @@ import (
 
 type StackCmd struct {
 	Immich *immich.ImmichClient // Immich client
-	logger *logger.Logger
+	logger *logger.Log
 
 	AssumeYes bool
 	DateRange immich.DateRange // Set capture date range
 }
 
-func initSack(xtx context.Context, ic *immich.ImmichClient, log *logger.Logger, args []string) (*StackCmd, error) {
+func initSack(xtx context.Context, ic *immich.ImmichClient, log *logger.Log, args []string) (*StackCmd, error) {
 	cmd := flag.NewFlagSet("stack", flag.ExitOnError)
 	validRange := immich.DateRange{}
 
@@ -40,7 +40,7 @@ func initSack(xtx context.Context, ic *immich.ImmichClient, log *logger.Logger,
 	err := cmd.Parse(args)
 	return &app, err
 }
-func NewStackCommand(ctx context.Context, ic *immich.ImmichClient, log *logger.Logger, args []string) error {
+func NewStackCommand(ctx context.Context, ic *immich.ImmichClient, log *logger.Log, args []string) error {
 	app, err := initSack(ctx, ic, log, args)
 	if err != nil {
 		return err

cmdtool/cmdalbum/cmdalbum.go

@@ -5,14 +5,14 @@ import (
 	"flag"
 	"fmt"
 	"immich-go/immich"
-	"immich-go/immich/logger"
+	"immich-go/logger"
 	"immich-go/ui"
 	"regexp"
 	"sort"
 	"strconv"
 )
 
-func AlbumCommand(ctx context.Context, ic *immich.ImmichClient, log *logger.Logger, args []string) error {
+func AlbumCommand(ctx context.Context, ic *immich.ImmichClient, log *logger.Log, args []string) error {
 	if len(args) > 0 {
 		cmd := args[0]
 		args = args[1:]
@@ -26,13 +26,13 @@ func AlbumCommand(ctx context.Context, ic *immich.ImmichClient, log *logger.Logg
 }
 
 type DeleteAlbumCmd struct {
-	log       *logger.Logger
+	log       *logger.Log
 	Immich    *immich.ImmichClient // Immich client
 	pattern   *regexp.Regexp       // album pattern
 	AssumeYes bool
 }
 
-func deleteAlbum(ctx context.Context, ic *immich.ImmichClient, log *logger.Logger, args []string) error {
+func deleteAlbum(ctx context.Context, ic *immich.ImmichClient, log *logger.Log, args []string) error {
 	app := &DeleteAlbumCmd{
 		log:    log,
 		Immich: ic,

cmdtool/cmdtool.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"immich-go/cmdtool/cmdalbum"
 	"immich-go/immich"
-	"immich-go/immich/logger"
+	"immich-go/logger"
 )
 
-func CommandTool(ctx context.Context, ic *immich.ImmichClient, logger *logger.Logger, args []string) error {
+func CommandTool(ctx context.Context, ic *immich.ImmichClient, logger *logger.Log, args []string) error {
 	if len(args) > 0 {
 		cmd := args[0]
 		args = args[1:]