go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-01-08 04:04:08 +02:00
Code Issues Releases Activity

refactor: use tf for taskfile instead of t

Browse Source
This commit is contained in:
Pete Davison 2024-01-21 22:10:12 +00:00 committed by Andrey Nering
parent d6b2926828
commit d5b42e97ec
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
taskfile/reader.go
View File

@ -38,30 +38,30 @@ func Read(
) (*ast.Taskfile, error) { ) (*ast.Taskfile, error) {
var _taskfile func(Node) (*ast.Taskfile, error) var _taskfile func(Node) (*ast.Taskfile, error)
_taskfile = func(node Node) (*ast.Taskfile, error) { _taskfile = func(node Node) (*ast.Taskfile, error) {
t, err := readTaskfile(node, download, offline, timeout, tempDir, l) tf, err := readTaskfile(node, download, offline, timeout, tempDir, l)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Check that the Taskfile is set and has a schema version // Check that the Taskfile is set and has a schema version
if t == nil || t.Version == nil { if tf == nil || tf.Version == nil {
return nil, &errors.TaskfileVersionCheckError{URI: node.Location()} return nil, &errors.TaskfileVersionCheckError{URI: node.Location()}
} }
// Annotate any included Taskfile reference with a base directory for resolving relative paths // Annotate any included Taskfile reference with a base directory for resolving relative paths
if node, isFileNode := node.(*FileNode); isFileNode { if node, isFileNode := node.(*FileNode); isFileNode {
_ = t.Includes.Range(func(namespace string, include ast.Include) error { _ = tf.Includes.Range(func(namespace string, include ast.Include) error {
// Set the base directory for resolving relative paths, but only if not already set // Set the base directory for resolving relative paths, but only if not already set
if include.BaseDir == "" { if include.BaseDir == "" {
include.BaseDir = node.Dir include.BaseDir = node.Dir
t.Includes.Set(namespace, include) tf.Includes.Set(namespace, include)
} }
return nil return nil
}) })
} }
err = t.Includes.Range(func(namespace string, include ast.Include) error { err = tf.Includes.Range(func(namespace string, include ast.Include) error {
tr := templater.Templater{Vars: t.Vars} tr := templater.Templater{Vars: tf.Vars}
include = ast.Include{ include = ast.Include{
Namespace: include.Namespace, Namespace: include.Namespace,
Taskfile: tr.Replace(include.Taskfile), Taskfile: tr.Replace(include.Taskfile),
@ -141,7 +141,7 @@ func Read(
} }
} }
if err = t.Merge(includedTaskfile, &include); err != nil { if err = tf.Merge(includedTaskfile, &include); err != nil {
return err return err
} }
@ -151,18 +151,18 @@ func Read(
return nil, err return nil, err
} }
for _, task := range t.Tasks.Values() { for _, task := range tf.Tasks.Values() {
// If the task is not defined, create a new one // If the task is not defined, create a new one
if task == nil { if task == nil {
task = &ast.Task{} task = &ast.Task{}
} }
// Set the location of the taskfile for each task // Set the location of the taskfile for each task
if task.Location.Taskfile == "" { if task.Location.Taskfile == "" {
task.Location.Taskfile = t.Location task.Location.Taskfile = tf.Location
} }
} }
return t, nil return tf, nil
} }
return _taskfile(node) return _taskfile(node)
} }