Fix svg and xml wrong order

matchers/text.go

@@ -224,6 +224,7 @@ func Rtf(in []byte) bool {
  return bytes.Equal(in[:6], []byte("\x7b\x5c\x72\x74\x66\x31"))
 }
 
+// SVG matches a SVG file.
 func Svg(in []byte) bool {
  return bytes.Contains(in, []byte("<svg"))
 }

mime_test.go

@@ -60,6 +60,7 @@ var files = map[string]*Node{
  "a.html": Html,
  "a.xml": Xml,
  "a.svg": Svg,
+ "a1.svg": Svg,
  "a.txt": Txt,
  "a.php": Php,
  "a.ps": Ps,
@@ -78,7 +79,7 @@ var files = map[string]*Node{
 }
 
 func TestMatching(t *testing.T) {
- errStr := "Mime: %s != DetectedMime: %s; err: %v"
+ errStr := "File: %s; Mime: %s != DetectedMime: %s; err: %v"
  for fName, node := range files {
  fileName := filepath.Join(testDataDir, fName)
  f, err := os.Open(fileName)
@@ -91,20 +92,20 @@ func TestMatching(t *testing.T) {
  }
 
  if dMime, _ := Detect(data); dMime != node.Mime() {
- t.Errorf(errStr, node.Mime(), dMime, nil)
+ t.Errorf(errStr, fName, node.Mime(), dMime, nil)
  }
 
  if _, err := f.Seek(io.SeekStart, 0); err != nil {
- t.Errorf(errStr, node.Mime(), Root.Mime(), err)
+ t.Errorf(errStr, fName, node.Mime(), Root.Mime(), err)
  }
 
  if dMime, _, err := DetectReader(f); dMime != node.Mime() {
- t.Errorf(errStr, node.Mime(), dMime, err)
+ t.Errorf(errStr, fName, node.Mime(), dMime, err)
  }
  f.Close()
 
  if dMime, _, err := DetectFile(fileName); dMime != node.Mime() {
- t.Errorf(errStr, node.Mime(), dMime, err)
+ t.Errorf(errStr, fName, node.Mime(), dMime, err)
  }
  }
 }

tree.go

@@ -33,9 +33,9 @@ var (
  Ogg = NewNode("application/ogg", "ogg", matchers.Ogg)
 
  Txt = NewNode("text/plain", "txt", matchers.Txt,
- Html, Xml, Php, Js, Lua, Perl, Python, Json, Rtf, Tcl)
+ Html, Svg, Xml, Php, Js, Lua, Perl, Python, Json, Rtf, Tcl)
  Xml = NewNode("text/xml; charset=utf-8", "xml", matchers.Xml,
- Svg, X3d, Kml, Collada, Gml, Gpx)
+ X3d, Kml, Collada, Gml, Gpx)
  Json = NewNode("application/json", "json", matchers.Json)
  Html = NewNode("text/html; charset=utf-8", "html", matchers.Html)
  Php = NewNode("text/x-php; charset=utf-8", "php", matchers.Php)