From d1016459e607b756e351c459fbcb43e2b98852df Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Sun, 21 May 2023 08:24:22 -0700 Subject: [PATCH] Fix ReadDir() --- cmd/dndcheck/main.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/dndcheck/main.go b/cmd/dndcheck/main.go index 224e48b..d310ce5 100644 --- a/cmd/dndcheck/main.go +++ b/cmd/dndcheck/main.go @@ -12,9 +12,8 @@ import ( ) var mapSigs = map[string]string{ - "./*.jpg;./*.psd;Objects/*.png": "patreon-drmapzo-diamond", - "./*.jpg;./*.png;./*.psd;Objects/*.png": "patreon-drmapzo-diamond", - "./*.jpg;./*.webp;Objects/*.png": "patreon-morvoldpress-tier2", + "./*.jpg;Objects/*.png": "drmapzo-diamond", + "./*.jpg;./*.png;Objects/*.png": "drmapzo-diamond", } func main() { @@ -34,14 +33,14 @@ func main() { "root", *root, ) - ok := validateMaps(l, lo.Must(fs.Sub(rootFS, "Maps"))) + ok := validateMaps(l, rootFS) if !ok { os.Exit(1) } } func validateMaps(l *slog.Logger, mapsFS fs.FS) bool { - entries := lo.Must(mapsFS.(fs.ReadDirFS).ReadDir(".")) + entries := lo.Must(fs.ReadDir(mapsFS, ".")) for _, entry := range entries { if strings.HasPrefix(entry.Name(), ".") {