feat: add user information to client and enhance asset filtering by owner and library ID

fix: Immich's partner's assets make immich-go panicing since v0.24.7 #824

Author: simulot

app/client.go

@@ -123,6 +123,7 @@ type Client struct {
 	Immich             immich.ImmichInterface      // Immich client
 	ClientLog          *slog.Logger                // Logger
 	OnServerErrors     cliflags.OnServerErrorsFlag // Behavior on server errors
+	User               immich.User                 // User info corresponding to the API key
 }
 
 func (client *Client) Initialize(ctx context.Context, app *Application) error {
@@ -187,14 +188,15 @@ func (client *Client) Open(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	client.User = user
 
 	about, err := client.Immich.GetAboutInfo(ctx)
 	if err != nil {
 		return err
 	}
 	client.ClientLog.Info("Server information:", "version", about.Version)
 
-	client.ClientLog.Info(fmt.Sprintf("Connected, user: %s", user.Email))
+	client.ClientLog.Info(fmt.Sprintf("Connected, user: %s, ID: %s", user.Email, user.ID))
 	if client.DryRun {
 		client.ClientLog.Info("Dry-run mode enabled. No changes will be made to the server.")
 	}

app/cmd/upload/run.go

@@ -195,16 +195,26 @@ func (upCmd *UpCmd) getImmichAssets(ctx context.Context, updateFn progressUpdate
 	received := 0
 
 	err = upCmd.app.Client().Immich.GetAllAssetsWithFilter(ctx, nil, func(a *immich.Asset) error {
+		if updateFn != nil {
+			defer func() {
+				updateFn(received, totalOnImmich)
+			}()
+		}
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
 		default:
 			received++
+			if a.OwnerID != upCmd.app.Client().User.ID {
+				upCmd.app.Log().Debug("Skipping asset with different owner", "assetOwnerID", a.OwnerID, "clientUserID", upCmd.app.Client().User.ID, "ID", a.ID, "FileName", a.OriginalFileName, "Capture date", a.ExifInfo.DateTimeOriginal, "CheckSum", a.Checksum, "FileSize", a.ExifInfo.FileSizeInByte, "DeviceAssetID", a.DeviceAssetID, "OwnerID", a.OwnerID, "IsTrashed", a.IsTrashed, "IsArchived", a.IsArchived)
+				return nil
+			}
+			if a.LibraryID != "" {
+				upCmd.app.Log().Debug("Skipping asset with external library", "assetLibraryID", a.LibraryID, "ID", a.ID, "FileName", a.OriginalFileName, "Capture date", a.ExifInfo.DateTimeOriginal, "CheckSum", a.Checksum, "FileSize", a.ExifInfo.FileSizeInByte, "DeviceAssetID", a.DeviceAssetID, "OwnerID", a.OwnerID, "IsTrashed", a.IsTrashed, "IsArchived", a.IsArchived)
+				return nil
+			}
 			upCmd.assetIndex.addImmichAsset(a)
 			upCmd.app.Log().Debug("Immich asset:", "ID", a.ID, "FileName", a.OriginalFileName, "Capture date", a.ExifInfo.DateTimeOriginal, "CheckSum", a.Checksum, "FileSize", a.ExifInfo.FileSizeInByte, "DeviceAssetID", a.DeviceAssetID, "OwnerID", a.OwnerID, "IsTrashed", a.IsTrashed, "IsArchived", a.IsArchived)
-			if updateFn != nil {
-				updateFn(received, totalOnImmich)
-			}
 			return nil
 		}
 	})

immich/asset.go

@@ -36,7 +36,7 @@ type Asset struct {
 	StackParentID    string            `json:"stackParentId"`
 	Albums           []AlbumSimplified `json:"-"` // Albums that asset belong to
 	Tags             []TagSimplified   `json:"tags"`
-	// JustUploaded     bool              `json:"-"` // TO REMOVE
+	LibraryID        string            `json:"libraryId,omitempty"`
 }
 
 // NewAssetFromImmich creates an assets.Asset from an immich.Asset.