3 files changed, 22 insertions, 0 deletions
diff --git a/parser/metadecoders/decoder.go b/parser/metadecoders/decoder.go
index e03a6aacd..6da791c73 100644
--- a/parser/metadecoders/decoder.go
+++ b/parser/metadecoders/decoder.go
@@ -22,6 +22,7 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/chaseadamsio/goorgeous"
 	"github.com/pkg/errors"
+	"github.com/spf13/afero"
 	"github.com/spf13/cast"
 	yaml "gopkg.in/yaml.v2"
 )
@@ -37,7 +38,21 @@ func UnmarshalToMap(data []byte, f Format) (map[string]interface{}, error) {
 	err := unmarshal(data, f, &m)
 
 	return m, err
+}
+
+// UnmarshalFileToMap is the same as UnmarshalToMap, but reads the data from
+// the given filename.
+func UnmarshalFileToMap(fs afero.Fs, filename string) (map[string]interface{}, error) {
+	format := FormatFromString(filename)
+	if format == "" {
+		return nil, errors.Errorf("%q is not a valid configuration format", filename)
+	}
 
+	data, err := afero.ReadFile(fs, filename)
+	if err != nil {
+		return nil, err
+	}
+	return UnmarshalToMap(data, format)
 }
 
 // Unmarshal will unmarshall data in format f into an interface{}.
diff --git a/parser/metadecoders/format.go b/parser/metadecoders/format.go
index b9f7f6919..3f5a8a5c1 100644
--- a/parser/metadecoders/format.go
+++ b/parser/metadecoders/format.go
@@ -14,6 +14,7 @@
 package metadecoders
 
 import (
+	"path/filepath"
 	"strings"
 
 	"github.com/gohugoio/hugo/parser/pageparser"
@@ -34,6 +35,11 @@ const (
 // into a Format. It returns an empty string for unknown formats.
 func FormatFromString(formatStr string) Format {
 	formatStr = strings.ToLower(formatStr)
+	if strings.Contains(formatStr, ".") {
+		// Assume a filename
+		formatStr = strings.TrimPrefix(filepath.Ext(formatStr), ".")
+
+	}
 	switch formatStr {
 	case "yaml", "yml":
 		return YAML
diff --git a/parser/metadecoders/format_test.go b/parser/metadecoders/format_test.go
index 46b4e434a..a22e84f98 100644
--- a/parser/metadecoders/format_test.go
+++ b/parser/metadecoders/format_test.go
@@ -32,6 +32,7 @@ func TestFormatFromString(t *testing.T) {
 		{"yaml", YAML},
 		{"yml", YAML},
 		{"toml", TOML},
+		{"config.toml", TOML},
 		{"tOMl", TOML},
 		{"org", ORG},
 		{"foo", ""},