mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-19 02:17:09 +00:00
* feat(check): show what changed in a skill since install #622 made a hand-edited skill visible as modified and kept update from overwriting it, but there was still no way to see the edits before deciding to keep or discard them (#621). LocalChanges compares the skill's files with the hashes recorded at install, fetches the source at the recorded commit only when a recorded file changed, and diffs each file against it, so the diff shows the user's edits even after upstream moves on. A skill without a recorded commit is refused rather than diffed against HEAD, which would show upstream changes as the user's. It backs `check <name> --diff`, GET /api/resources/{name}/local-changes, and the dashboard: the Modified locally dialog on the skill page lists the diffs, and the Updates tab links a modified skill to it. update's skip hints now point at --diff. The route looks up the exact record and refuses non-local names, so a nested or ../ path cannot borrow a top-level skill's record or read outside the source. The file diff helper moved to textdiff so the CLI and server share it. * fix(install): diff local changes against the full installed commit entry.Version holds the short SHA from `rev-parse --short`. A targeted fetch needs the full SHA, so checkoutCommit fell back to fetching every branch and tag with --unshallow: viewing one edited skill could download the repository's whole history, and fail when the commit is only reachable by its full SHA. Use entry.Commit, the full SHA install records, when it is the same commit as Version; a Commit left from an older install, or a legacy record without one, falls back to Version. * test(install): keep checkout line endings when editing in LocalChanges test On Windows git checks the installed copy out with CRLF, so overwriting SKILL.md with LF content made every line differ and the expected diff failed. Edit the installed file in place, as an editor would, and compare the diff without carriage returns.
40 lines
1.0 KiB
Go
40 lines
1.0 KiB
Go
package server
|
|
|
|
import (
|
|
"errors"
|
|
"net/http"
|
|
"path/filepath"
|
|
|
|
"skillshare/internal/install"
|
|
)
|
|
|
|
// handleSkillLocalChanges diffs the files of a skill installed from a repo
|
|
// against the version it was installed at. name is the skill's relative path.
|
|
func (s *Server) handleSkillLocalChanges(w http.ResponseWriter, r *http.Request) {
|
|
name := r.PathValue("name")
|
|
s.mu.RLock()
|
|
source := s.skillsSource()
|
|
walk := s.skillsWalk()
|
|
parseOpts := s.parseOpts()
|
|
var entry *install.MetadataEntry
|
|
if e := s.skillsStore.GetExact(name); e != nil && filepath.IsLocal(name) {
|
|
copied := *e
|
|
entry = &copied
|
|
}
|
|
s.mu.RUnlock()
|
|
|
|
changes, err := install.LocalChanges(entry, parseOpts, filepath.Join(source, filepath.FromSlash(name)), walk.Follow)
|
|
if errors.Is(err, install.ErrNoInstallRecord) {
|
|
writeError(w, http.StatusNotFound, name+": "+err.Error())
|
|
return
|
|
}
|
|
if err != nil {
|
|
writeError(w, http.StatusInternalServerError, err.Error())
|
|
return
|
|
}
|
|
if changes == nil {
|
|
changes = []install.FileChange{}
|
|
}
|
|
writeJSON(w, map[string]any{"files": changes})
|
|
}
|