add log level Debug

cmdupload/upload.go

@@ -163,6 +163,7 @@ assetLoop:
 }
 
 func (app *UpCmd) handleAsset(ctx context.Context, a *assets.LocalAssetFile) error {
+	app.logger.DebugObject("handleAsset: LocalAssetFile=", a)
 	showCount := true
 	defer func() {
 		a.Close()

immich/assets/googlephotos.go

@@ -123,6 +123,9 @@ func (fsys *GooglePhotosAssetBrowser) Browse(ctx context.Context) chan *LocalAss
 }
 
 func (fsys *GooglePhotosAssetBrowser) ResolveName(la *LocalAssetFile) (string, error) {
+	if la.isNotResolvable {
+		return "not resolved", fmt.Errorf("%s: %w", la.Title, os.ErrNotExist)
+	}
 	if la.isResolved {
 		return la.FileName, nil
 	}

immich/assets/localfile.go

@@ -49,9 +49,10 @@ type LocalAssetFile struct {
 	FSys fs.FS // Asset's file system
 
 	// Unexported fields
-	isResolved bool // True when the FileName is resolved, for google photos
-	fInfo      fs.FileInfo
-	size       int // Accessible via Stat()
+	isResolved      bool // True when the FileName is resolved, for google photos
+	isNotResolvable bool // When the name resolution has failed
+	fInfo           fs.FileInfo
+	size            int // Accessible via Stat()
 
 	// dateTaken       time.Time // Accessible via DateTaken()
 	// dateAlreadyRead bool      // true when the date has been read
@@ -125,32 +126,46 @@ func (l *LocalAssetFile) IsDir() bool { return false }
 
 func (l *LocalAssetFile) resolve() error {
 	var err error
+	if l.isNotResolvable {
+		return os.ErrNotExist
+	}
 	if l.isResolved {
 		return nil
 	}
 	if fsys, ok := l.FSys.(NameResolver); ok && !l.isResolved {
 		l.FileName, err = fsys.ResolveName(l)
 		if err != nil {
+			l.isNotResolvable = true
 			return err
 		}
 	}
 	l.fInfo, err = fs.Stat(l.FSys, l.FileName)
+	if err != nil {
+		l.isNotResolvable = true
+		return err
+	}
 	l.isResolved = true
 	return nil
 }
 
 func (l *LocalAssetFile) Name() string {
-	l.resolve()
-	return l.FileName
+	if l.resolve() == nil {
+		return l.FileName
+	}
+	return "name not resolved"
 }
 func (l *LocalAssetFile) Size() int64 {
-	l.resolve()
-	return l.fInfo.Size()
+	if l.resolve() != nil {
+		return l.fInfo.Size()
+	}
+	return 0
 }
 func (l *LocalAssetFile) Mode() fs.FileMode { return 0 }
 func (l *LocalAssetFile) ModTime() time.Time {
-	l.resolve()
-	return l.fInfo.ModTime()
+	if err := l.resolve(); err == nil {
+		return l.fInfo.ModTime()
+	}
+	return time.Time{}
 }
 func (l *LocalAssetFile) Sys() any { return nil }
 
@@ -197,6 +212,8 @@ func (l *LocalAssetFile) Remove() error {
 }
 
 func (l *LocalAssetFile) DeviceAssetID() string {
-	l.resolve()
-	return fmt.Sprintf("%s-%d", path.Base(l.Title), l.Size())
+	if err := l.resolve(); err == nil {
+		return fmt.Sprintf("%s-%d", path.Base(l.Title), l.Size())
+	}
+	return "Not resolved"
 }

immich/logger/logger.go

@@ -1,6 +1,8 @@
 package logger
 
 import (
+	"bytes"
+	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -15,6 +17,7 @@ const (
 	Warning
 	OK
 	Info
+	Debug
 )
 
 func (l Level) String() string {
@@ -29,14 +32,16 @@ func (l Level) String() string {
 		return "OK"
 	case Info:
 		return "Info"
+	case Debug:
+		return "Debug"
 	default:
 		return fmt.Sprintf("Log Level %d", l)
 	}
 }
 
 func StringToLevel(s string) (Level, error) {
 	s = strings.ToLower(s)
-	for l := Fatal; l <= Info; l++ {
+	for l := Fatal; l <= Debug; l++ {
 		if strings.ToLower(l.String()) == s {
 			return l, nil
 		}
@@ -50,6 +55,7 @@ var colorLevel = map[Level]string{
 	Warning: chalk.Yellow.String(),
 	OK:      chalk.Green.String(),
 	Info:    chalk.White.String(),
+	Debug:   chalk.Cyan.String(),
 }
 
 type Logger struct {
@@ -73,6 +79,24 @@ func NewLogger(DisplayLevel Level, noColors bool) *Logger {
 	return &l
 }
 
+func (l *Logger) Debug(f string, v ...any) {
+	l.Message(Debug, f, v...)
+}
+
+func (l *Logger) DebugObject(name string, v any) {
+	if Debug > l.displayLevel {
+		return
+	}
+	b := bytes.NewBuffer(nil)
+	enc := json.NewEncoder(b)
+	enc.SetIndent("", " ")
+	err := enc.Encode(v)
+	if err != nil {
+		l.Error("can't display object %s: %s", name, err)
+		return
+	}
+	l.Message(Debug, "%s:\n%s", name, b.String())
+}
 func (l *Logger) Info(f string, v ...any) {
 	l.Message(Info, f, v...)
 }

main.go

@@ -74,7 +74,7 @@ func Run(ctx context.Context, log *logger.Logger) (*logger.Logger, error) {
 	flag.StringVar(&app.Key, "key", "", "API Key")
 	flag.StringVar(&app.DeviceUUID, "device-uuid", deviceID, "Set a device UUID")
 	flag.BoolVar(&app.NoLogColors, "no-colors-log", false, "Disable colors on logs")
-	flag.StringVar(&app.LogLevel, "log-level", "ok", "Log level (Error|Warning|OK|Info), default OK")
+	flag.StringVar(&app.LogLevel, "log-level", "ok", "Log level (Error|Warning|OK|Info|Debug), default OK")
 	flag.BoolVar(&app.ApiTrace, "api-trace", false, "enable api call traces")
 	flag.Parse()
 	if len(app.EndPoint) == 0 {