From f4ce0da60c3704285df1492b0152fe1dd31f11ef Mon Sep 17 00:00:00 2001 From: Oliver Radwell Date: Fri, 24 Nov 2023 16:23:58 +0000 Subject: [PATCH 1/2] feat: Support for double star (**) globbing --- go.mod | 1 + go.sum | 2 ++ main.go | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 06884a1d..9c660383 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/kovetskiy/mark go 1.19 require ( + github.com/bmatcuk/doublestar/v4 v4.6.1 github.com/dreampuf/mermaid.go v0.0.14 github.com/kovetskiy/gopencils v0.0.0-20230119081704-a73db75b2f69 github.com/kovetskiy/lorg v1.2.0 diff --git a/go.sum b/go.sum index 44a2c995..e01648eb 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I= +github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/chromedp/cdproto v0.0.0-20231011050154-1d073bb38998/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= github.com/chromedp/cdproto v0.0.0-20231025043423-5615e204d422 h1:9d05eR3+VAcQqH5qiKbpMFa83XFK7jVDfAXIindFPbU= github.com/chromedp/cdproto v0.0.0-20231025043423-5615e204d422/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= diff --git a/main.go b/main.go index 2a52dfa8..bcd8d313 100644 --- a/main.go +++ b/main.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "github.com/bmatcuk/doublestar/v4" "github.com/kovetskiy/lorg" "github.com/kovetskiy/mark/pkg/confluence" "github.com/kovetskiy/mark/pkg/mark" @@ -239,7 +240,7 @@ func RunMark(cCtx *cli.Context) error { api := confluence.NewAPI(creds.BaseURL, creds.Username, creds.Password) - files, err := filepath.Glob(cCtx.String("files")) + files, err := doublestar.Glob(os.DirFS("."), cCtx.String("files")) if err != nil { return err } From 6884a59c2f1599486edcb2c0e92d609e0d871a0c Mon Sep 17 00:00:00 2001 From: Oliver Radwell Date: Fri, 1 Dec 2023 10:48:04 +0000 Subject: [PATCH 2/2] fixup: use FilepathGlob instead of Glob --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index bcd8d313..b78ff408 100644 --- a/main.go +++ b/main.go @@ -240,7 +240,7 @@ func RunMark(cCtx *cli.Context) error { api := confluence.NewAPI(creds.BaseURL, creds.Username, creds.Password) - files, err := doublestar.Glob(os.DirFS("."), cCtx.String("files")) + files, err := doublestar.FilepathGlob(cCtx.String("files")) if err != nil { return err }