MM-14030 Add format and frame count to image metadata (#10757)
* MM-14030 Add initial CountFrames * MM-14030 Add format and frame count to image metadata * Fix tests and stop using image dimensions from OpenGraph * Fix copyright header * Move license to NOTICE.txt
Этот коммит содержится в:
Harrison Healey
коммит произвёл
GitHub
GitHub
родитель
9a9d5d4081
Коммит
e50b642e43
@@ -257,10 +257,12 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
imageDimensions := clientPost.Metadata.Images
|
||||
require.Len(t, imageDimensions, 2)
|
||||
assert.Equal(t, &model.PostImage{
|
||||
Format: "png",
|
||||
Width: 1068,
|
||||
Height: 552,
|
||||
}, imageDimensions["https://github.com/hmhealey/test-files/raw/master/logoVertical.png"])
|
||||
assert.Equal(t, &model.PostImage{
|
||||
Format: "png",
|
||||
Width: 501,
|
||||
Height: 501,
|
||||
}, imageDimensions["https://github.com/hmhealey/test-files/raw/master/icon.png"])
|
||||
@@ -310,6 +312,7 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
imageDimensions := clientPost.Metadata.Images
|
||||
require.Len(t, imageDimensions, 1)
|
||||
assert.Equal(t, &model.PostImage{
|
||||
Format: "png",
|
||||
Width: 1068,
|
||||
Height: 552,
|
||||
}, imageDimensions["https://github.com/hmhealey/test-files/raw/master/logoVertical.png"])
|
||||
@@ -354,6 +357,7 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
imageDimensions := clientPost.Metadata.Images
|
||||
require.Len(t, imageDimensions, 1)
|
||||
assert.Equal(t, &model.PostImage{
|
||||
Format: "png",
|
||||
Width: 420,
|
||||
Height: 420,
|
||||
}, imageDimensions["https://avatars1.githubusercontent.com/u/3277310?s=400&v=4"])
|
||||
@@ -391,6 +395,7 @@ func TestPreparePostForClient(t *testing.T) {
|
||||
imageDimensions := clientPost.Metadata.Images
|
||||
require.Len(t, imageDimensions, 1)
|
||||
assert.Equal(t, &model.PostImage{
|
||||
Format: "png",
|
||||
Width: 501,
|
||||
Height: 501,
|
||||
}, imageDimensions["https://github.com/hmhealey/test-files/raw/master/icon.png"])
|
||||
@@ -643,6 +648,7 @@ func TestGetImagesForPost(t *testing.T) {
|
||||
|
||||
assert.Equal(t, images, map[string]*model.PostImage{
|
||||
imageURL: {
|
||||
Format: "png",
|
||||
Width: 408,
|
||||
Height: 336,
|
||||
},
|
||||
@@ -671,48 +677,7 @@ func TestGetImagesForPost(t *testing.T) {
|
||||
assert.Equal(t, images, map[string]*model.PostImage{})
|
||||
})
|
||||
|
||||
t.Run("for an OpenGraph image with dimensions", func(t *testing.T) {
|
||||
th := Setup(t)
|
||||
defer th.TearDown()
|
||||
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.ServiceSettings.AllowedUntrustedInternalConnections = "127.0.0.1"
|
||||
})
|
||||
|
||||
ogURL := "https://example.com/index.html"
|
||||
imageURL := "https://example.com/image.png"
|
||||
|
||||
post := &model.Post{
|
||||
Metadata: &model.PostMetadata{
|
||||
Embeds: []*model.PostEmbed{
|
||||
{
|
||||
Type: model.POST_EMBED_OPENGRAPH,
|
||||
URL: ogURL,
|
||||
Data: &opengraph.OpenGraph{
|
||||
Images: []*opengraph.Image{
|
||||
{
|
||||
URL: imageURL,
|
||||
Width: 100,
|
||||
Height: 200,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
images := th.App.getImagesForPost(post, []string{}, false)
|
||||
|
||||
assert.Equal(t, images, map[string]*model.PostImage{
|
||||
imageURL: {
|
||||
Width: 100,
|
||||
Height: 200,
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
t.Run("for an OpenGraph image without dimensions", func(t *testing.T) {
|
||||
t.Run("for an OpenGraph image", func(t *testing.T) {
|
||||
th := Setup(t)
|
||||
defer th.TearDown()
|
||||
|
||||
@@ -759,13 +724,14 @@ func TestGetImagesForPost(t *testing.T) {
|
||||
|
||||
assert.Equal(t, images, map[string]*model.PostImage{
|
||||
imageURL: {
|
||||
Format: "png",
|
||||
Width: 200,
|
||||
Height: 300,
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
t.Run("with an OpenGraph image with a secure_url and dimensions", func(t *testing.T) {
|
||||
t.Run("with an OpenGraph image with a secure_url", func(t *testing.T) {
|
||||
th := Setup(t)
|
||||
defer th.TearDown()
|
||||
|
||||
@@ -773,8 +739,22 @@ func TestGetImagesForPost(t *testing.T) {
|
||||
*cfg.ServiceSettings.AllowedUntrustedInternalConnections = "127.0.0.1"
|
||||
})
|
||||
|
||||
ogURL := "https://example.com/index.html"
|
||||
imageURL := "https://example.com/secure_image.png"
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path == "/secure_image.png" {
|
||||
w.Header().Set("Content-Type", "image/png")
|
||||
|
||||
img := image.NewGray(image.Rect(0, 0, 300, 400))
|
||||
|
||||
var encoder png.Encoder
|
||||
encoder.Encode(w, img)
|
||||
} else {
|
||||
w.WriteHeader(http.StatusNotFound)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
ogURL := server.URL + "/index.html"
|
||||
imageURL := server.URL + "/secure_image.png"
|
||||
|
||||
post := &model.Post{
|
||||
Metadata: &model.PostMetadata{
|
||||
@@ -785,9 +765,7 @@ func TestGetImagesForPost(t *testing.T) {
|
||||
Data: &opengraph.OpenGraph{
|
||||
Images: []*opengraph.Image{
|
||||
{
|
||||
URL: imageURL,
|
||||
Width: 300,
|
||||
Height: 400,
|
||||
SecureURL: imageURL,
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -800,6 +778,7 @@ func TestGetImagesForPost(t *testing.T) {
|
||||
|
||||
assert.Equal(t, images, map[string]*model.PostImage{
|
||||
imageURL: {
|
||||
Format: "png",
|
||||
Width: 300,
|
||||
Height: 400,
|
||||
},
|
||||
@@ -853,6 +832,7 @@ func TestGetImagesForPost(t *testing.T) {
|
||||
|
||||
assert.Equal(t, images, map[string]*model.PostImage{
|
||||
imageURL: {
|
||||
Format: "png",
|
||||
Width: 400,
|
||||
Height: 500,
|
||||
},
|
||||
@@ -1948,6 +1928,7 @@ func TestParseLinkMetadata(t *testing.T) {
|
||||
|
||||
assert.Nil(t, og)
|
||||
assert.Equal(t, &model.PostImage{
|
||||
Format: "png",
|
||||
Width: 408,
|
||||
Height: 336,
|
||||
}, dimensions)
|
||||
@@ -1991,20 +1972,34 @@ func TestParseLinkMetadata(t *testing.T) {
|
||||
|
||||
func TestParseImages(t *testing.T) {
|
||||
for name, testCase := range map[string]struct {
|
||||
FileName string
|
||||
ExpectedWidth int
|
||||
ExpectedHeight int
|
||||
ExpectError bool
|
||||
FileName string
|
||||
Expected *model.PostImage
|
||||
ExpectError bool
|
||||
}{
|
||||
"png": {
|
||||
FileName: "test.png",
|
||||
ExpectedWidth: 408,
|
||||
ExpectedHeight: 336,
|
||||
FileName: "test.png",
|
||||
Expected: &model.PostImage{
|
||||
Width: 408,
|
||||
Height: 336,
|
||||
Format: "png",
|
||||
},
|
||||
},
|
||||
"animated gif": {
|
||||
FileName: "testgif.gif",
|
||||
ExpectedWidth: 118,
|
||||
ExpectedHeight: 118,
|
||||
FileName: "testgif.gif",
|
||||
Expected: &model.PostImage{
|
||||
Width: 118,
|
||||
Height: 118,
|
||||
Format: "gif",
|
||||
FrameCount: 4,
|
||||
},
|
||||
},
|
||||
"tiff": {
|
||||
FileName: "test.tiff",
|
||||
Expected: &model.PostImage{
|
||||
Width: 701,
|
||||
Height: 701,
|
||||
Format: "tiff",
|
||||
},
|
||||
},
|
||||
"not an image": {
|
||||
FileName: "README.md",
|
||||
@@ -2015,15 +2010,12 @@ func TestParseImages(t *testing.T) {
|
||||
file, err := testutils.ReadTestFile(testCase.FileName)
|
||||
require.Nil(t, err)
|
||||
|
||||
dimensions, err := parseImages(bytes.NewReader(file))
|
||||
result, err := parseImages(bytes.NewReader(file))
|
||||
if testCase.ExpectError {
|
||||
require.NotNil(t, err)
|
||||
assert.NotNil(t, err)
|
||||
} else {
|
||||
require.Nil(t, err)
|
||||
|
||||
require.NotNil(t, dimensions)
|
||||
require.Equal(t, testCase.ExpectedWidth, dimensions.Width)
|
||||
require.Equal(t, testCase.ExpectedHeight, dimensions.Height)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, testCase.Expected, result)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user