Media: Associate ".mp.jpg" and ".mp.jpeg" files with ImageJpeg photoprism#5289

Signed-off-by: Michael Mayer <[email protected]>

Author: lastzero

pkg/fs/file_ext_test.go

@@ -75,6 +75,9 @@ func TestStripExt(t *testing.T) {
 		result := StripExt("/testdata/Test copy 3.foo")
 		assert.Equal(t, "/testdata/Test copy 3", result)
 	})
+	t.Run("MpJpg", func(t *testing.T) {
+		assert.Equal(t, "name.MP", StripExt("name.MP.jpg"))
+	})
 }
 
 func TestStripKnownExt(t *testing.T) {

pkg/fs/file_exts.go

@@ -15,6 +15,8 @@ var Extensions = FileExtensions{
 	ExtJpeg:     ImageJpeg,   // .jpg
 	".jpeg":     ImageJpeg,
 	".jpe":      ImageJpeg,
+	".mp.jpg":   ImageJpeg,
+	".mp.jpeg":  ImageJpeg,
 	".jif":      ImageJpeg,
 	".jfif":     ImageJpeg,
 	".jfi":      ImageJpeg,

pkg/fs/file_exts_test.go

@@ -25,8 +25,8 @@ func TestFileExtensions_Known(t *testing.T) {
 	t.Run("CR5", func(t *testing.T) {
 		assert.False(t, Extensions.Known("testdata/test (jpg).CR5"))
 	})
-	t.Run("Mp", func(t *testing.T) {
-		assert.True(t, Extensions.Known("file.mp"))
+	t.Run("Mp4", func(t *testing.T) {
+		assert.True(t, Extensions.Known("file.mp4"))
 	})
 	t.Run("Mxf", func(t *testing.T) {
 		assert.True(t, Extensions.Known("file.mxf"))

pkg/fs/file_type_test.go

@@ -171,10 +171,13 @@ func TestFileType(t *testing.T) {
 		result := FileType("")
 		assert.Equal(t, TypeUnknown, result)
 	})
-	t.Run("JPEG", func(t *testing.T) {
+	t.Run("Jpeg", func(t *testing.T) {
 		result := FileType("testdata/test.jpg")
 		assert.Equal(t, ImageJpeg, result)
 	})
+	t.Run("MpJpg", func(t *testing.T) {
+		assert.Equal(t, ImageJpeg, FileType("name.MP.jpg"))
+	})
 	t.Run("RawCRW", func(t *testing.T) {
 		result := FileType("testdata/test (jpg).crw")
 		assert.Equal(t, ImageRaw, result)
@@ -184,8 +187,9 @@ func TestFileType(t *testing.T) {
 		assert.Equal(t, ImageRaw, result)
 	})
 	t.Run("Mp4", func(t *testing.T) {
-		assert.Equal(t, Type("mp4"), FileType("file.mp"))
+		assert.Equal(t, Type("mp4"), FileType("file.mp4"))
 	})
+
 }
 
 func TestIsAnimatedImage(t *testing.T) {