mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-18 18:04:17 +00:00
A skill installed from a non-default branch of an SSH or other-host remote (git@host:o/r.git, Gitea, self-hosted HTTPS) could not switch back to main: the Branch picker was greyed out with "This source can only use its default branch" (#787). The picker reused /api/hub/refs, which only lists refs for GitHub, GitLab and Bitbucket web URLs because a hub entry pins its ref in the URL. Reinstalling from a branch does not need that; the update endpoint already accepts any git source. /api/hub/refs now takes anyGit, which lists a non-pinnable git source's refs while still reporting pinnable=false. The detail page asks for it under its own query key; the hub editors keep the old request, so they run no extra ls-remote for sources they cannot pin. Closes #787 Co-authored-by: sim <sim@example.invalid>
84 lines
2.2 KiB
Go
84 lines
2.2 KiB
Go
package server
|
|
|
|
import (
|
|
"errors"
|
|
"net/http"
|
|
|
|
"skillshare/internal/install"
|
|
)
|
|
|
|
type hubRefsResponse struct {
|
|
Pinnable bool `json:"pinnable"`
|
|
Current string `json:"current"`
|
|
DefaultBranch string `json:"defaultBranch"`
|
|
Branches []string `json:"branches"`
|
|
Tags []string `json:"tags"`
|
|
Source *string `json:"source,omitempty"`
|
|
}
|
|
|
|
// handleHubRefs lists the branches and tags a hub entry's source can pin, and
|
|
// with "ref" in the body also returns the source rewritten to pin that ref.
|
|
// With "anyGit", a git source whose URL cannot pin a ref (SSH, other hosts)
|
|
// still lists its refs, for reinstalling an installed skill from a branch.
|
|
func (s *Server) handleHubRefs(w http.ResponseWriter, r *http.Request) {
|
|
s.mu.RLock()
|
|
parseOpts := s.parseOpts()
|
|
s.mu.RUnlock()
|
|
|
|
var body struct {
|
|
Source string `json:"source"`
|
|
Ref *string `json:"ref"`
|
|
AnyGit bool `json:"anyGit"`
|
|
}
|
|
if err := decodeJSON(w, r, &body, defaultJSONBodyLimit); err != nil {
|
|
if !errors.Is(err, errBodyTooLarge) {
|
|
writeError(w, http.StatusBadRequest, "invalid JSON body")
|
|
}
|
|
return
|
|
}
|
|
if body.Source == "" {
|
|
writeError(w, http.StatusBadRequest, "source is required")
|
|
return
|
|
}
|
|
source, err := install.ParseSourceWithOptions(body.Source, parseOpts)
|
|
if err != nil {
|
|
writeError(w, http.StatusBadRequest, "invalid source: "+err.Error())
|
|
return
|
|
}
|
|
|
|
resp := hubRefsResponse{Branches: []string{}, Tags: []string{}}
|
|
_, pinnable := source.PinnedRef()
|
|
if !pinnable && !(body.AnyGit && source.IsGit()) {
|
|
writeJSON(w, resp)
|
|
return
|
|
}
|
|
var refs install.RemoteRefs
|
|
list, err := refs.List(source)
|
|
if err != nil {
|
|
writeError(w, http.StatusInternalServerError, err.Error())
|
|
return
|
|
}
|
|
resp.DefaultBranch = list.DefaultBranch
|
|
resp.Branches = list.Branches
|
|
resp.Tags = list.Tags
|
|
if !pinnable {
|
|
writeJSON(w, resp)
|
|
return
|
|
}
|
|
if err := refs.Settle(source); err != nil {
|
|
writeError(w, http.StatusBadRequest, "invalid source: "+err.Error())
|
|
return
|
|
}
|
|
resp.Pinnable = true
|
|
resp.Current, _ = source.PinnedRef()
|
|
if body.Ref != nil {
|
|
pinned, err := source.AtRef(*body.Ref)
|
|
if err != nil {
|
|
writeError(w, http.StatusBadRequest, err.Error())
|
|
return
|
|
}
|
|
resp.Source = &pinned
|
|
}
|
|
writeJSON(w, resp)
|
|
}
|