From 975a171d8ccea72a2a4ed7acb1613590d0ba7acd Mon Sep 17 00:00:00 2001
From: Veikko Sariola <veikko.sariola@gmail.com>
Date: Sun, 6 Dec 2020 20:08:25 +0200
Subject: [PATCH] feat(sointu-cli): Glob directories also for .json songs.

---
 go4k/cmd/sointu-cli/main.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/go4k/cmd/sointu-cli/main.go b/go4k/cmd/sointu-cli/main.go
index 3c3f781..06b1f62 100644
--- a/go4k/cmd/sointu-cli/main.go
+++ b/go4k/cmd/sointu-cli/main.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 
@@ -150,12 +149,19 @@ func main() {
 	retval := 0
 	for _, param := range flag.Args() {
 		if info, err := os.Stat(param); err == nil && info.IsDir() {
-			files, err := filepath.Glob(path.Join(param, "*.asm"))
+			asmfiles, err := filepath.Glob(filepath.Join(param, "*.asm"))
 			if err != nil {
-				fmt.Fprintf(os.Stderr, "Could not glob the path %v: %v\n", param, err)
+				fmt.Fprintf(os.Stderr, "Could not glob the path %v for asm files: %v\n", param, err)
 				retval = 1
 				continue
 			}
+			jsonfiles, err := filepath.Glob(filepath.Join(param, "*.json"))
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "Could not glob the path %v for json files: %v\n", param, err)
+				retval = 1
+				continue
+			}
+			files := append(asmfiles, jsonfiles...)
 			for _, file := range files {
 				err := process(file)
 				if err != nil {