From 33d6504d7177d5d56e4e7c930554e19c6de27b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean=20Fran=C3=A7ois=20CASSAN?=
 <simulot@users.noreply.github.com>
Date: Tue, 3 Dec 2024 20:00:49 +0100
Subject: [PATCH] Immich Merging Together JPGs and MOVs incorrectly (#556)

Fixes #554
---
 internal/groups/series/series.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/internal/groups/series/series.go b/internal/groups/series/series.go
index 998ad3ed..c145309e 100644
--- a/internal/groups/series/series.go
+++ b/internal/groups/series/series.go
@@ -54,10 +54,14 @@ func sendGroup(ctx context.Context, out chan<- *assets.Asset, outg chan<- *asset
 	gotJPG := false
 	gotRAW := false
 	gotHEIC := false
+	gotMP4 := false
+	gotMOV := false
 
 	cover := 0
 	// determine if the group is a burst
 	for i, a := range as {
+		gotMP4 = gotMP4 || a.Ext == ".mp4"
+		gotMOV = gotMOV || a.Ext == ".mov"
 		gotJPG = gotJPG || a.Ext == ".jpg"
 		gotRAW = gotRAW || filetypes.IsRawFile(a.Ext)
 		gotHEIC = gotHEIC || a.Ext == ".heic" || a.Ext == ".heif"
@@ -79,6 +83,17 @@ func sendGroup(ctx context.Context, out chan<- *assets.Asset, outg chan<- *asset
 				grouping = assets.GroupByRawJpg
 			} else if gotJPG && !gotRAW && gotHEIC {
 				grouping = assets.GroupByHeicJpg
+			} else if (gotMP4 || gotMOV) && (gotJPG || gotHEIC) {
+				grouping = assets.GroupByNone
+			}
+		}
+		if grouping == assets.GroupByNone {
+			for _, a := range as {
+				select {
+				case out <- a:
+				case <-ctx.Done():
+					return
+				}
 			}
 		}
 		// check the delay between the two assets, if it's too long, we don't group them