diff --git a/go.mod b/go.mod index 6351ed1..82e9c22 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/onsi/gomega v1.31.1 github.com/pkg/errors v0.9.1 github.com/samber/lo v1.39.0 - github.com/snivilised/extendio v0.6.0 + github.com/snivilised/extendio v0.6.1 github.com/snivilised/lorax v0.4.4 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 @@ -21,7 +21,7 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 // indirect + github.com/google/pprof v0.0.0-20240130152714-0ed6a68c8d9e // indirect github.com/google/uuid v1.6.0 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/onsi/ginkgo v1.16.5 // indirect @@ -41,9 +41,9 @@ require ( github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/natefinch/lumberjack v2.0.0+incompatible - github.com/nicksnyder/go-i18n/v2 v2.3.0 // indirect + github.com/nicksnyder/go-i18n/v2 v2.4.0 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/snivilised/cobrass v0.4.3 + github.com/snivilised/cobrass v0.4.4 github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 1c36dc4..7ff9ef0 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 h1:WzfWbQz/Ze8v6l++GGbGNFZnUShVpP/0xffCPLL+ax8= -github.com/google/pprof v0.0.0-20240117000934-35fc243c5815/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20240130152714-0ed6a68c8d9e h1:E+3PBMCXn0ma79O7iCrne0iUpKtZ7rIcZvoz+jNtNtw= +github.com/google/pprof v0.0.0-20240130152714-0ed6a68c8d9e/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -57,8 +57,8 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM= github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk= -github.com/nicksnyder/go-i18n/v2 v2.3.0 h1:2NPsCsNFCVd7i+Su0xYsBrIhS3bE2XMv5gNTft2O+PQ= -github.com/nicksnyder/go-i18n/v2 v2.3.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4= +github.com/nicksnyder/go-i18n/v2 v2.4.0 h1:3IcvPOAvnCKwNm0TB0dLDTuawWEj+ax/RERNC+diLMM= +github.com/nicksnyder/go-i18n/v2 v2.4.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -88,10 +88,10 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA= github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= -github.com/snivilised/cobrass v0.4.3 h1:uDXEgPRhC4Bc/n5qCK1ItMp62UL7tcw5Vz52QebEtv8= -github.com/snivilised/cobrass v0.4.3/go.mod h1:zY/ECw09lrTDrH1ynTCiCsIYsDNEaDRj7mxOKj2BsFE= -github.com/snivilised/extendio v0.6.0 h1:wrKIAmbBVsemOCmD5LcEMeIY4m1agakwcYcJ8U5iWb0= -github.com/snivilised/extendio v0.6.0/go.mod h1:wn3atq3GVwcnKrlLpBdpTi/bxtUNlGzFA0Vmq1/Dnmo= +github.com/snivilised/cobrass v0.4.4 h1:kESG3M4KTqQ1NBjAMBJ9DC9ytUb0FfvHNv6NSbc6uVU= +github.com/snivilised/cobrass v0.4.4/go.mod h1:hGVu/zjWVG3tRKo3P0tjelm5S44vMTa/w29ygnvi+lY= +github.com/snivilised/extendio v0.6.1 h1:8IIJ4rryKcRv796QxfHcMnuWl4erFMqJF4Rqcj8eY/k= +github.com/snivilised/extendio v0.6.1/go.mod h1:LbMvItdNqN8oZI4yUENxM459OkTP+W+hYXxKrc9l8ZQ= github.com/snivilised/lorax v0.4.4 h1:fxuuew+88yUC9JkTq2iQhGx8tvECBzj2ugjssWlTI6A= github.com/snivilised/lorax v0.4.4/go.mod h1:82r6nAoXWo1sdLXpj5RxYbAmiomu+xYVIXPn+cgG7I4= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= diff --git a/src/app/command/root-cmd.go b/src/app/command/root-cmd.go index 9ddf823..c4aed68 100644 --- a/src/app/command/root-cmd.go +++ b/src/app/command/root-cmd.go @@ -128,7 +128,7 @@ func (b *Bootstrap) buildRootCommand(container *assistant.CobraContainer) { profileFam := assistant.NewParamSet[store.ProfileParameterSet](rootCommand) profileFam.Native.BindAll(profileFam, rootCommand.PersistentFlags()) - // family: cascade [--depth, --skim(K)] + // family: cascade [--depth, --no-recurse(N)] // cascadeFam := assistant.NewParamSet[store.CascadeParameterSet](rootCommand) cascadeFam.Native.BindAll(cascadeFam, rootCommand.PersistentFlags()) diff --git a/src/app/command/shrink-cmd_test.go b/src/app/command/shrink-cmd_test.go index b3d6303..f7097c1 100644 --- a/src/app/command/shrink-cmd_test.go +++ b/src/app/command/shrink-cmd_test.go @@ -221,24 +221,24 @@ var _ = Describe("ShrinkCmd", Ordered, func() { Entry(nil, &shrinkTE{ commandTE: commandTE{ - message: "vanilla with long form skim", + message: "vanilla with long form no-recurse", args: []string{ "--strip", "--interlace", "plane", "--quality", "85", - "--skim", + "--no-recurse", }, }, }), Entry(nil, &shrinkTE{ commandTE: commandTE{ - message: "vanilla with short form skim", + message: "vanilla with short form no-recurse", args: []string{ "--strip", "--interlace", "plane", "--quality", "85", - "-K", + "-N", }, }, }), diff --git a/src/app/proxy/entry-base.go b/src/app/proxy/entry-base.go index 291828b..f391e4c 100644 --- a/src/app/proxy/entry-base.go +++ b/src/app/proxy/entry-base.go @@ -135,7 +135,7 @@ func (e *EntryBase) ConfigureOptions(o *nav.TraverseOptions) { o.Store.Sampling.NoOf.Folders = e.Inputs.ParamSet.Native.NoFolders } - o.Store.Behaviours.Cascade.Skim = e.Inputs.CascadeFam.Native.Skim + o.Store.Behaviours.Cascade.NoRecurse = e.Inputs.CascadeFam.Native.NoRecurse o.Store.Behaviours.Cascade.Depth = e.Inputs.CascadeFam.Native.Depth }