add .wants and .includesHEADmaster

.wants adds potential out-of-tree sources to your state (for monorepos, for example)

.includes adds targets from another source to this one, adding inheritance

1 files changed, 9 insertions, 17 deletions

diff --git a/indexers/pikdex/index.go b/indexers/pikdex/index.go
index 1a9b38a..15a74f4 100644
--- a/indexers/pikdex/index.go
+++ b/indexers/pikdex/index.go
@@ -35,19 +35,11 @@ func (u *pikdex) Init() error {
 	return nil
 }
 
-var Indexer = &pikdex{mods: make(map[string]*SourceData)}
+var Indexer = &pikdex{Data: make(map[string]*model.SourceData)}
 
 type pikdex struct {
 	sync.Mutex
-	mods map[string]*SourceData
-}
-
-type SourceData struct {
-	Aliases  []string
-	Icon     string
-	Path     string
-	Wants    []string
-	Includes []string
+	Data map[string]*model.SourceData
 }
 
 func (u *pikdex) Index(absPath string, f fs.FS, runners []model.Runner) ([]model.Target, error) {
@@ -57,14 +49,14 @@ func (u *pikdex) Index(absPath string, f fs.FS, runners []model.Runner) ([]model
 	}
 	var targets []model.Target
 	u.Lock()
-	mod := u.mods[absPath]
+	mod := u.Data[absPath]
 	u.Unlock()
 	if mod == nil {
 		u.Lock()
-		u.mods[absPath] = &SourceData{
+		u.Data[absPath] = &model.SourceData{
 			Path: absPath,
 		}
-		mod = u.mods[absPath]
+		mod = u.Data[absPath]
 		u.Unlock()
 	}
 	err = fs.WalkDir(f, root, func(p string, d fs.DirEntry, err error) error {
@@ -99,12 +91,12 @@ func (u *pikdex) Index(absPath string, f fs.FS, runners []model.Runner) ([]model
 		for _, r := range runners {
 			wants, err := r.Wants(f, p, d)
 			if err != nil {
-				spool.Warn("%v\n", err)
+				_, _ = spool.Warn("%v\n", err)
 			}
 			if wants {
 				t, err := r.CreateTarget(f, absPath, p, d)
 				if err != nil {
-					spool.Warn("%v\n", err)
+					_, _ = spool.Warn("%v\n", err)
 				}
 				sub := t.Sub()
 				if strings.Join(sub, " ") == t.ShortestId() {
@@ -123,13 +115,13 @@ func (u *pikdex) Index(absPath string, f fs.FS, runners []model.Runner) ([]model
 				return nil
 			}
 			if err != nil {
-				spool.Warn("%v\n", err)
+				_, _ = spool.Warn("%v\n", err)
 			}
 		}
 		return nil
 	})
 	u.Lock()
-	u.mods[absPath] = mod
+	u.Data[absPath] = mod
 	u.Unlock()
 
 	return targets, err