mirror of
				https://github.com/go-task/task.git
				synced 2025-10-30 23:58:01 +02:00 
			
		
		
		
	refactor: slightly improved NewBaseNode API
This commit is contained in:
		| @@ -13,11 +13,11 @@ type ( | ||||
| 	} | ||||
| ) | ||||
|  | ||||
| func NewBaseNode(opts ...NodeOption) *BaseNode { | ||||
| func NewBaseNode(dir string, opts ...NodeOption) *BaseNode { | ||||
| 	node := &BaseNode{ | ||||
| 		parent:   nil, | ||||
| 		optional: false, | ||||
| 		dir:      "", | ||||
| 		dir:      dir, | ||||
| 	} | ||||
|  | ||||
| 	// Apply options | ||||
|   | ||||
| @@ -20,12 +20,11 @@ type FileNode struct { | ||||
|  | ||||
| func NewFileNode(l *logger.Logger, entrypoint, dir string, opts ...NodeOption) (*FileNode, error) { | ||||
| 	var err error | ||||
| 	base := NewBaseNode(opts...) | ||||
| 	entrypoint, dir, err = resolveFileNodeEntrypointAndDir(l, entrypoint, dir) | ||||
| 	base := NewBaseNode(dir, opts...) | ||||
| 	entrypoint, base.dir, err = resolveFileNodeEntrypointAndDir(l, entrypoint, base.dir) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	base.dir = dir | ||||
| 	return &FileNode{ | ||||
| 		BaseNode:   base, | ||||
| 		Entrypoint: entrypoint, | ||||
|   | ||||
| @@ -20,8 +20,7 @@ type HTTPNode struct { | ||||
| } | ||||
|  | ||||
| func NewHTTPNode(l *logger.Logger, entrypoint, dir string, insecure bool, opts ...NodeOption) (*HTTPNode, error) { | ||||
| 	base := NewBaseNode(opts...) | ||||
| 	base.dir = dir | ||||
| 	base := NewBaseNode(dir, opts...) | ||||
| 	url, err := url.Parse(entrypoint) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
|   | ||||
| @@ -17,10 +17,8 @@ type StdinNode struct { | ||||
| } | ||||
|  | ||||
| func NewStdinNode(dir string) (*StdinNode, error) { | ||||
| 	base := NewBaseNode() | ||||
| 	base.dir = dir | ||||
| 	return &StdinNode{ | ||||
| 		BaseNode: base, | ||||
| 		BaseNode: NewBaseNode(dir), | ||||
| 	}, nil | ||||
| } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user