mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-20 20:34:19 +00:00
- NewMetaFromSource: set meta.Branch from source.Branch - installFromDiscoveryImpl: forward discovery.Source.Branch when building per-skill Source struct for metadata - installFromGitSubdir: pass source.Branch to sparseCloneSubdir (was hardcoded empty string, causing subdir installs to ignore --branch) - ReconcileGlobalSkills: sync meta.Branch to registry on both new and existing entries - toSkillEntryDTOs: include Branch field in DTO conversion - updateRegularSkill / updateSkillFromMeta: restore source.Branch from meta before reinstalling, so updates pull from the originally-specified branch Tests: TestInstallBranch_MetadataPersistence, TestInstallBranch_UpdatePreservesBranch
130 lines
3.6 KiB
Go
130 lines
3.6 KiB
Go
package install
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
|
|
"skillshare/internal/utils"
|
|
)
|
|
|
|
// MetaFileName is the name of the skillshare metadata file stored in each skill directory.
|
|
const MetaFileName = ".skillshare-meta.json"
|
|
|
|
// SkillMeta contains metadata about an installed skill
|
|
type SkillMeta struct {
|
|
Source string `json:"source"` // Original source input
|
|
Type string `json:"type"` // Source type (github, local, etc.)
|
|
InstalledAt time.Time `json:"installed_at"` // Installation timestamp
|
|
RepoURL string `json:"repo_url,omitempty"` // Git repo URL (for git sources)
|
|
Subdir string `json:"subdir,omitempty"` // Subdirectory path (for monorepo)
|
|
Version string `json:"version,omitempty"` // Git commit hash or version
|
|
TreeHash string `json:"tree_hash,omitempty"` // Git tree SHA of Subdir
|
|
FileHashes map[string]string `json:"file_hashes,omitempty"` // sha256:<hex> per file
|
|
Branch string `json:"branch,omitempty"` // Git branch (when non-default)
|
|
}
|
|
|
|
// WriteMeta saves metadata to the skill directory
|
|
func WriteMeta(skillPath string, meta *SkillMeta) error {
|
|
metaPath := filepath.Join(skillPath, MetaFileName)
|
|
|
|
data, err := json.MarshalIndent(meta, "", " ")
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal metadata: %w", err)
|
|
}
|
|
|
|
if err := os.WriteFile(metaPath, data, 0644); err != nil {
|
|
return fmt.Errorf("failed to write metadata: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// ReadMeta loads metadata from the skill directory
|
|
func ReadMeta(skillPath string) (*SkillMeta, error) {
|
|
metaPath := filepath.Join(skillPath, MetaFileName)
|
|
|
|
data, err := os.ReadFile(metaPath)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
return nil, nil // No metadata file, not an error
|
|
}
|
|
return nil, fmt.Errorf("failed to read metadata: %w", err)
|
|
}
|
|
|
|
var meta SkillMeta
|
|
if err := json.Unmarshal(data, &meta); err != nil {
|
|
return nil, fmt.Errorf("failed to parse metadata: %w", err)
|
|
}
|
|
|
|
return &meta, nil
|
|
}
|
|
|
|
// HasMeta checks if a skill directory has metadata
|
|
func HasMeta(skillPath string) bool {
|
|
metaPath := filepath.Join(skillPath, MetaFileName)
|
|
_, err := os.Stat(metaPath)
|
|
return err == nil
|
|
}
|
|
|
|
// ComputeFileHashes walks skillPath and returns a map of relative file paths
|
|
// to their "sha256:<hex>" digests. It skips .skillshare-meta.json and .git/.
|
|
func ComputeFileHashes(skillPath string) (map[string]string, error) {
|
|
hashes := make(map[string]string)
|
|
|
|
err := filepath.Walk(skillPath, func(path string, info os.FileInfo, walkErr error) error {
|
|
if walkErr != nil {
|
|
return walkErr
|
|
}
|
|
if info.IsDir() {
|
|
if info.Name() == ".git" {
|
|
return filepath.SkipDir
|
|
}
|
|
return nil
|
|
}
|
|
if info.Name() == MetaFileName {
|
|
return nil
|
|
}
|
|
|
|
rel, relErr := filepath.Rel(skillPath, path)
|
|
if relErr != nil {
|
|
return fmt.Errorf("relative path for %s: %w", path, relErr)
|
|
}
|
|
|
|
formatted, hashErr := utils.FileHashFormatted(path)
|
|
if hashErr != nil {
|
|
return fmt.Errorf("hashing %s: %w", path, hashErr)
|
|
}
|
|
// Normalize path separators to /
|
|
hashes[filepath.ToSlash(rel)] = formatted
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return hashes, nil
|
|
}
|
|
|
|
// NewMetaFromSource creates a SkillMeta from a Source
|
|
func NewMetaFromSource(source *Source) *SkillMeta {
|
|
meta := &SkillMeta{
|
|
Source: source.Raw,
|
|
Type: source.MetaType(),
|
|
InstalledAt: time.Now(),
|
|
Branch: source.Branch,
|
|
}
|
|
|
|
if source.IsGit() {
|
|
meta.RepoURL = source.CloneURL
|
|
}
|
|
|
|
if source.HasSubdir() {
|
|
meta.Subdir = strings.ReplaceAll(source.Subdir, "\\", "/")
|
|
}
|
|
|
|
return meta
|
|
}
|