Mirrors/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2026-07-17 16:49:04 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2025-10-23 18:23:24 +02:00
parent f2313b8dfe
commit b91a7380ea
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkg/fs/file_ext_test.go
View file

@ -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) {

2
pkg/fs/file_exts.go
View file

@ -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,

4
pkg/fs/file_exts_test.go
View file

@ -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"))

8
pkg/fs/file_type_test.go
View file

@ -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) {