mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-19 02:17:09 +00:00
refactor(sync): select a target's skills through SelectTargetSkills
Status, doctor, diff, the dashboard's target and diff handlers and analyze each repeated FilterSkills followed by FilterSkillsByTarget, and only some dropped disabled skills first. Routing them through SelectTargetSkills keeps their answers identical to sync and mcp serve when a selection rule changes. The callers that did not drop disabled skills get discoveries without them, so their output does not change.
This commit is contained in:
@@ -420,11 +420,10 @@ func cmdDiffGlobal(targetName string, kind resourceKindFilter, opts diffRenderOp
|
||||
hasCopyMode := false
|
||||
for _, e := range entries {
|
||||
sc := e.target.SkillsConfig()
|
||||
filtered, err := sync.FilterSkills(discovered, sc.Include, sc.Exclude)
|
||||
filtered, err := sync.SelectTargetSkills(discovered, e.name, sc)
|
||||
if err != nil {
|
||||
return fmt.Errorf("target %s has invalid include/exclude config: %w", e.name, err)
|
||||
}
|
||||
filtered = sync.FilterSkillsByTarget(filtered, e.name)
|
||||
fentries = append(fentries, filteredEntry{e, filtered})
|
||||
totalSkills += len(filtered)
|
||||
if e.mode == "copy" {
|
||||
|
||||
@@ -75,11 +75,10 @@ func cmdDiffProject(root, targetName string, kind resourceKindFilter, opts diffR
|
||||
if !sc.IsEnabled() {
|
||||
continue
|
||||
}
|
||||
filtered, err := sync.FilterSkills(discovered, sc.Include, sc.Exclude)
|
||||
filtered, err := sync.SelectTargetSkills(discovered, entry.Name, sc)
|
||||
if err != nil {
|
||||
return fmt.Errorf("target %s has invalid include/exclude config: %w", entry.Name, err)
|
||||
}
|
||||
filtered = sync.FilterSkillsByTarget(filtered, entry.Name)
|
||||
mode := sc.Mode
|
||||
if mode == "" {
|
||||
mode = "merge"
|
||||
|
||||
@@ -744,13 +744,12 @@ func checkSyncDrift(cfg *config.Config, result *doctorResult, discovered []sync.
|
||||
continue
|
||||
}
|
||||
sc := target.SkillsConfig()
|
||||
filtered, err := sync.FilterSkills(discovered, sc.Include, sc.Exclude)
|
||||
filtered, err := sync.SelectTargetSkills(discovered, name, sc)
|
||||
if err != nil {
|
||||
ui.Row(ui.MarkFail, name, fmt.Sprintf("invalid include/exclude config: %v", err), width)
|
||||
result.addError()
|
||||
continue
|
||||
}
|
||||
filtered = sync.FilterSkillsByTarget(filtered, name)
|
||||
expectedCount := len(filtered)
|
||||
if expectedCount == 0 {
|
||||
continue
|
||||
|
||||
@@ -335,11 +335,11 @@ func printTargetsStatus(cfg *config.Config, discovered []sync.DiscoveredSkill) e
|
||||
// A target with skills off expects nothing, so it has no drift.
|
||||
expected := 0
|
||||
if sc.IsEnabled() && (mode == "merge" || mode == "copy") {
|
||||
filtered, err := sync.FilterSkills(discovered, sc.Include, sc.Exclude)
|
||||
filtered, err := sync.SelectTargetSkills(discovered, name, sc)
|
||||
if err != nil {
|
||||
return fmt.Errorf("target %s has invalid include/exclude config: %w", name, err)
|
||||
}
|
||||
expected = len(sync.FilterSkillsByTarget(filtered, name))
|
||||
expected = len(filtered)
|
||||
notSynced = max(notSynced, expected-res.syncedCount)
|
||||
} else if sc.IsEnabled() && (len(sc.Include) > 0 || len(sc.Exclude) > 0) {
|
||||
warnings = append(warnings, name+": include/exclude ignored in symlink mode")
|
||||
|
||||
@@ -207,11 +207,11 @@ func printProjectTargetsStatus(runtime *projectRuntime, discovered []sync.Discov
|
||||
// A target with skills off expects nothing, so it has no drift.
|
||||
expected := 0
|
||||
if sc.IsEnabled() && (mode == "merge" || mode == "copy") {
|
||||
filtered, err := sync.FilterSkills(discovered, sc.Include, sc.Exclude)
|
||||
filtered, err := sync.SelectTargetSkills(discovered, entry.Name, sc)
|
||||
if err != nil {
|
||||
return fmt.Errorf("target %s has invalid include/exclude config: %w", entry.Name, err)
|
||||
}
|
||||
expected = len(sync.FilterSkillsByTarget(filtered, entry.Name))
|
||||
expected = len(filtered)
|
||||
notSynced = max(notSynced, expected-res.syncedCount)
|
||||
} else if sc.IsEnabled() && (len(sc.Include) > 0 || len(sc.Exclude) > 0) {
|
||||
warnings = append(warnings, entry.Name+": include/exclude ignored in symlink mode")
|
||||
|
||||
@@ -98,11 +98,10 @@ func (s *Server) computeTargetDiff(name string, target config.TargetConfig, disc
|
||||
return dt
|
||||
}
|
||||
|
||||
filtered, err := ssync.FilterSkills(discovered, sc.Include, sc.Exclude)
|
||||
filtered, err := ssync.SelectTargetSkills(discovered, name, sc)
|
||||
if err != nil {
|
||||
return dt
|
||||
}
|
||||
filtered = ssync.FilterSkillsByTarget(filtered, name)
|
||||
resolution, err := ssync.ResolveTargetSkillsForTarget(name, config.ResourceTargetConfig{
|
||||
Path: sc.Path,
|
||||
TargetNaming: sc.TargetNaming,
|
||||
|
||||
@@ -139,12 +139,11 @@ func (s *Server) handleListTargets(w http.ResponseWriter, r *http.Request) {
|
||||
item.SkillsReadFrom = config.SkillsReadFrom(targets, name, projectRoot)
|
||||
case mode == "merge" || mode == "copy":
|
||||
if discoveredErr == nil {
|
||||
filtered, err := ssync.FilterSkills(discovered, sc.Include, sc.Exclude)
|
||||
filtered, err := ssync.SelectTargetSkills(discovered, name, sc)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusBadRequest, "invalid include/exclude for target "+name+": "+err.Error())
|
||||
return
|
||||
}
|
||||
filtered = ssync.FilterSkillsByTarget(filtered, name)
|
||||
resolution, resErr := ssync.ResolveTargetSkillsForTarget(name, config.ResourceTargetConfig{
|
||||
Path: sc.Path,
|
||||
TargetNaming: sc.TargetNaming,
|
||||
|
||||
@@ -3,7 +3,6 @@ package sync
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
"skillshare/internal/config"
|
||||
@@ -33,12 +32,10 @@ func TargetSkills(name string, target config.TargetConfig, defaultMode, sourcePa
|
||||
return discovered, nil
|
||||
}
|
||||
|
||||
enabled := slices.DeleteFunc(slices.Clone(discovered), func(s DiscoveredSkill) bool { return s.Disabled })
|
||||
skills, err := FilterSkills(enabled, sc.Include, sc.Exclude)
|
||||
skills, err := SelectTargetSkills(discovered, name, sc)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
skills = FilterSkillsByTarget(skills, name)
|
||||
return append(skills, localTargetSkills(sc.Path, sourcePath)...), nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user