@@ -12,6 +12,7 @@ import (
1212 "github.com/flowexec/flow/internal/io"
1313 execIO "github.com/flowexec/flow/internal/io/executable"
1414 "github.com/flowexec/flow/internal/io/library"
15+ "github.com/flowexec/flow/internal/logger"
1516 "github.com/flowexec/flow/types/executable"
1617)
1718
@@ -32,7 +33,7 @@ func RegisterBrowseCmd(ctx *context.Context, rootCmd *cobra.Command) {
3233 ),
3334 Args : cobra .MaximumNArgs (2 ),
3435 ValidArgsFunction : func (cmd * cobra.Command , args []string , toComplete string ) ([]string , cobra.ShellCompDirective ) {
35- execList , err := ctx .ExecutableCache .GetExecutableList (ctx . Logger )
36+ execList , err := ctx .ExecutableCache .GetExecutableList ()
3637 if err != nil {
3738 return nil , cobra .ShellCompDirectiveError
3839 }
@@ -63,7 +64,7 @@ func browseFunc(ctx *context.Context, cmd *cobra.Command, args []string) {
6364 return
6465 }
6566
66- listMode := flags .ValueFor [bool ](ctx , cmd , * flags .ListFlag , false )
67+ listMode := flags .ValueFor [bool ](cmd , * flags .ListFlag , false )
6768 if listMode || ! TUIEnabled (ctx , cmd ) {
6869 listExecutables (ctx , cmd , args )
6970 return
@@ -73,42 +74,41 @@ func browseFunc(ctx *context.Context, cmd *cobra.Command, args []string) {
7374}
7475
7576func executableLibrary (ctx * context.Context , cmd * cobra.Command , _ []string ) {
76- logger := ctx .Logger
7777 if ! TUIEnabled (ctx , cmd ) {
78- logger .FatalErr (errors .New ("interactive discovery requires an interactive terminal" ))
78+ logger .Log (). FatalErr (errors .New ("interactive discovery requires an interactive terminal" ))
7979 }
8080
81- wsFilter := flags .ValueFor [string ](ctx , cmd , * flags .FilterWorkspaceFlag , false )
81+ wsFilter := flags .ValueFor [string ](cmd , * flags .FilterWorkspaceFlag , false )
8282 switch wsFilter {
8383 case "." :
8484 wsFilter = ctx .Config .CurrentWorkspace
8585 case executable .WildcardWorkspace :
8686 wsFilter = ""
8787 }
8888
89- nsFilter := flags .ValueFor [string ](ctx , cmd , * flags .FilterNamespaceFlag , false )
90- allNs := flags .ValueFor [bool ](ctx , cmd , * flags .AllNamespacesFlag , false )
89+ nsFilter := flags .ValueFor [string ](cmd , * flags .FilterNamespaceFlag , false )
90+ allNs := flags .ValueFor [bool ](cmd , * flags .AllNamespacesFlag , false )
9191 switch {
9292 case allNs && nsFilter != "" :
93- logger .PlainTextWarn ("cannot use both --all and --namespace flags, ignoring --namespace" )
93+ logger .Log (). PlainTextWarn ("cannot use both --all and --namespace flags, ignoring --namespace" )
9494 fallthrough
9595 case allNs :
9696 nsFilter = executable .WildcardNamespace
9797 case nsFilter == "." :
9898 nsFilter = ctx .Config .CurrentNamespace
9999 }
100100
101- verbFilter := flags .ValueFor [string ](ctx , cmd , * flags .FilterVerbFlag , false )
102- tagsFilter := flags .ValueFor [[]string ](ctx , cmd , * flags .FilterTagFlag , false )
103- subStr := flags .ValueFor [string ](ctx , cmd , * flags .FilterExecSubstringFlag , false )
101+ verbFilter := flags .ValueFor [string ](cmd , * flags .FilterVerbFlag , false )
102+ tagsFilter := flags .ValueFor [[]string ](cmd , * flags .FilterTagFlag , false )
103+ subStr := flags .ValueFor [string ](cmd , * flags .FilterExecSubstringFlag , false )
104104
105- allExecs , err := ctx .ExecutableCache .GetExecutableList (logger )
105+ allExecs , err := ctx .ExecutableCache .GetExecutableList ()
106106 if err != nil {
107- logger .FatalErr (err )
107+ logger .Log (). FatalErr (err )
108108 }
109- allWs , err := ctx .WorkspacesCache .GetWorkspaceConfigList (logger )
109+ allWs , err := ctx .WorkspacesCache .GetWorkspaceConfigList ()
110110 if err != nil {
111- logger .FatalErr (err )
111+ logger .Log (). FatalErr (err )
112112 }
113113
114114 runFunc := func (ref string ) error { return runByRef (ctx , cmd , ref ) }
@@ -128,32 +128,31 @@ func executableLibrary(ctx *context.Context, cmd *cobra.Command, _ []string) {
128128}
129129
130130func listExecutables (ctx * context.Context , cmd * cobra.Command , _ []string ) {
131- logger := ctx .Logger
132- wsFilter := flags .ValueFor [string ](ctx , cmd , * flags .FilterWorkspaceFlag , false )
131+ wsFilter := flags .ValueFor [string ](cmd , * flags .FilterWorkspaceFlag , false )
133132 if wsFilter == "." {
134133 wsFilter = ctx .Config .CurrentWorkspace
135134 }
136135
137- nsFilter := flags .ValueFor [string ](ctx , cmd , * flags .FilterNamespaceFlag , false )
138- allNs := flags .ValueFor [bool ](ctx , cmd , * flags .AllNamespacesFlag , false )
136+ nsFilter := flags .ValueFor [string ](cmd , * flags .FilterNamespaceFlag , false )
137+ allNs := flags .ValueFor [bool ](cmd , * flags .AllNamespacesFlag , false )
139138 switch {
140139 case allNs && nsFilter != "" :
141- logger .PlainTextWarn ("cannot use both --all and --namespace flags, ignoring --namespace" )
140+ logger .Log (). PlainTextWarn ("cannot use both --all and --namespace flags, ignoring --namespace" )
142141 fallthrough
143142 case allNs :
144143 nsFilter = executable .WildcardNamespace
145144 case nsFilter == "." :
146145 nsFilter = ctx .Config .CurrentNamespace
147146 }
148147
149- verbFilter := flags .ValueFor [string ](ctx , cmd , * flags .FilterVerbFlag , false )
150- tagsFilter := flags .ValueFor [[]string ](ctx , cmd , * flags .FilterTagFlag , false )
151- outputFormat := flags .ValueFor [string ](ctx , cmd , * flags .OutputFormatFlag , false )
152- substr := flags .ValueFor [string ](ctx , cmd , * flags .FilterExecSubstringFlag , false )
148+ verbFilter := flags .ValueFor [string ](cmd , * flags .FilterVerbFlag , false )
149+ tagsFilter := flags .ValueFor [[]string ](cmd , * flags .FilterTagFlag , false )
150+ outputFormat := flags .ValueFor [string ](cmd , * flags .OutputFormatFlag , false )
151+ substr := flags .ValueFor [string ](cmd , * flags .FilterExecSubstringFlag , false )
153152
154- allExecs , err := ctx .ExecutableCache .GetExecutableList (logger )
153+ allExecs , err := ctx .ExecutableCache .GetExecutableList ()
155154 if err != nil {
156- logger .FatalErr (err )
155+ logger .Log (). FatalErr (err )
157156 }
158157 filteredExec := allExecs
159158 filteredExec = filteredExec .
@@ -168,17 +167,15 @@ func listExecutables(ctx *context.Context, cmd *cobra.Command, _ []string) {
168167 view := execIO .NewExecutableListView (ctx , filteredExec , runFunc )
169168 SetView (ctx , cmd , view )
170169 } else {
171- execIO .PrintExecutableList (logger , outputFormat , filteredExec )
170+ execIO .PrintExecutableList (outputFormat , filteredExec )
172171 }
173172}
174173
175174func viewExecutable (ctx * context.Context , cmd * cobra.Command , args []string ) {
176- logger := ctx .Logger
177-
178175 verbStr := args [0 ]
179176 verb := executable .Verb (verbStr )
180177 if err := verb .Validate (); err != nil {
181- logger .FatalErr (err )
178+ logger .Log (). FatalErr (err )
182179 }
183180
184181 var execID string
@@ -195,26 +192,26 @@ func viewExecutable(ctx *context.Context, cmd *cobra.Command, args []string) {
195192 }
196193 ref := executable .NewRef (execID , verb )
197194
198- exec , err := ctx .ExecutableCache .GetExecutableByRef (logger , ref )
195+ exec , err := ctx .ExecutableCache .GetExecutableByRef (ref )
199196 if err != nil && errors .Is (cache .NewExecutableNotFoundError (ref .String ()), err ) {
200- logger .Debugf ("Executable %s not found in cache, syncing cache" , ref )
201- if err := ctx .ExecutableCache .Update (logger ); err != nil {
202- logger .FatalErr (err )
197+ logger .Log (). Debugf ("Executable %s not found in cache, syncing cache" , ref )
198+ if err := ctx .ExecutableCache .Update (); err != nil {
199+ logger .Log (). FatalErr (err )
203200 }
204- exec , err = ctx .ExecutableCache .GetExecutableByRef (logger , ref )
201+ exec , err = ctx .ExecutableCache .GetExecutableByRef (ref )
205202 }
206203 if err != nil {
207- logger .FatalErr (err )
204+ logger .Log (). FatalErr (err )
208205 } else if exec == nil {
209- logger .Fatalf ("executable %s not found" , ref )
206+ logger .Log (). Fatalf ("executable %s not found" , ref )
210207 }
211208
212- outputFormat := flags .ValueFor [string ](ctx , cmd , * flags .OutputFormatFlag , false )
209+ outputFormat := flags .ValueFor [string ](cmd , * flags .OutputFormatFlag , false )
213210 if TUIEnabled (ctx , cmd ) {
214211 runFunc := func (ref string ) error { return runByRef (ctx , cmd , ref ) }
215212 view := execIO .NewExecutableView (ctx , exec , runFunc )
216213 SetView (ctx , cmd , view )
217214 } else {
218- execIO .PrintExecutable (logger , outputFormat , exec )
215+ execIO .PrintExecutable (outputFormat , exec )
219216 }
220217}
0 commit comments