Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sort matchers by extension makes matching deterministic #73

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sort matchers by extension makes matching deterministic #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion matchers/matchers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package matchers

import (
"sort"

"github.com/h2non/filetype/types"
)

Expand All @@ -16,6 +18,13 @@ type Map map[types.Type]Matcher
// Type specific matcher function interface
type TypeMatcher func([]byte) types.Type

// Type sorts map keys
type MapKeys []types.Type

func (m MapKeys) Len() int { return len(m) }
func (m MapKeys) Less(i, j int) bool { return m[i].Extension < m[j].Extension }
func (m MapKeys) Swap(i, j int) { m[i], m[j] = m[j], m[i] }

// Store registered file type matchers
var Matchers = make(map[types.Type]TypeMatcher)
var MatcherKeys []types.Type
Expand All @@ -38,7 +47,13 @@ func NewMatcher(kind types.Type, fn Matcher) TypeMatcher {
func register(matchers ...Map) {
MatcherKeys = MatcherKeys[:0]
for _, m := range matchers {
for kind, matcher := range m {
mapKeys := make(MapKeys, 0, len(m))
for kind := range m {
mapKeys = append(mapKeys, kind)
}
sort.Sort(mapKeys)
for _, kind := range mapKeys {
matcher := m[kind]
NewMatcher(kind, matcher)
}
}
Expand Down