commit ce04011096456c77479fa98a6ceee242aeac7919
parent cdc73526a80de2120df7aa44f7dc820df6de789d
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Tue, 21 Dec 2021 09:54:14 +0100
media: Add missing BMP and GIF to the default MediaTypes list
Diffstat:
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/media/mediaType.go b/media/mediaType.go
@@ -274,6 +274,8 @@ var DefaultTypes = Types{
YAMLType,
TOMLType,
PNGType,
+ GIFType,
+ BMPType,
JPEGType,
WEBPType,
AVIType,
@@ -289,6 +291,15 @@ var DefaultTypes = Types{
func init() {
sort.Sort(DefaultTypes)
+
+ // Sanity check.
+ seen := make(map[Type]bool)
+ for _, t := range DefaultTypes {
+ if seen[t] {
+ panic(fmt.Sprintf("MediaType %s duplicated in list", t))
+ }
+ seen[t] = true
+ }
}
// Types is a slice of media types.
diff --git a/media/mediaType_test.go b/media/mediaType_test.go
@@ -15,6 +15,7 @@ package media
import (
"encoding/json"
+ "fmt"
"io/ioutil"
"path/filepath"
"sort"
@@ -63,7 +64,7 @@ func TestDefaultTypes(t *testing.T) {
}
- c.Assert(len(DefaultTypes), qt.Equals, 31)
+ c.Assert(len(DefaultTypes), qt.Equals, 33)
}
func TestGetByType(t *testing.T) {
@@ -193,6 +194,7 @@ func TestFromContent(t *testing.T) {
content, err := ioutil.ReadFile(filename)
c.Assert(err, qt.IsNil)
ext := strings.TrimPrefix(paths.Ext(filename), ".")
+ fmt.Println("=>", ext)
expected, _, found := mtypes.GetFirstBySuffix(ext)
c.Assert(found, qt.IsTrue)
got := FromContent(mtypes, ext, content)
diff --git a/media/testdata/resource.bmp b/media/testdata/resource.bmp
Binary files differ.
diff --git a/media/testdata/resource.gif b/media/testdata/resource.gif
Binary files differ.