refactor: add support for go1.16's WalkDir

Add support for using the faster WalkDir method when building against
go1.16.

Author: darkliquid

finder.go

@@ -1,12 +1,10 @@
 package sysfont
 
 import (
-	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/adrg/strutil"
-	"github.com/adrg/xdg"
 )
 
 // Finder is used to identify installed fonts. It can match fonts based on user
@@ -32,14 +30,7 @@ func NewFinder(opts *FinderOpts) *Finder {
 	}
 
 	var fonts []*Font
-	walker := func(filename string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if info.IsDir() {
-			return nil
-		}
-
+	findFonts(opts, func(filename string) error {
 		// Check file extension.
 		if extensions := opts.Extensions; len(extensions) > 0 {
 			extension := filepath.Ext(strings.ToLower(filename))
@@ -56,14 +47,7 @@ func NewFinder(opts *FinderOpts) *Finder {
 
 		fonts = append(fonts, matches...)
 		return nil
-	}
-
-	// Traverse OS font directories.
-	for _, dir := range xdg.FontDirs {
-		if err := filepath.Walk(dir, walker); err != nil {
-			continue
-		}
-	}
+	})
 
 	return &Finder{
 		fonts: fonts,

finder_dirwalk.go

@@ -0,0 +1,33 @@
+//go:build go1.16
+// +build go1.16
+
+package sysfont
+
+import (
+	"io/fs"
+	"path/filepath"
+
+	"github.com/adrg/xdg"
+)
+
+func findFonts(opts *FinderOpts, fn func(filename string) error) {
+	walker := func(filename string, info fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.IsDir() {
+			return nil
+		}
+
+		return fn(filename)
+	}
+
+	// Traverse OS font directories.
+	for _, dir := range xdg.FontDirs {
+		if err := filepath.WalkDir(dir, walker); err != nil {
+			continue
+		}
+	}
+
+	return
+}

finder_walk.go

@@ -0,0 +1,33 @@
+//go:build !go1.16
+// +build !go1.16
+
+package sysfont
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/adrg/xdg"
+)
+
+func findFonts(opts *FinderOpts, fn func(filename string) error) {
+	walker := func(filename string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.IsDir() {
+			return nil
+		}
+
+		return fn(filename)
+	}
+
+	// Traverse OS font directories.
+	for _, dir := range xdg.FontDirs {
+		if err := filepath.Walk(dir, walker); err != nil {
+			continue
+		}
+	}
+
+	return
+}