mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-20 12:23:22 +00:00
- Move checkExtrasSyncStatus to sync.CheckSyncStatus (shared) - Add sync.EffectiveMode helper to replace inline mode defaults - Add config.ValidateExtraMode to centralize mode validation - Fix sync --all --json outputting two separate JSON objects by merging extras into the skills JSON output - Fix swallowed JSON decode error in handleExtrasSync - Remove dead symlink check in CollectExtraFiles (filepath.Walk follows symlinks so the check was unreachable) - Fix integration test extras paths to use extras/<name>/ layout
52 lines
1.4 KiB
Go
52 lines
1.4 KiB
Go
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"regexp"
|
|
)
|
|
|
|
var extraNameRegex = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_-]*$`)
|
|
|
|
var reservedExtraNames = map[string]bool{
|
|
"skills": true,
|
|
"extras": true,
|
|
}
|
|
|
|
// ValidateExtraName checks that a name is safe for use as an extras directory.
|
|
// It rejects empty names, reserved words, and names that don't match the
|
|
// allowed character set (alphanumeric, hyphens, underscores; must start with
|
|
// alphanumeric).
|
|
func ValidateExtraName(name string) error {
|
|
if name == "" {
|
|
return fmt.Errorf("extra name cannot be empty")
|
|
}
|
|
if reservedExtraNames[name] {
|
|
return fmt.Errorf("extra name %q is reserved", name)
|
|
}
|
|
if !extraNameRegex.MatchString(name) {
|
|
return fmt.Errorf("extra name %q is invalid: must start with a letter or digit and contain only letters, digits, hyphens, or underscores", name)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ValidateExtraMode checks that mode is a valid sync mode.
|
|
// Empty string is allowed (defaults to "merge" at runtime).
|
|
func ValidateExtraMode(mode string) error {
|
|
switch mode {
|
|
case "", "merge", "copy", "symlink":
|
|
return nil
|
|
default:
|
|
return fmt.Errorf("invalid mode %q: must be merge, copy, or symlink", mode)
|
|
}
|
|
}
|
|
|
|
// ValidateExtraNameUnique checks that the name doesn't duplicate an existing extra.
|
|
func ValidateExtraNameUnique(name string, existing []ExtraConfig) error {
|
|
for _, e := range existing {
|
|
if e.Name == name {
|
|
return fmt.Errorf("extra name %q already exists", name)
|
|
}
|
|
}
|
|
return nil
|
|
}
|