comparing e0406559c37bfda102b8940d1e70f2034a18a79f and push-xpolynpvotzt on kot.pink/core

+8 -6

.air/appview.toml

···

       1
       1
       -
       [build]

     

       2
       2
       -
       cmd = "tailwindcss -i input.css -o ./appview/pages/static/tw.css && go build -o .bin/app ./cmd/appview/main.go"

     

       3
       3
       -
       bin = ";set -o allexport && source .env && set +o allexport; .bin/app"

     

       4
       1
        
       root = "."

     

       2
       2
       +
       tmp_dir = "out"

     

       5
       3
        
       

     

       6
       6
       -
       exclude_regex = [".*_templ.go"]

     

       7
       7
       -
       include_ext = ["go", "templ", "html", "css"]

     

       8
       8
       -
       exclude_dir = ["target", "atrium", "nix"]

     

       4
       4
       +
       [build]

     

       5
       5
       +
       cmd = "go build -o out/appview.out cmd/appview/main.go"

     

       6
       6
       +
       bin = "out/appview.out"

     

       7
       7
       +
       

     

       8
       8
       +
       include_ext = ["go"]

     

       9
       9
       +
       exclude_dir = ["avatar", "camo", "indexes", "nix", "tmp"]

     

       10
       10
       +
       stop_on_error = true

+11

.air/knot.toml

···

       1
       1
       +
       root = "."

     

       2
       2
       +
       tmp_dir = "out"

     

       3
       3
       +
       

     

       4
       4
       +
       [build]

     

       5
       5
       +
       cmd = 'go build -ldflags "-X tangled.org/core/knotserver.version=$(git describe --tags --long)" -o out/knot.out cmd/knot/main.go'

     

       6
       6
       +
       bin = "out/knot.out"

     

       7
       7
       +
       args_bin = ["server"]

     

       8
       8
       +
       

     

       9
       9
       +
       include_ext = ["go"]

     

       10
       10
       +
       exclude_dir = ["avatar", "camo", "indexes", "nix", "tmp"]

     

       11
       11
       +
       stop_on_error = true

-7

.air/knotserver.toml

···

       1
       1
       -
       [build]

     

       2
       2
       -
       cmd = 'go build -ldflags "-X tangled.org/core/knotserver.version=$(git describe --tags --long)" -o .bin/knot ./cmd/knot/'

     

       3
       3
       -
       bin = ".bin/knot server"

     

       4
       4
       -
       root = "."

     

       5
       5
       -
       

     

       6
       6
       -
       exclude_regex = [""]

     

       7
       7
       -
       include_ext = ["go", "templ"]

+10

.air/spindle.toml

···

       1
       1
       +
       root = "."

     

       2
       2
       +
       tmp_dir = "out"

     

       3
       3
       +
       

     

       4
       4
       +
       [build]

     

       5
       5
       +
       cmd = "go build -o out/spindle.out cmd/spindle/main.go"

     

       6
       6
       +
       bin = "out/spindle.out"

     

       7
       7
       +
       

     

       8
       8
       +
       include_ext = ["go"]

     

       9
       9
       +
       exclude_dir = ["avatar", "camo", "indexes", "nix", "tmp"]

     

       10
       10
       +
       stop_on_error = true

+13

.editorconfig

···

       1
       1
       +
       root = true

     

       2
       2
       +
       

     

       3
       3
       +
       [*.html]

     

       4
       4
       +
       indent_size = 2

     

       5
       5
       +
       

     

       6
       6
       +
       [*.json]

     

       7
       7
       +
       indent_size = 2

     

       8
       8
       +
       

     

       9
       9
       +
       [*.nix]

     

       10
       10
       +
       indent_size = 2

     

       11
       11
       +
       

     

       12
       12
       +
       [*.yml]

     

       13
       13
       +
       indent_size = 2

+4 -2

appview/db/pipeline.go

···

       168
       168
        
       

     

       169
       169
        
       // this is a mega query, but the most useful one:

     

       170
       170
        
       // get N pipelines, for each one get the latest status of its N workflows

     

       171
       171
       -
       func GetPipelineStatuses(e Execer, filters ...filter) ([]models.Pipeline, error) {

     

       171
       171
       +
       func GetPipelineStatuses(e Execer, limit int, filters ...filter) ([]models.Pipeline, error) {

     

       172
       172
        
       	var conditions []string

     

       173
       173
        
       	var args []any

     

       174
       174
        
       	for _, filter := range filters {

     
···

       205
       205
        
       		join

     

       206
       206
        
       			triggers t ON p.trigger_id = t.id

     

       207
       207
        
       		%s

     

       208
       208
       -
       	`, whereClause)

     

       208
       208
       +
       		order by p.created desc

     

       209
       209
       +
       		limit %d

     

       210
       210
       +
       	`, whereClause, limit)

     

       209
       211
        
       

     

       210
       212
        
       	rows, err := e.Query(query, args...)

     

       211
       213
        
       	if err != nil {

+3 -1

appview/indexer/issues/indexer.go

···

       56
       56
        
       			log.Fatalln("failed to populate issue indexer", err)

     

       57
       57
        
       		}

     

       58
       58
        
       	}

     

       59
       59
       -
       	l.Info("Initialized the issue indexer")

     

       59
       59
       +
       

     

       60
       60
       +
       	count, _ := ix.indexer.DocCount()

     

       61
       61
       +
       	l.Info("Initialized the issue indexer", "docCount", count)

     

       60
       62
        
       }

     

       61
       63
        
       

     

       62
       64
        
       func generateIssueIndexMapping() (mapping.IndexMapping, error) {

+3 -1

appview/indexer/pulls/indexer.go

···

       55
       55
        
       			log.Fatalln("failed to populate pull indexer", err)

     

       56
       56
        
       		}

     

       57
       57
        
       	}

     

       58
       58
       -
       	l.Info("Initialized the pull indexer")

     

       58
       58
       +
       

     

       59
       59
       +
       	count, _ := ix.indexer.DocCount()

     

       60
       60
       +
       	l.Info("Initialized the pull indexer", "docCount", count)

     

       59
       61
        
       }

     

       60
       62
        
       

     

       61
       63
        
       func generatePullIndexMapping() (mapping.IndexMapping, error) {

+25 -16

appview/issues/issues.go

···

       806
       806
        
       

     

       807
       807
        
       	keyword := params.Get("q")

     

       808
       808
        
       

     

       809
       809
       -
       	var ids []int64

     

       809
       809
       +
       	var issues []models.Issue

     

       810
       810
        
       	searchOpts := models.IssueSearchOptions{

     

       811
       811
        
       		Keyword: keyword,

     

       812
       812
        
       		RepoAt:  f.RepoAt().String(),

     
···

       819
       819
        
       			l.Error("failed to search for issues", "err", err)

     

       820
       820
        
       			return

     

       821
       821
        
       		}

     

       822
       822
       -
       		ids = res.Hits

     

       823
       823
       -
       		l.Debug("searched issues with indexer", "count", len(ids))

     

       822
       822
       +
       		l.Debug("searched issues with indexer", "count", len(res.Hits))

     

       823
       823
       +
       

     

       824
       824
       +
       		issues, err = db.GetIssues(

     

       825
       825
       +
       			rp.db,

     

       826
       826
       +
       			db.FilterIn("id", res.Hits),

     

       827
       827
       +
       		)

     

       828
       828
       +
       		if err != nil {

     

       829
       829
       +
       			l.Error("failed to get issues", "err", err)

     

       830
       830
       +
       			rp.pages.Notice(w, "issues", "Failed to load issues. Try again later.")

     

       831
       831
       +
       			return

     

       832
       832
       +
       		}

     

       833
       833
       +
       

     

       824
       834
        
       	} else {

     

       825
       825
       -
       		ids, err = db.GetIssueIDs(rp.db, searchOpts)

     

       835
       835
       +
       		openInt := 0

     

       836
       836
       +
       		if isOpen {

     

       837
       837
       +
       			openInt = 1

     

       838
       838
       +
       		}

     

       839
       839
       +
       		issues, err = db.GetIssuesPaginated(

     

       840
       840
       +
       			rp.db,

     

       841
       841
       +
       			page,

     

       842
       842
       +
       			db.FilterEq("repo_at", f.RepoAt()),

     

       843
       843
       +
       			db.FilterEq("open", openInt),

     

       844
       844
       +
       		)

     

       826
       845
        
       		if err != nil {

     

       827
       827
       -
       			l.Error("failed to search for issues", "err", err)

     

       846
       846
       +
       			l.Error("failed to get issues", "err", err)

     

       847
       847
       +
       			rp.pages.Notice(w, "issues", "Failed to load issues. Try again later.")

     

       828
       848
        
       			return

     

       829
       849
        
       		}

     

       830
       830
       -
       		l.Debug("indexed all issues from the db", "count", len(ids))

     

       831
       831
       -
       	}

     

       832
       832
       -
       

     

       833
       833
       -
       	issues, err := db.GetIssues(

     

       834
       834
       -
       		rp.db,

     

       835
       835
       -
       		db.FilterIn("id", ids),

     

       836
       836
       -
       	)

     

       837
       837
       -
       	if err != nil {

     

       838
       838
       -
       		l.Error("failed to get issues", "err", err)

     

       839
       839
       -
       		rp.pages.Notice(w, "issues", "Failed to load issues. Try again later.")

     

       840
       840
       -
       		return

     

       841
       850
        
       	}

     

       842
       851
        
       

     

       843
       852
        
       	labelDefs, err := db.GetLabelDefinitions(

+47

appview/models/repo.go

···

       104
       104
        
       	Repo   *Repo

     

       105
       105
        
       	Issues []Issue

     

       106
       106
        
       }

     

       107
       107
       +
       

     

       108
       108
       +
       type BlobContentType int

     

       109
       109
       +
       

     

       110
       110
       +
       const (

     

       111
       111
       +
       	BlobContentTypeCode BlobContentType = iota

     

       112
       112
       +
       	BlobContentTypeMarkup

     

       113
       113
       +
       	BlobContentTypeImage

     

       114
       114
       +
       	BlobContentTypeSvg

     

       115
       115
       +
       	BlobContentTypeVideo

     

       116
       116
       +
       	BlobContentTypeSubmodule

     

       117
       117
       +
       )

     

       118
       118
       +
       

     

       119
       119
       +
       func (ty BlobContentType) IsCode() bool      { return ty == BlobContentTypeCode }

     

       120
       120
       +
       func (ty BlobContentType) IsMarkup() bool    { return ty == BlobContentTypeMarkup }

     

       121
       121
       +
       func (ty BlobContentType) IsImage() bool     { return ty == BlobContentTypeImage }

     

       122
       122
       +
       func (ty BlobContentType) IsSvg() bool       { return ty == BlobContentTypeSvg }

     

       123
       123
       +
       func (ty BlobContentType) IsVideo() bool     { return ty == BlobContentTypeVideo }

     

       124
       124
       +
       func (ty BlobContentType) IsSubmodule() bool { return ty == BlobContentTypeSubmodule }

     

       125
       125
       +
       

     

       126
       126
       +
       type BlobView struct {

     

       127
       127
       +
       	HasTextView     bool // can show as code/text

     

       128
       128
       +
       	HasRenderedView bool // can show rendered (markup/image/video/submodule)

     

       129
       129
       +
       	HasRawView      bool // can download raw (everything except submodule)

     

       130
       130
       +
       

     

       131
       131
       +
       	// current display mode

     

       132
       132
       +
       	ShowingRendered bool // currently in rendered mode

     

       133
       133
       +
       	ShowingText     bool // currently in text/code mode

     

       134
       134
       +
       

     

       135
       135
       +
       	// content type flags

     

       136
       136
       +
       	ContentType BlobContentType

     

       137
       137
       +
       

     

       138
       138
       +
       	// Content data

     

       139
       139
       +
       	Contents   string

     

       140
       140
       +
       	ContentSrc string // URL for media files

     

       141
       141
       +
       	Lines      int

     

       142
       142
       +
       	SizeHint   uint64

     

       143
       143
       +
       }

     

       144
       144
       +
       

     

       145
       145
       +
       // if both views are available, then show a toggle between them

     

       146
       146
       +
       func (b BlobView) ShowToggle() bool {

     

       147
       147
       +
       	return b.HasTextView && b.HasRenderedView

     

       148
       148
       +
       }

     

       149
       149
       +
       

     

       150
       150
       +
       func (b BlobView) IsUnsupported() bool {

     

       151
       151
       +
       	// no view available, only raw

     

       152
       152
       +
       	return !(b.HasRenderedView || b.HasTextView)

     

       153
       153
       +
       }

+43 -1

appview/pages/funcmap.go

···

       1
       1
        
       package pages

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"bytes"

     

       4
       5
        
       	"context"

     

       5
       6
        
       	"crypto/hmac"

     

       6
       7
        
       	"crypto/sha256"

     
···

       17
       18
        
       	"strings"

     

       18
       19
        
       	"time"

     

       19
       20
        
       

     

       21
       21
       +
       	"github.com/alecthomas/chroma/v2"

     

       22
       22
       +
       	chromahtml "github.com/alecthomas/chroma/v2/formatters/html"

     

       23
       23
       +
       	"github.com/alecthomas/chroma/v2/lexers"

     

       24
       24
       +
       	"github.com/alecthomas/chroma/v2/styles"

     

       20
       25
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       21
       26
        
       	"github.com/dustin/go-humanize"

     

       22
       27
        
       	"github.com/go-enry/go-enry/v2"

     

       28
       28
       +
       	"github.com/yuin/goldmark"

     

       23
       29
        
       	"tangled.org/core/appview/filetree"

     

       24
       30
        
       	"tangled.org/core/appview/pages/markup"

     

       25
       31
        
       	"tangled.org/core/crypto"

     
···

       242
       248
        
       		},

     

       243
       249
        
       		"description": func(text string) template.HTML {

     

       244
       250
        
       			p.rctx.RendererType = markup.RendererTypeDefault

     

       245
       245
       -
       			htmlString := p.rctx.RenderMarkdown(text)

     

       251
       251
       +
       			htmlString := p.rctx.RenderMarkdownWith(text, goldmark.New())

     

       246
       252
        
       			sanitized := p.rctx.SanitizeDescription(htmlString)

     

       247
       253
        
       			return template.HTML(sanitized)

     

       254
       254
       +
       		},

     

       255
       255
       +
       		"readme": func(text string) template.HTML {

     

       256
       256
       +
       			p.rctx.RendererType = markup.RendererTypeRepoMarkdown

     

       257
       257
       +
       			htmlString := p.rctx.RenderMarkdown(text)

     

       258
       258
       +
       			sanitized := p.rctx.SanitizeDefault(htmlString)

     

       259
       259
       +
       			return template.HTML(sanitized)

     

       260
       260
       +
       		},

     

       261
       261
       +
       		"code": func(content, path string) string {

     

       262
       262
       +
       			var style *chroma.Style = styles.Get("catpuccin-latte")

     

       263
       263
       +
       			formatter := chromahtml.New(

     

       264
       264
       +
       				chromahtml.InlineCode(false),

     

       265
       265
       +
       				chromahtml.WithLineNumbers(true),

     

       266
       266
       +
       				chromahtml.WithLinkableLineNumbers(true, "L"),

     

       267
       267
       +
       				chromahtml.Standalone(false),

     

       268
       268
       +
       				chromahtml.WithClasses(true),

     

       269
       269
       +
       			)

     

       270
       270
       +
       

     

       271
       271
       +
       			lexer := lexers.Get(filepath.Base(path))

     

       272
       272
       +
       			if lexer == nil {

     

       273
       273
       +
       				lexer = lexers.Fallback

     

       274
       274
       +
       			}

     

       275
       275
       +
       

     

       276
       276
       +
       			iterator, err := lexer.Tokenise(nil, content)

     

       277
       277
       +
       			if err != nil {

     

       278
       278
       +
       				p.logger.Error("chroma tokenize", "err", "err")

     

       279
       279
       +
       				return ""

     

       280
       280
       +
       			}

     

       281
       281
       +
       

     

       282
       282
       +
       			var code bytes.Buffer

     

       283
       283
       +
       			err = formatter.Format(&code, style, iterator)

     

       284
       284
       +
       			if err != nil {

     

       285
       285
       +
       				p.logger.Error("chroma format", "err", "err")

     

       286
       286
       +
       				return ""

     

       287
       287
       +
       			}

     

       288
       288
       +
       

     

       289
       289
       +
       			return code.String()

     

       248
       290
        
       		},

     

       249
       291
        
       		"trimUriScheme": func(text string) string {

     

       250
       292
        
       			text = strings.TrimPrefix(text, "https://")

+4 -2

appview/pages/markup/markdown.go

···

       78
       78
        
       }

     

       79
       79
        
       

     

       80
       80
        
       func (rctx *RenderContext) RenderMarkdown(source string) string {

     

       81
       81
       -
       	md := NewMarkdown()

     

       81
       81
       +
       	return rctx.RenderMarkdownWith(source, NewMarkdown())

     

       82
       82
       +
       }

     

       82
       83
        
       

     

       84
       84
       +
       func (rctx *RenderContext) RenderMarkdownWith(source string, md goldmark.Markdown) string {

     

       83
       85
        
       	if rctx != nil {

     

       84
       86
        
       		var transformers []util.PrioritizedValue

     

       85
       87
        
       

     
···

       247
       249
        
       	repoName := fmt.Sprintf("%s/%s", rctx.RepoInfo.OwnerDid, rctx.RepoInfo.Name)

     

       248
       250
        
       

     

       249
       251
        
       	query := fmt.Sprintf("repo=%s&ref=%s&path=%s&raw=true",

     

       250
       250
       -
       		url.PathEscape(repoName), url.PathEscape(rctx.RepoInfo.Ref), actualPath)

     

       252
       252
       +
       		url.QueryEscape(repoName), url.QueryEscape(rctx.RepoInfo.Ref), actualPath)

     

       251
       253
        
       

     

       252
       254
        
       	parsedURL := &url.URL{

     

       253
       255
        
       		Scheme:   scheme,

+10 -98

appview/pages/pages.go

···

       1
       1
        
       package pages

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"bytes"

     

       5
       4
        
       	"crypto/sha256"

     

       6
       5
        
       	"embed"

     

       7
       6
        
       	"encoding/hex"

     
···

       29
       28
        
       	"tangled.org/core/patchutil"

     

       30
       29
        
       	"tangled.org/core/types"

     

       31
       30
        
       

     

       32
       32
       -
       	"github.com/alecthomas/chroma/v2"

     

       33
       33
       -
       	chromahtml "github.com/alecthomas/chroma/v2/formatters/html"

     

       34
       34
       -
       	"github.com/alecthomas/chroma/v2/lexers"

     

       35
       35
       -
       	"github.com/alecthomas/chroma/v2/styles"

     

       36
       31
        
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       37
       32
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       38
       33
        
       	"github.com/go-git/go-git/v5/plumbing"

     
···

       744
       739
        
       func (r RepoTreeParams) TreeStats() RepoTreeStats {

     

       745
       740
        
       	numFolders, numFiles := 0, 0

     

       746
       741
        
       	for _, f := range r.Files {

     

       747
       747
       -
       		if !f.IsFile {

     

       742
       742
       +
       		if !f.IsFile() {

     

       748
       743
        
       			numFolders += 1

     

       749
       749
       -
       		} else if f.IsFile {

     

       744
       744
       +
       		} else if f.IsFile() {

     

       750
       745
        
       			numFiles += 1

     

       751
       746
        
       		}

     

       752
       747
        
       	}

     
···

       817
       812
        
       }

     

       818
       813
        
       

     

       819
       814
        
       type RepoBlobParams struct {

     

       820
       820
       -
       	LoggedInUser     *oauth.User

     

       821
       821
       -
       	RepoInfo         repoinfo.RepoInfo

     

       822
       822
       -
       	Active           string

     

       823
       823
       -
       	Unsupported      bool

     

       824
       824
       -
       	IsImage          bool

     

       825
       825
       -
       	IsVideo          bool

     

       826
       826
       -
       	ContentSrc       string

     

       827
       827
       -
       	BreadCrumbs      [][]string

     

       828
       828
       -
       	ShowRendered     bool

     

       829
       829
       -
       	RenderToggle     bool

     

       830
       830
       -
       	RenderedContents template.HTML

     

       815
       815
       +
       	LoggedInUser *oauth.User

     

       816
       816
       +
       	RepoInfo     repoinfo.RepoInfo

     

       817
       817
       +
       	Active       string

     

       818
       818
       +
       	BreadCrumbs  [][]string

     

       819
       819
       +
       	BlobView     models.BlobView

     

       831
       820
        
       	*tangled.RepoBlob_Output

     

       832
       832
       -
       	// Computed fields for template compatibility

     

       833
       833
       -
       	Contents string

     

       834
       834
       -
       	Lines    int

     

       835
       835
       -
       	SizeHint uint64

     

       836
       836
       -
       	IsBinary bool

     

       837
       821
        
       }

     

       838
       822
        
       

     

       839
       823
        
       func (p *Pages) RepoBlob(w io.Writer, params RepoBlobParams) error {

     

       840
       840
       -
       	var style *chroma.Style = styles.Get("catpuccin-latte")

     

       841
       841
       -
       

     

       842
       842
       -
       	if params.ShowRendered {

     

       843
       843
       -
       		switch markup.GetFormat(params.Path) {

     

       844
       844
       -
       		case markup.FormatMarkdown:

     

       845
       845
       -
       			p.rctx.RepoInfo = params.RepoInfo

     

       846
       846
       -
       			p.rctx.RendererType = markup.RendererTypeRepoMarkdown

     

       847
       847
       -
       			htmlString := p.rctx.RenderMarkdown(params.Contents)

     

       848
       848
       -
       			sanitized := p.rctx.SanitizeDefault(htmlString)

     

       849
       849
       -
       			params.RenderedContents = template.HTML(sanitized)

     

       850
       850
       -
       		}

     

       851
       851
       -
       	}

     

       852
       852
       -
       

     

       853
       853
       -
       	c := params.Contents

     

       854
       854
       -
       	formatter := chromahtml.New(

     

       855
       855
       -
       		chromahtml.InlineCode(false),

     

       856
       856
       -
       		chromahtml.WithLineNumbers(true),

     

       857
       857
       -
       		chromahtml.WithLinkableLineNumbers(true, "L"),

     

       858
       858
       -
       		chromahtml.Standalone(false),

     

       859
       859
       -
       		chromahtml.WithClasses(true),

     

       860
       860
       -
       	)

     

       861
       861
       -
       

     

       862
       862
       -
       	lexer := lexers.Get(filepath.Base(params.Path))

     

       863
       863
       -
       	if lexer == nil {

     

       864
       864
       -
       		lexer = lexers.Fallback

     

       865
       865
       -
       	}

     

       866
       866
       -
       

     

       867
       867
       -
       	iterator, err := lexer.Tokenise(nil, c)

     

       868
       868
       -
       	if err != nil {

     

       869
       869
       -
       		return fmt.Errorf("chroma tokenize: %w", err)

     

       870
       870
       -
       	}

     

       871
       871
       -
       

     

       872
       872
       -
       	var code bytes.Buffer

     

       873
       873
       -
       	err = formatter.Format(&code, style, iterator)

     

       874
       874
       -
       	if err != nil {

     

       875
       875
       -
       		return fmt.Errorf("chroma format: %w", err)

     

       824
       824
       +
       	switch params.BlobView.ContentType {

     

       825
       825
       +
       	case models.BlobContentTypeMarkup:

     

       826
       826
       +
       		p.rctx.RepoInfo = params.RepoInfo

     

       876
       827
        
       	}

     

       877
       828
        
       

     

       878
       878
       -
       	params.Contents = code.String()

     

       879
       829
        
       	params.Active = "overview"

     

       880
       830
        
       	return p.executeRepo("repo/blob", w, params)

     

       881
       831
        
       }

     
···

       1432
       1382
        
       }

     

       1433
       1383
        
       

     

       1434
       1384
        
       func (p *Pages) SingleString(w io.Writer, params SingleStringParams) error {

     

       1435
       1435
       -
       	var style *chroma.Style = styles.Get("catpuccin-latte")

     

       1436
       1436
       -
       

     

       1437
       1437
       -
       	if params.ShowRendered {

     

       1438
       1438
       -
       		switch markup.GetFormat(params.String.Filename) {

     

       1439
       1439
       -
       		case markup.FormatMarkdown:

     

       1440
       1440
       -
       			p.rctx.RendererType = markup.RendererTypeRepoMarkdown

     

       1441
       1441
       -
       			htmlString := p.rctx.RenderMarkdown(params.String.Contents)

     

       1442
       1442
       -
       			sanitized := p.rctx.SanitizeDefault(htmlString)

     

       1443
       1443
       -
       			params.RenderedContents = template.HTML(sanitized)

     

       1444
       1444
       -
       		}

     

       1445
       1445
       -
       	}

     

       1446
       1446
       -
       

     

       1447
       1447
       -
       	c := params.String.Contents

     

       1448
       1448
       -
       	formatter := chromahtml.New(

     

       1449
       1449
       -
       		chromahtml.InlineCode(false),

     

       1450
       1450
       -
       		chromahtml.WithLineNumbers(true),

     

       1451
       1451
       -
       		chromahtml.WithLinkableLineNumbers(true, "L"),

     

       1452
       1452
       -
       		chromahtml.Standalone(false),

     

       1453
       1453
       -
       		chromahtml.WithClasses(true),

     

       1454
       1454
       -
       	)

     

       1455
       1455
       -
       

     

       1456
       1456
       -
       	lexer := lexers.Get(filepath.Base(params.String.Filename))

     

       1457
       1457
       -
       	if lexer == nil {

     

       1458
       1458
       -
       		lexer = lexers.Fallback

     

       1459
       1459
       -
       	}

     

       1460
       1460
       -
       

     

       1461
       1461
       -
       	iterator, err := lexer.Tokenise(nil, c)

     

       1462
       1462
       -
       	if err != nil {

     

       1463
       1463
       -
       		return fmt.Errorf("chroma tokenize: %w", err)

     

       1464
       1464
       -
       	}

     

       1465
       1465
       -
       

     

       1466
       1466
       -
       	var code bytes.Buffer

     

       1467
       1467
       -
       	err = formatter.Format(&code, style, iterator)

     

       1468
       1468
       -
       	if err != nil {

     

       1469
       1469
       -
       		return fmt.Errorf("chroma format: %w", err)

     

       1470
       1470
       -
       	}

     

       1471
       1471
       -
       

     

       1472
       1472
       -
       	params.String.Contents = code.String()

     

       1473
       1385
        
       	return p.execute("strings/string", w, params)

     

       1474
       1386
        
       }

     

       1475
       1387

+64 -39

appview/pages/templates/repo/blob.html

···

       11
       11
        
       {{ end }}

     

       12
       12
        
       

     

       13
       13
        
       {{ define "repoContent" }}

     

       14
       14
       -
           {{ $lines := split .Contents }}

     

       15
       15
       -
           {{ $tot_lines := len $lines }}

     

       16
       16
       -
           {{ $tot_chars := len (printf "%d" $tot_lines) }}

     

       17
       17
       -
           {{ $code_number_style := "text-gray-400 dark:text-gray-500 left-0 bg-white dark:bg-gray-800 text-right mr-6 select-none inline-block w-12" }}

     

       18
       14
        
           {{ $linkstyle := "no-underline hover:underline" }}

     

       19
       15
        
           <div class="pb-2 mb-3 text-base border-b border-gray-200 dark:border-gray-700">

     

       20
       16
        
               <div class="flex flex-col md:flex-row md:justify-between gap-2">

     
···

       36
       32
        
                   </div>

     

       37
       33
        
                   <div id="file-info" class="text-gray-500 dark:text-gray-400 text-xs md:text-sm flex flex-wrap items-center gap-1 md:gap-0">

     

       38
       34
        
                       <span>at <a href="/{{ .RepoInfo.FullName }}/tree/{{ .Ref }}">{{ .Ref }}</a></span>

     

       39
       39
       -
                       <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       40
       40
       -
                       <span>{{ .Lines }} lines</span>

     

       41
       41
       -
                       <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       42
       42
       -
                       <span>{{ byteFmt .SizeHint }}</span>

     

       43
       43
       -
                       <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       44
       44
       -
                       <a href="/{{ .RepoInfo.FullName }}/raw/{{ .Ref }}/{{ .Path }}">view raw</a>

     

       45
       45
       -
                       {{ if .RenderToggle }}

     

       46
       46
       -
                       <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       47
       47
       -
                       <a

     

       48
       48
       -
                       href="/{{ .RepoInfo.FullName }}/blob/{{ .Ref }}/{{ .Path }}?code={{ .ShowRendered }}"

     

       49
       49
       -
                       hx-boost="true"

     

       50
       50
       -
                       >view {{ if .ShowRendered }}code{{ else }}rendered{{ end }}</a>

     

       35
       35
       +
       

     

       36
       36
       +
                       {{ if .BlobView.ShowingText }}

     

       37
       37
       +
                         <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       38
       38
       +
                         <span>{{ .Lines }} lines</span>

     

       39
       39
       +
                       {{ end }}

     

       40
       40
       +
       

     

       41
       41
       +
                       {{ if .BlobView.SizeHint }}

     

       42
       42
       +
                         <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       43
       43
       +
                         <span>{{ byteFmt .BlobView.SizeHint }}</span>

     

       44
       44
       +
                       {{ end }}

     

       45
       45
       +
       

     

       46
       46
       +
                       {{ if .BlobView.HasRawView }}

     

       47
       47
       +
                         <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       48
       48
       +
                         <a href="/{{ .RepoInfo.FullName }}/raw/{{ .Ref }}/{{ .Path }}">view raw</a>

     

       49
       49
       +
                       {{ end }}

     

       50
       50
       +
       

     

       51
       51
       +
                       {{ if .BlobView.ShowToggle }}

     

       52
       52
       +
                         <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       53
       53
       +
                         <a href="/{{ .RepoInfo.FullName }}/blob/{{ .Ref }}/{{ .Path }}?code={{ .BlobView.ShowingRendered }}" hx-boost="true">

     

       54
       54
       +
                           view {{ if .BlobView.ShowingRendered }}code{{ else }}rendered{{ end }}

     

       55
       55
       +
                         </a>

     

       51
       56
        
                       {{ end }}

     

       52
       57
        
                   </div>

     

       53
       58
        
               </div>

     

       54
       59
        
           </div>

     

       55
       55
       -
           {{ if and .IsBinary .Unsupported }}

     

       56
       56
       -
               <p class="text-center text-gray-400 dark:text-gray-500">

     

       57
       57
       -
                   Previews are not supported for this file type.

     

       58
       58
       -
               </p>

     

       59
       59
       -
           {{ else if .IsBinary }}

     

       60
       60
       -
               <div class="text-center">

     

       61
       61
       -
                   {{ if .IsImage }}

     

       62
       62
       -
                       <img src="{{ .ContentSrc }}"

     

       63
       63
       -
                            alt="{{ .Path }}"

     

       64
       64
       -
                            class="max-w-full h-auto mx-auto border border-gray-200 dark:border-gray-700 rounded" />

     

       65
       65
       -
                   {{ else if .IsVideo }}

     

       66
       66
       -
                       <video controls class="max-w-full h-auto mx-auto border border-gray-200 dark:border-gray-700 rounded">

     

       67
       67
       -
                           <source src="{{ .ContentSrc }}">

     

       68
       68
       -
                           Your browser does not support the video tag.

     

       69
       69
       -
                       </video>

     

       70
       70
       -
                   {{ end }}

     

       71
       71
       -
               </div>

     

       72
       72
       -
           {{ else }}

     

       73
       73
       -
           <div class="overflow-auto relative">

     

       74
       74
       -
               {{ if .ShowRendered }}

     

       75
       75
       -
               <div id="blob-contents" class="prose dark:prose-invert">{{ .RenderedContents }}</div>

     

       60
       60
       +
           {{ if .BlobView.IsUnsupported }}

     

       61
       61
       +
             <p class="text-center text-gray-400 dark:text-gray-500">

     

       62
       62
       +
                 Previews are not supported for this file type.

     

       63
       63
       +
             </p>

     

       64
       64
       +
           {{ else if .BlobView.ContentType.IsSubmodule }}

     

       65
       65
       +
             <p class="text-center text-gray-400 dark:text-gray-500">

     

       66
       66
       +
               This directory is a git submodule of <a href="{{ .BlobView.ContentSrc }}">{{ .BlobView.ContentSrc }}</a>.

     

       67
       67
       +
             </p>

     

       68
       68
       +
           {{ else if .BlobView.ContentType.IsImage }}

     

       69
       69
       +
             <div class="text-center">

     

       70
       70
       +
               <img src="{{ .BlobView.ContentSrc }}"

     

       71
       71
       +
                    alt="{{ .Path }}"

     

       72
       72
       +
                    class="max-w-full h-auto mx-auto border border-gray-200 dark:border-gray-700 rounded" />

     

       73
       73
       +
             </div>

     

       74
       74
       +
           {{ else if .BlobView.ContentType.IsVideo }}

     

       75
       75
       +
             <div class="text-center">

     

       76
       76
       +
               <video controls class="max-w-full h-auto mx-auto border border-gray-200 dark:border-gray-700 rounded">

     

       77
       77
       +
                   <source src="{{ .BlobView.ContentSrc }}">

     

       78
       78
       +
                   Your browser does not support the video tag.

     

       79
       79
       +
               </video>

     

       80
       80
       +
             </div>

     

       81
       81
       +
           {{ else if .BlobView.ContentType.IsSvg }}

     

       82
       82
       +
             <div class="overflow-auto relative">

     

       83
       83
       +
               {{ if .BlobView.ShowingRendered }}

     

       84
       84
       +
                 <div class="text-center">

     

       85
       85
       +
                   <img src="{{ .BlobView.ContentSrc }}"

     

       86
       86
       +
                        alt="{{ .Path }}"

     

       87
       87
       +
                        class="max-w-full h-auto mx-auto border border-gray-200 dark:border-gray-700 rounded" />

     

       88
       88
       +
                 </div>

     

       89
       89
       +
               {{ else }}

     

       90
       90
       +
                 <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ code .BlobView.Contents .Path | escapeHtml }}</div>

     

       91
       91
       +
               {{ end }}

     

       92
       92
       +
             </div>

     

       93
       93
       +
           {{ else if .BlobView.ContentType.IsMarkup }}

     

       94
       94
       +
             <div class="overflow-auto relative">

     

       95
       95
       +
               {{ if .BlobView.ShowingRendered }}

     

       96
       96
       +
                 <div id="blob-contents" class="prose dark:prose-invert">{{ .BlobView.Contents | readme }}</div>

     

       76
       97
        
               {{ else }}

     

       77
       77
       -
               <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ $.Contents | escapeHtml }}</div>

     

       98
       98
       +
                 <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ code .BlobView.Contents .Path | escapeHtml }}</div>

     

       78
       99
        
               {{ end }}

     

       79
       79
       -
           </div>

     

       100
       100
       +
             </div>

     

       101
       101
       +
           {{ else if .BlobView.ContentType.IsCode }}

     

       102
       102
       +
             <div class="overflow-auto relative">

     

       103
       103
       +
               <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ code .BlobView.Contents .Path | escapeHtml }}</div>

     

       104
       104
       +
             </div>

     

       80
       105
        
           {{ end }}

     

       81
       106
        
           {{ template "fragments/multiline-select" }}

     

       82
       107
        
       {{ end }}

+1 -1

appview/pages/templates/repo/compare/compare.html

···

       17
       17
        
       {{ end }}

     

       18
       18
        
       

     

       19
       19
        
       {{ define "mainLayout" }}

     

       20
       20
       -
         <div class="px-1 col-span-full flex flex-col gap-4">

     

       20
       20
       +
         <div class="px-1 flex-grow col-span-full flex flex-col gap-4">

     

       21
       21
        
           {{ block "contentLayout" . }}

     

       22
       22
        
             {{ block "content" . }}{{ end }}

     

       23
       23
        
           {{ end }}

+8 -1

appview/pages/templates/repo/index.html

···

       35
       35
        
       {{ end }}

     

       36
       36
        
       

     

       37
       37
        
       {{ define "repoLanguages" }}

     

       38
       38
       -
           <details class="group -m-6 mb-4">

     

       38
       38
       +
           <details class="group -my-4 -m-6 mb-4">

     

       39
       39
        
             <summary class="flex gap-[1px] h-4 scale-y-50 hover:scale-y-100 origin-top group-open:scale-y-100 transition-all hover:cursor-pointer overflow-hidden rounded-t">

     

       40
       40
        
               {{ range $value := .Languages }}

     

       41
       41
        
               <div

     
···

       129
       129
        
                 {{ $icon := "folder" }}

     

       130
       130
        
                 {{ $iconStyle := "size-4 fill-current" }}

     

       131
       131
        
       

     

       132
       132
       +
                 {{ if .IsSubmodule }}

     

       133
       133
       +
                   {{ $link = printf "/%s/%s/%s/%s" $.RepoInfo.FullName "blob" (urlquery $.Ref) .Name }}

     

       134
       134
       +
                   {{ $icon = "folder-input" }}

     

       135
       135
       +
                   {{ $iconStyle = "size-4" }}

     

       136
       136
       +
                 {{ end }}

     

       137
       137
       +
       

     

       132
       138
        
                 {{ if .IsFile }}

     

       133
       139
        
                   {{ $link = printf "/%s/%s/%s/%s" $.RepoInfo.FullName "blob" (urlquery $.Ref) .Name }}

     

       134
       140
        
                   {{ $icon = "file" }}

     

       135
       141
        
                   {{ $iconStyle = "size-4" }}

     

       136
       142
        
                 {{ end }}

     

       143
       143
       +
       

     

       137
       144
        
                 <a href="{{ $link }}" class="{{ $linkstyle }}">

     

       138
       145
        
                   <div class="flex items-center gap-2">

     

       139
       146
        
                     {{ i $icon $iconStyle "flex-shrink-0" }}

+19 -8

appview/pages/templates/repo/issues/issues.html

···

       30
       30
        
         <div class="grid gap-2 grid-cols-[auto_1fr_auto] grid-row-2">

     

       31
       31
        
           <form class="flex relative col-span-3 sm:col-span-1 sm:col-start-2" method="GET">

     

       32
       32
        
             <input type="hidden" name="state" value="{{ if .FilteringByOpen }}open{{ else }}closed{{ end }}">

     

       33
       33
       -
             <div class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 pointer-events-none">

     

       34
       34
       -
               {{ i "search" "w-4 h-4" }}

     

       33
       33
       +
             <div class="flex-1 flex relative">

     

       34
       34
       +
               <input

     

       35
       35
       +
                 class="flex-1 py-1 pl-2 pr-10 mr-[-1px] rounded-r-none focus:border-0 focus:outline-none focus:ring focus:ring-blue-400 ring-inset peer"

     

       36
       36
       +
                 type="text"

     

       37
       37
       +
                 name="q"

     

       38
       38
       +
                 value="{{ .FilterQuery }}"

     

       39
       39
       +
                 placeholder=" "

     

       40
       40
       +
               >

     

       41
       41
       +
               <a

     

       42
       42
       +
                 href="?state={{ if .FilteringByOpen }}open{{ else }}closed{{ end }}"

     

       43
       43
       +
                 class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block"

     

       44
       44
       +
               >

     

       45
       45
       +
                 {{ i "x" "w-4 h-4" }}

     

       46
       46
       +
               </a>

     

       35
       47
        
             </div>

     

       36
       36
       -
             <input class="flex-1 p-1 pl-10 pr-10 peer" type="text" name="q" value="{{ .FilterQuery }}" placeholder=" ">

     

       37
       37
       -
             <a

     

       38
       38
       -
               href="?state={{ if .FilteringByOpen }}open{{ else }}closed{{ end }}"

     

       39
       39
       -
               class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block"

     

       48
       48
       +
             <button

     

       49
       49
       +
               type="submit"

     

       50
       50
       +
               class="p-2 text-gray-400 border rounded-r border-gray-400 dark:border-gray-600"

     

       40
       51
        
             >

     

       41
       41
       -
               {{ i "x" "w-4 h-4" }}

     

       42
       42
       -
             </a>

     

       52
       52
       +
               {{ i "search" "w-4 h-4" }}

     

       53
       53
       +
             </button>

     

       43
       54
        
           </form>

     

       44
       55
        
           <div class="sm:row-start-1">

     

       45
       56
        
             {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }}

+3 -3

appview/pages/templates/repo/pipelines/fragments/logBlock.html

···

       2
       2
        
       <div id="lines" hx-swap-oob="beforeend">

     

       3
       3
        
         <details id="step-{{ .Id }}" {{if not .Collapsed}}open{{end}} class="group pb-2 rounded-sm border border-gray-200 dark:border-gray-700">

     

       4
       4
        
           <summary class="sticky top-0 pt-2 px-2 group-open:pb-2 group-open:mb-2 list-none cursor-pointer group-open:border-b border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 hover:text-gray-500 hover:dark:text-gray-400">

     

       5
       5
       -
             <div class="group-open:hidden flex items-center gap-1">{{ template "stepHeader" . }}</div>

     

       6
       6
       -
             <div class="hidden group-open:flex items-center gap-1">{{ template "stepHeader" . }}</div>

     

       5
       5
       +
             <div class="group-open:hidden flex items-center gap-1">{{ i "chevron-right" "w-4 h-4" }} {{ template "stepHeader" . }}</div>

     

       6
       6
       +
             <div class="hidden group-open:flex items-center gap-1">{{ i "chevron-down" "w-4 h-4" }} {{ template "stepHeader" . }}</div>

     

       7
       7
        
           </summary>

     

       8
       8
        
           <div class="font-mono whitespace-pre overflow-x-auto px-2"><div class="text-blue-600 dark:text-blue-300">{{ .Command }}</div><div id="step-body-{{ .Id }}"></div></div>

     

       9
       9
        
         </details>

     
···

       11
       11
        
       {{ end }}

     

       12
       12
        
       

     

       13
       13
        
       {{ define "stepHeader" }}

     

       14
       14
       -
        {{ i "chevron-right" "w-4 h-4" }} {{ .Name }}

     

       14
       14
       +
        {{ .Name }}

     

       15
       15
        
        <span class="ml-auto text-sm text-gray-500 tabular-nums" data-timer="{{ .Id }}" data-start="{{ .StartTime.Unix }}"></span>

     

       16
       16
        
       {{ end }}

+20 -9

appview/pages/templates/repo/pulls/pulls.html

···

       31
       31
        
              "Key" "closed"

     

       32
       32
        
              "Value" "closed"

     

       33
       33
        
              "Icon" "ban"

     

       34
       34
       -
              "Meta" (string .RepoInfo.Stats.IssueCount.Closed)) }}

     

       34
       34
       +
              "Meta" (string .RepoInfo.Stats.PullCount.Closed)) }}

     

       35
       35
        
         {{ $values := list $open $merged $closed }}

     

       36
       36
        
         <div class="grid gap-2 grid-cols-[auto_1fr_auto] grid-row-2">

     

       37
       37
        
           <form class="flex relative col-span-3 sm:col-span-1 sm:col-start-2" method="GET">

     

       38
       38
        
             <input type="hidden" name="state" value="{{ .FilteringBy.String }}">

     

       39
       39
       -
             <div class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 pointer-events-none">

     

       40
       40
       -
               {{ i "search" "w-4 h-4" }}

     

       39
       39
       +
             <div class="flex-1 flex relative">

     

       40
       40
       +
               <input

     

       41
       41
       +
                 class="flex-1 py-1 pl-2 pr-10 mr-[-1px] rounded-r-none focus:border-0 focus:outline-none focus:ring focus:ring-blue-400 ring-inset peer"

     

       42
       42
       +
                 type="text"

     

       43
       43
       +
                 name="q"

     

       44
       44
       +
                 value="{{ .FilterQuery }}"

     

       45
       45
       +
                 placeholder=" "

     

       46
       46
       +
               >

     

       47
       47
       +
               <a

     

       48
       48
       +
                 href="?state={{ .FilteringBy.String }}"

     

       49
       49
       +
                 class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block"

     

       50
       50
       +
               >

     

       51
       51
       +
                 {{ i "x" "w-4 h-4" }}

     

       52
       52
       +
               </a>

     

       41
       53
        
             </div>

     

       42
       42
       -
             <input class="flex-1 p-1 pl-10 pr-10 peer" type="text" name="q" value="{{ .FilterQuery }}" placeholder=" ">

     

       43
       43
       -
             <a

     

       44
       44
       -
               href="?state={{ .FilteringBy.String }}"

     

       45
       45
       -
               class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block"

     

       54
       54
       +
             <button

     

       55
       55
       +
               type="submit"

     

       56
       56
       +
               class="p-2 text-gray-400 border rounded-r border-gray-400 dark:border-gray-600"

     

       46
       57
        
             >

     

       47
       47
       -
               {{ i "x" "w-4 h-4" }}

     

       48
       48
       -
             </a>

     

       58
       58
       +
               {{ i "search" "w-4 h-4" }}

     

       59
       59
       +
             </button>

     

       49
       60
        
           </form>

     

       50
       61
        
           <div class="sm:row-start-1">

     

       51
       62
        
             {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }}

+1 -1

appview/pages/templates/repo/settings/general.html

···

       58
       58
        
                 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       59
       59
        
               </button>

     

       60
       60
        
             </div>

     

       61
       61
       -
           <fieldset>

     

       61
       61
       +
           </fieldset>

     

       62
       62
        
         </form>

     

       63
       63
        
       {{ end }}

     

       64
       64

appview/pages/templates/repo/tree.html

···

       59
       59
        
                 {{ $icon := "folder" }}

     

       60
       60
        
                 {{ $iconStyle := "size-4 fill-current" }}

     

       61
       61
        
       

     

       62
       62
       +
                 {{ if .IsSubmodule }}

     

       63
       63
       +
                   {{ $link = printf "/%s/%s/%s/%s/%s" $.RepoInfo.FullName "blob" (urlquery $.Ref) $.TreePath .Name }}

     

       64
       64
       +
                   {{ $icon = "folder-input" }}

     

       65
       65
       +
                   {{ $iconStyle = "size-4" }}

     

       66
       66
       +
                 {{ end }}

     

       67
       67
       +
       

     

       62
       68
        
                 {{ if .IsFile }}

     

       69
       69
       +
                   {{ $link = printf "/%s/%s/%s/%s/%s" $.RepoInfo.FullName "blob" (urlquery $.Ref) $.TreePath .Name }}

     

       63
       70
        
                   {{ $icon = "file" }}

     

       64
       71
        
                   {{ $iconStyle = "size-4" }}

     

       65
       72
        
                 {{ end }}

     

       73
       73
       +
       

     

       66
       74
        
                 <a href="{{ $link }}" class="{{ $linkstyle }}">

     

       67
       75
        
                   <div class="flex items-center gap-2">

     

       68
       76
        
                     {{ i $icon $iconStyle "flex-shrink-0" }}

+2 -2

appview/pages/templates/strings/string.html

···

       75
       75
        
           </div>

     

       76
       76
        
           <div class="overflow-x-auto overflow-y-hidden relative">

     

       77
       77
        
             {{ if .ShowRendered }}

     

       78
       78
       -
             <div id="blob-contents" class="prose dark:prose-invert">{{ .RenderedContents }}</div>

     

       78
       78
       +
               <div id="blob-contents" class="prose dark:prose-invert">{{ .String.Contents | readme }}</div>

     

       79
       79
        
             {{ else }}

     

       80
       80
       -
             <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ .String.Contents | escapeHtml }}</div>

     

       80
       80
       +
               <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ code .String.Contents .String.Filename | escapeHtml }}</div>

     

       81
       81
        
             {{ end }}

     

       82
       82
        
           </div>

     

       83
       83
        
           {{ template "fragments/multiline-select" }}

+7 -1

appview/pages/templates/user/fragments/editBio.html

···

       26
       26
        
               {{ if and .Profile .Profile.Pronouns }}

     

       27
       27
        
                 {{ $pronouns = .Profile.Pronouns }}

     

       28
       28
        
               {{ end }}

     

       29
       29
       -
               <input type="text" class="py-1 px-1 w-full" name="pronouns" value="{{ $pronouns }}">

     

       29
       29
       +
               <input

     

       30
       30
       +
                 type="text"

     

       31
       31
       +
                 class="py-1 px-1 w-full"

     

       32
       32
       +
                 name="pronouns"

     

       33
       33
       +
                 placeholder="they/them"

     

       34
       34
       +
                 value="{{ $pronouns }}"

     

       35
       35
       +
               >

     

       30
       36
        
             </div>

     

       31
       37
        
           </div>

     

       32
       38

appview/pipelines/pipelines.go

···

       82
       82
        
       

     

       83
       83
        
       	ps, err := db.GetPipelineStatuses(

     

       84
       84
        
       		p.db,

     

       85
       85
       +
       		30,

     

       85
       86
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       86
       87
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       87
       88
        
       		db.FilterEq("knot", repoInfo.Knot),

     
···

       124
       125
        
       

     

       125
       126
        
       	ps, err := db.GetPipelineStatuses(

     

       126
       127
        
       		p.db,

     

       128
       128
       +
       		1,

     

       127
       129
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       128
       130
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       129
       131
        
       		db.FilterEq("knot", repoInfo.Knot),

     
···

       193
       195
        
       

     

       194
       196
        
       	ps, err := db.GetPipelineStatuses(

     

       195
       197
        
       		p.db,

     

       198
       198
       +
       		1,

     

       196
       199
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       197
       200
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       198
       201
        
       		db.FilterEq("knot", repoInfo.Knot),

appview/pulls/pulls.go

···

       178
       178
        
       

     

       179
       179
        
       	ps, err := db.GetPipelineStatuses(

     

       180
       180
        
       		s.db,

     

       181
       181
       +
       		len(shas),

     

       181
       182
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       182
       183
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       183
       184
        
       		db.FilterEq("knot", repoInfo.Knot),

     
···

       648
       649
        
       	repoInfo := f.RepoInfo(user)

     

       649
       650
        
       	ps, err := db.GetPipelineStatuses(

     

       650
       651
        
       		s.db,

     

       652
       652
       +
       		len(shas),

     

       651
       653
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       652
       654
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       653
       655
        
       		db.FilterEq("knot", repoInfo.Knot),

+136 -64

appview/repo/blob.go

···

       1
       1
        
       package repo

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"encoding/base64"

     

       4
       5
        
       	"fmt"

     

       5
       6
        
       	"io"

     

       6
       7
        
       	"net/http"

     
···

       10
       11
        
       	"strings"

     

       11
       12
        
       

     

       12
       13
        
       	"tangled.org/core/api/tangled"

     

       14
       14
       +
       	"tangled.org/core/appview/config"

     

       15
       15
       +
       	"tangled.org/core/appview/models"

     

       13
       16
        
       	"tangled.org/core/appview/pages"

     

       14
       17
        
       	"tangled.org/core/appview/pages/markup"

     

       18
       18
       +
       	"tangled.org/core/appview/reporesolver"

     

       15
       19
        
       	xrpcclient "tangled.org/core/appview/xrpcclient"

     

       16
       20
        
       

     

       17
       21
        
       	indigoxrpc "github.com/bluesky-social/indigo/xrpc"

     

       18
       22
        
       	"github.com/go-chi/chi/v5"

     

       19
       23
        
       )

     

       20
       24
        
       

     

       25
       25
       +
       // the content can be one of the following:

     

       26
       26
       +
       //

     

       27
       27
       +
       // - code      : text |          | raw

     

       28
       28
       +
       // - markup    : text | rendered | raw

     

       29
       29
       +
       // - svg       : text | rendered | raw

     

       30
       30
       +
       // - png       :      | rendered | raw

     

       31
       31
       +
       // - video     :      | rendered | raw

     

       32
       32
       +
       // - submodule :      | rendered |

     

       33
       33
       +
       // - rest      :      |          |

     

       21
       34
        
       func (rp *Repo) Blob(w http.ResponseWriter, r *http.Request) {

     

       22
       35
        
       	l := rp.logger.With("handler", "RepoBlob")

     

       36
       36
       +
       

     

       23
       37
        
       	f, err := rp.repoResolver.Resolve(r)

     

       24
       38
        
       	if err != nil {

     

       25
       39
        
       		l.Error("failed to get repo and knot", "err", err)

     

       26
       40
        
       		return

     

       27
       41
        
       	}

     

       42
       42
       +
       

     

       28
       43
        
       	ref := chi.URLParam(r, "ref")

     

       29
       44
        
       	ref, _ = url.PathUnescape(ref)

     

       45
       45
       +
       

     

       30
       46
        
       	filePath := chi.URLParam(r, "*")

     

       31
       47
        
       	filePath, _ = url.PathUnescape(filePath)

     

       48
       48
       +
       

     

       32
       49
        
       	scheme := "http"

     

       33
       50
        
       	if !rp.config.Core.Dev {

     

       34
       51
        
       		scheme = "https"

     
···

       44
       61
        
       		rp.pages.Error503(w)

     

       45
       62
        
       		return

     

       46
       63
        
       	}

     

       64
       64
       +
       

     

       47
       65
        
       	// Use XRPC response directly instead of converting to internal types

     

       48
       66
        
       	var breadcrumbs [][]string

     

       49
       67
        
       	breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), url.PathEscape(ref))})

     
···

       52
       70
        
       			breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], url.PathEscape(elem))})

     

       53
       71
        
       		}

     

       54
       72
        
       	}

     

       55
       55
       -
       	showRendered := false

     

       56
       56
       -
       	renderToggle := false

     

       57
       57
       -
       	if markup.GetFormat(resp.Path) == markup.FormatMarkdown {

     

       58
       58
       -
       		renderToggle = true

     

       59
       59
       -
       		showRendered = r.URL.Query().Get("code") != "true"

     

       60
       60
       -
       	}

     

       61
       61
       -
       	var unsupported bool

     

       62
       62
       -
       	var isImage bool

     

       63
       63
       -
       	var isVideo bool

     

       64
       64
       -
       	var contentSrc string

     

       65
       65
       -
       	if resp.IsBinary != nil && *resp.IsBinary {

     

       66
       66
       -
       		ext := strings.ToLower(filepath.Ext(resp.Path))

     

       67
       67
       -
       		switch ext {

     

       68
       68
       -
       		case ".jpg", ".jpeg", ".png", ".gif", ".svg", ".webp":

     

       69
       69
       -
       			isImage = true

     

       70
       70
       -
       		case ".mp4", ".webm", ".ogg", ".mov", ".avi":

     

       71
       71
       -
       			isVideo = true

     

       72
       72
       -
       		default:

     

       73
       73
       -
       			unsupported = true

     

       74
       74
       -
       		}

     

       75
       75
       -
       		// fetch the raw binary content using sh.tangled.repo.blob xrpc

     

       76
       76
       -
       		repoName := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       77
       77
       -
       		baseURL := &url.URL{

     

       78
       78
       -
       			Scheme: scheme,

     

       79
       79
       -
       			Host:   f.Knot,

     

       80
       80
       -
       			Path:   "/xrpc/sh.tangled.repo.blob",

     

       81
       81
       -
       		}

     

       82
       82
       -
       		query := baseURL.Query()

     

       83
       83
       -
       		query.Set("repo", repoName)

     

       84
       84
       -
       		query.Set("ref", ref)

     

       85
       85
       -
       		query.Set("path", filePath)

     

       86
       86
       -
       		query.Set("raw", "true")

     

       87
       87
       -
       		baseURL.RawQuery = query.Encode()

     

       88
       88
       -
       		blobURL := baseURL.String()

     

       89
       89
       -
       		contentSrc = blobURL

     

       90
       90
       -
       		if !rp.config.Core.Dev {

     

       91
       91
       -
       			contentSrc = markup.GenerateCamoURL(rp.config.Camo.Host, rp.config.Camo.SharedSecret, blobURL)

     

       92
       92
       -
       		}

     

       93
       93
       -
       	}

     

       94
       94
       -
       	lines := 0

     

       95
       95
       -
       	if resp.IsBinary == nil || !*resp.IsBinary {

     

       96
       96
       -
       		lines = strings.Count(resp.Content, "\n") + 1

     

       97
       97
       -
       	}

     

       98
       98
       -
       	var sizeHint uint64

     

       99
       99
       -
       	if resp.Size != nil {

     

       100
       100
       -
       		sizeHint = uint64(*resp.Size)

     

       101
       101
       -
       	} else {

     

       102
       102
       -
       		sizeHint = uint64(len(resp.Content))

     

       103
       103
       -
       	}

     

       73
       73
       +
       

     

       74
       74
       +
       	// Create the blob view

     

       75
       75
       +
       	blobView := NewBlobView(resp, rp.config, f, ref, filePath, r.URL.Query())

     

       76
       76
       +
       

     

       104
       77
        
       	user := rp.oauth.GetUser(r)

     

       105
       105
       -
       	// Determine if content is binary (dereference pointer)

     

       106
       106
       -
       	isBinary := false

     

       107
       107
       -
       	if resp.IsBinary != nil {

     

       108
       108
       -
       		isBinary = *resp.IsBinary

     

       109
       109
       -
       	}

     

       78
       78
       +
       

     

       110
       79
        
       	rp.pages.RepoBlob(w, pages.RepoBlobParams{

     

       111
       80
        
       		LoggedInUser:    user,

     

       112
       81
        
       		RepoInfo:        f.RepoInfo(user),

     

       113
       82
        
       		BreadCrumbs:     breadcrumbs,

     

       114
       114
       -
       		ShowRendered:    showRendered,

     

       115
       115
       -
       		RenderToggle:    renderToggle,

     

       116
       116
       -
       		Unsupported:     unsupported,

     

       117
       117
       -
       		IsImage:         isImage,

     

       118
       118
       -
       		IsVideo:         isVideo,

     

       119
       119
       -
       		ContentSrc:      contentSrc,

     

       83
       83
       +
       		BlobView:        blobView,

     

       120
       84
        
       		RepoBlob_Output: resp,

     

       121
       121
       -
       		Contents:        resp.Content,

     

       122
       122
       -
       		Lines:           lines,

     

       123
       123
       -
       		SizeHint:        sizeHint,

     

       124
       124
       -
       		IsBinary:        isBinary,

     

       125
       85
        
       	})

     

       126
       86
        
       }

     

       127
       87
        
       

     

       128
       88
        
       func (rp *Repo) RepoBlobRaw(w http.ResponseWriter, r *http.Request) {

     

       129
       89
        
       	l := rp.logger.With("handler", "RepoBlobRaw")

     

       90
       90
       +
       

     

       130
       91
        
       	f, err := rp.repoResolver.Resolve(r)

     

       131
       92
        
       	if err != nil {

     

       132
       93
        
       		l.Error("failed to get repo and knot", "err", err)

     

       133
       94
        
       		w.WriteHeader(http.StatusBadRequest)

     

       134
       95
        
       		return

     

       135
       96
        
       	}

     

       97
       97
       +
       

     

       136
       98
        
       	ref := chi.URLParam(r, "ref")

     

       137
       99
        
       	ref, _ = url.PathUnescape(ref)

     

       100
       100
       +
       

     

       138
       101
        
       	filePath := chi.URLParam(r, "*")

     

       139
       102
        
       	filePath, _ = url.PathUnescape(filePath)

     

       103
       103
       +
       

     

       140
       104
        
       	scheme := "http"

     

       141
       105
        
       	if !rp.config.Core.Dev {

     

       142
       106
        
       		scheme = "https"

     
···

       159
       123
        
       		l.Error("failed to create request", "err", err)

     

       160
       124
        
       		return

     

       161
       125
        
       	}

     

       126
       126
       +
       

     

       162
       127
        
       	// forward the If-None-Match header

     

       163
       128
        
       	if clientETag := r.Header.Get("If-None-Match"); clientETag != "" {

     

       164
       129
        
       		req.Header.Set("If-None-Match", clientETag)

     

       165
       130
        
       	}

     

       166
       131
        
       	client := &http.Client{}

     

       132
       132
       +
       

     

       167
       133
        
       	resp, err := client.Do(req)

     

       168
       134
        
       	if err != nil {

     

       169
       135
        
       		l.Error("failed to reach knotserver", "err", err)

     

       170
       136
        
       		rp.pages.Error503(w)

     

       171
       137
        
       		return

     

       172
       138
        
       	}

     

       139
       139
       +
       

     

       173
       140
        
       	defer resp.Body.Close()

     

       141
       141
       +
       

     

       174
       142
        
       	// forward 304 not modified

     

       175
       143
        
       	if resp.StatusCode == http.StatusNotModified {

     

       176
       144
        
       		w.WriteHeader(http.StatusNotModified)

     

       177
       145
        
       		return

     

       178
       146
        
       	}

     

       147
       147
       +
       

     

       179
       148
        
       	if resp.StatusCode != http.StatusOK {

     

       180
       149
        
       		l.Error("knotserver returned non-OK status for raw blob", "url", blobURL, "statuscode", resp.StatusCode)

     

       181
       150
        
       		w.WriteHeader(resp.StatusCode)

     

       182
       151
        
       		_, _ = io.Copy(w, resp.Body)

     

       183
       152
        
       		return

     

       184
       153
        
       	}

     

       154
       154
       +
       

     

       185
       155
        
       	contentType := resp.Header.Get("Content-Type")

     

       186
       156
        
       	body, err := io.ReadAll(resp.Body)

     

       187
       157
        
       	if err != nil {

     
···

       189
       159
        
       		w.WriteHeader(http.StatusInternalServerError)

     

       190
       160
        
       		return

     

       191
       161
        
       	}

     

       162
       162
       +
       

     

       192
       163
        
       	if strings.HasPrefix(contentType, "text/") || isTextualMimeType(contentType) {

     

       193
       164
        
       		// serve all textual content as text/plain

     

       194
       165
        
       		w.Header().Set("Content-Type", "text/plain; charset=utf-8")

     
···

       202
       173
        
       		w.Write([]byte("unsupported content type"))

     

       203
       174
        
       		return

     

       204
       175
        
       	}

     

       176
       176
       +
       }

     

       177
       177
       +
       

     

       178
       178
       +
       // NewBlobView creates a BlobView from the XRPC response

     

       179
       179
       +
       func NewBlobView(resp *tangled.RepoBlob_Output, config *config.Config, f *reporesolver.ResolvedRepo, ref, filePath string, queryParams url.Values) models.BlobView {

     

       180
       180
       +
       	view := models.BlobView{

     

       181
       181
       +
       		Contents: "",

     

       182
       182
       +
       		Lines:    0,

     

       183
       183
       +
       	}

     

       184
       184
       +
       

     

       185
       185
       +
       	// Set size

     

       186
       186
       +
       	if resp.Size != nil {

     

       187
       187
       +
       		view.SizeHint = uint64(*resp.Size)

     

       188
       188
       +
       	} else if resp.Content != nil {

     

       189
       189
       +
       		view.SizeHint = uint64(len(*resp.Content))

     

       190
       190
       +
       	}

     

       191
       191
       +
       

     

       192
       192
       +
       	if resp.Submodule != nil {

     

       193
       193
       +
       		view.ContentType = models.BlobContentTypeSubmodule

     

       194
       194
       +
       		view.HasRenderedView = true

     

       195
       195
       +
       		view.ContentSrc = resp.Submodule.Url

     

       196
       196
       +
       		return view

     

       197
       197
       +
       	}

     

       198
       198
       +
       

     

       199
       199
       +
       	// Determine if binary

     

       200
       200
       +
       	if resp.IsBinary != nil && *resp.IsBinary {

     

       201
       201
       +
       		view.ContentSrc = generateBlobURL(config, f, ref, filePath)

     

       202
       202
       +
       		ext := strings.ToLower(filepath.Ext(resp.Path))

     

       203
       203
       +
       

     

       204
       204
       +
       		switch ext {

     

       205
       205
       +
       		case ".jpg", ".jpeg", ".png", ".gif", ".webp":

     

       206
       206
       +
       			view.ContentType = models.BlobContentTypeImage

     

       207
       207
       +
       			view.HasRawView = true

     

       208
       208
       +
       			view.HasRenderedView = true

     

       209
       209
       +
       			view.ShowingRendered = true

     

       210
       210
       +
       

     

       211
       211
       +
       		case ".svg":

     

       212
       212
       +
       			view.ContentType = models.BlobContentTypeSvg

     

       213
       213
       +
       			view.HasRawView = true

     

       214
       214
       +
       			view.HasTextView = true

     

       215
       215
       +
       			view.HasRenderedView = true

     

       216
       216
       +
       			view.ShowingRendered = queryParams.Get("code") != "true"

     

       217
       217
       +
       			if resp.Content != nil {

     

       218
       218
       +
       				bytes, _ := base64.StdEncoding.DecodeString(*resp.Content)

     

       219
       219
       +
       				view.Contents = string(bytes)

     

       220
       220
       +
       				view.Lines = strings.Count(view.Contents, "\n") + 1

     

       221
       221
       +
       			}

     

       222
       222
       +
       

     

       223
       223
       +
       		case ".mp4", ".webm", ".ogg", ".mov", ".avi":

     

       224
       224
       +
       			view.ContentType = models.BlobContentTypeVideo

     

       225
       225
       +
       			view.HasRawView = true

     

       226
       226
       +
       			view.HasRenderedView = true

     

       227
       227
       +
       			view.ShowingRendered = true

     

       228
       228
       +
       		}

     

       229
       229
       +
       

     

       230
       230
       +
       		return view

     

       231
       231
       +
       	}

     

       232
       232
       +
       

     

       233
       233
       +
       	// otherwise, we are dealing with text content

     

       234
       234
       +
       	view.HasRawView = true

     

       235
       235
       +
       	view.HasTextView = true

     

       236
       236
       +
       

     

       237
       237
       +
       	if resp.Content != nil {

     

       238
       238
       +
       		view.Contents = *resp.Content

     

       239
       239
       +
       		view.Lines = strings.Count(view.Contents, "\n") + 1

     

       240
       240
       +
       	}

     

       241
       241
       +
       

     

       242
       242
       +
       	// with text, we may be dealing with markdown

     

       243
       243
       +
       	format := markup.GetFormat(resp.Path)

     

       244
       244
       +
       	if format == markup.FormatMarkdown {

     

       245
       245
       +
       		view.ContentType = models.BlobContentTypeMarkup

     

       246
       246
       +
       		view.HasRenderedView = true

     

       247
       247
       +
       		view.ShowingRendered = queryParams.Get("code") != "true"

     

       248
       248
       +
       	}

     

       249
       249
       +
       

     

       250
       250
       +
       	return view

     

       251
       251
       +
       }

     

       252
       252
       +
       

     

       253
       253
       +
       func generateBlobURL(config *config.Config, f *reporesolver.ResolvedRepo, ref, filePath string) string {

     

       254
       254
       +
       	scheme := "http"

     

       255
       255
       +
       	if !config.Core.Dev {

     

       256
       256
       +
       		scheme = "https"

     

       257
       257
       +
       	}

     

       258
       258
       +
       

     

       259
       259
       +
       	repoName := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       260
       260
       +
       	baseURL := &url.URL{

     

       261
       261
       +
       		Scheme: scheme,

     

       262
       262
       +
       		Host:   f.Knot,

     

       263
       263
       +
       		Path:   "/xrpc/sh.tangled.repo.blob",

     

       264
       264
       +
       	}

     

       265
       265
       +
       	query := baseURL.Query()

     

       266
       266
       +
       	query.Set("repo", repoName)

     

       267
       267
       +
       	query.Set("ref", ref)

     

       268
       268
       +
       	query.Set("path", filePath)

     

       269
       269
       +
       	query.Set("raw", "true")

     

       270
       270
       +
       	baseURL.RawQuery = query.Encode()

     

       271
       271
       +
       	blobURL := baseURL.String()

     

       272
       272
       +
       

     

       273
       273
       +
       	if !config.Core.Dev {

     

       274
       274
       +
       		return markup.GenerateCamoURL(config.Camo.Host, config.Camo.SharedSecret, blobURL)

     

       275
       275
       +
       	}

     

       276
       276
       +
       	return blobURL

     

       205
       277
        
       }

     

       206
       278
        
       

     

       207
       279
        
       func isTextualMimeType(mimeType string) bool {

+14 -10

appview/repo/compare.go

···

       116
       116
        
       	}

     

       117
       117
        
       

     

       118
       118
        
       	// if user is navigating to one of

     

       119
       119
       -
       	//   /compare/{base}/{head}

     

       120
       119
        
       	//   /compare/{base}...{head}

     

       121
       121
       -
       	base := chi.URLParam(r, "base")

     

       122
       122
       -
       	head := chi.URLParam(r, "head")

     

       123
       123
       -
       	if base == "" && head == "" {

     

       124
       124
       -
       		rest := chi.URLParam(r, "*") // master...feature/xyz

     

       125
       125
       -
       		parts := strings.SplitN(rest, "...", 2)

     

       126
       126
       -
       		if len(parts) == 2 {

     

       127
       127
       -
       			base = parts[0]

     

       128
       128
       -
       			head = parts[1]

     

       129
       129
       -
       		}

     

       120
       120
       +
       	//   /compare/{base}/{head}

     

       121
       121
       +
       	var base, head string

     

       122
       122
       +
       	rest := chi.URLParam(r, "*")

     

       123
       123
       +
       

     

       124
       124
       +
       	var parts []string

     

       125
       125
       +
       	if strings.Contains(rest, "...") {

     

       126
       126
       +
       		parts = strings.SplitN(rest, "...", 2)

     

       127
       127
       +
       	} else if strings.Contains(rest, "/") {

     

       128
       128
       +
       		parts = strings.SplitN(rest, "/", 2)

     

       129
       129
       +
       	}

     

       130
       130
       +
       

     

       131
       131
       +
       	if len(parts) == 2 {

     

       132
       132
       +
       		base = parts[0]

     

       133
       133
       +
       		head = parts[1]

     

       130
       134
        
       	}

     

       131
       135
        
       

     

       132
       136
        
       	base, _ = url.PathUnescape(base)

+4 -5

appview/repo/index.go

···

       351
       351
        
       	if treeResp != nil && treeResp.Files != nil {

     

       352
       352
        
       		for _, file := range treeResp.Files {

     

       353
       353
        
       			niceFile := types.NiceTree{

     

       354
       354
       -
       				IsFile:    file.Is_file,

     

       355
       355
       -
       				IsSubtree: file.Is_subtree,

     

       356
       356
       -
       				Name:      file.Name,

     

       357
       357
       -
       				Mode:      file.Mode,

     

       358
       358
       -
       				Size:      file.Size,

     

       354
       354
       +
       				Name: file.Name,

     

       355
       355
       +
       				Mode: file.Mode,

     

       356
       356
       +
       				Size: file.Size,

     

       359
       357
        
       			}

     

       358
       358
       +
       

     

       360
       359
        
       			if file.Last_commit != nil {

     

       361
       360
        
       				when, _ := time.Parse(time.RFC3339, file.Last_commit.When)

     

       362
       361
        
       				niceFile.LastCommit = &types.LastCommitInfo{

-2

appview/repo/repo.go

···

       78
       78
        
       	}

     

       79
       79
        
       }

     

       80
       80
        
       

     

       81
       81
       -
       // isTextualMimeType returns true if the MIME type represents textual content

     

       82
       82
       -
       

     

       83
       81
        
       // modify the spindle configured for this repo

     

       84
       82
        
       func (rp *Repo) EditSpindle(w http.ResponseWriter, r *http.Request) {

     

       85
       83
        
       	user := rp.oauth.GetUser(r)

+3 -16

appview/repo/repo_util.go

···

       1
       1
        
       package repo

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"crypto/rand"

     

       5
       5
       -
       	"math/big"

     

       6
       4
        
       	"slices"

     

       7
       5
        
       	"sort"

     

       8
       6
        
       	"strings"

     
···

       17
       15
        
       

     

       18
       16
        
       func sortFiles(files []types.NiceTree) {

     

       19
       17
        
       	sort.Slice(files, func(i, j int) bool {

     

       20
       20
       -
       		iIsFile := files[i].IsFile

     

       21
       21
       -
       		jIsFile := files[j].IsFile

     

       18
       18
       +
       		iIsFile := files[i].IsFile()

     

       19
       19
       +
       		jIsFile := files[j].IsFile()

     

       22
       20
        
       		if iIsFile != jIsFile {

     

       23
       21
        
       			return !iIsFile

     

       24
       22
        
       		}

     
···

       90
       88
        
       	return

     

       91
       89
        
       }

     

       92
       90
        
       

     

       93
       93
       -
       func randomString(n int) string {

     

       94
       94
       -
       	const letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"

     

       95
       95
       -
       	result := make([]byte, n)

     

       96
       96
       -
       

     

       97
       97
       -
       	for i := 0; i < n; i++ {

     

       98
       98
       -
       		n, _ := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))

     

       99
       99
       -
       		result[i] = letters[n.Int64()]

     

       100
       100
       -
       	}

     

       101
       101
       -
       

     

       102
       102
       -
       	return string(result)

     

       103
       103
       -
       }

     

       104
       104
       -
       

     

       105
       91
        
       // grab pipelines from DB and munge that into a hashmap with commit sha as key

     

       106
       92
        
       //

     

       107
       93
        
       // golang is so blessed that it requires 35 lines of imperative code for this

     
···

       118
       104
        
       

     

       119
       105
        
       	ps, err := db.GetPipelineStatuses(

     

       120
       106
        
       		d,

     

       107
       107
       +
       		len(shas),

     

       121
       108
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       122
       109
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       123
       110
        
       		db.FilterEq("knot", repoInfo.Knot),

-1

appview/repo/router.go

···

       61
       61
        
       		// for example:

     

       62
       62
        
       		//   /compare/master...some/feature

     

       63
       63
        
       		//   /compare/master...example.com:another/feature <- this is a fork

     

       64
       64
       -
       		r.Get("/{base}/{head}", rp.Compare)

     

       65
       64
        
       		r.Get("/*", rp.Compare)

     

       66
       65
        
       	})

     

       67
       66

+4 -5

appview/repo/tree.go

···

       50
       50
        
       	files := make([]types.NiceTree, len(xrpcResp.Files))

     

       51
       51
        
       	for i, xrpcFile := range xrpcResp.Files {

     

       52
       52
        
       		file := types.NiceTree{

     

       53
       53
       -
       			Name:      xrpcFile.Name,

     

       54
       54
       -
       			Mode:      xrpcFile.Mode,

     

       55
       55
       -
       			Size:      int64(xrpcFile.Size),

     

       56
       56
       -
       			IsFile:    xrpcFile.Is_file,

     

       57
       57
       -
       			IsSubtree: xrpcFile.Is_subtree,

     

       53
       53
       +
       			Name: xrpcFile.Name,

     

       54
       54
       +
       			Mode: xrpcFile.Mode,

     

       55
       55
       +
       			Size: int64(xrpcFile.Size),

     

       58
       56
        
       		}

     

       59
       57
        
       		// Convert last commit info if present

     

       60
       58
        
       		if xrpcFile.Last_commit != nil {

     
···

       97
       95
        
       		}

     

       98
       96
        
       	}

     

       99
       97
        
       	sortFiles(result.Files)

     

       98
       98
       +
       

     

       100
       99
        
       	rp.pages.RepoTree(w, pages.RepoTreeParams{

     

       101
       100
        
       		LoggedInUser:     user,

     

       102
       101
        
       		BreadCrumbs:      breadcrumbs,

+1 -1

appview/state/router.go

···

       139
       139
        
       		// r.Post("/import", s.ImportRepo)

     

       140
       140
        
       	})

     

       141
       141
        
       

     

       142
       142
       -
       	r.Get("/goodfirstissues", s.GoodFirstIssues)

     

       142
       142
       +
       	r.With(middleware.Paginate).Get("/goodfirstissues", s.GoodFirstIssues)

     

       143
       143
        
       

     

       144
       144
        
       	r.With(middleware.AuthMiddleware(s.oauth)).Route("/follow", func(r chi.Router) {

     

       145
       145
        
       		r.Post("/", s.Follow)

+6 -9

flake.nix

···

       184
       184
        
             air-watcher = name: arg:

     

       185
       185
        
               pkgs.writeShellScriptBin "run"

     

       186
       186
        
               ''

     

       187
       187
       -
                 ${pkgs.air}/bin/air -c /dev/null \

     

       188
       188
       -
                 -build.cmd "${pkgs.go}/bin/go build -o ./out/${name}.out ./cmd/${name}/main.go" \

     

       189
       189
       -
                 -build.bin "./out/${name}.out" \

     

       190
       190
       -
                 -build.args_bin "${arg}" \

     

       191
       191
       -
                 -build.stop_on_error "true" \

     

       192
       192
       -
                 -build.include_ext "go"

     

       187
       187
       +
                 export PATH=${pkgs.go}/bin:$PATH

     

       188
       188
       +
                 ${pkgs.air}/bin/air -c ./.air/${name}.toml \

     

       189
       189
       +
                   -build.args_bin "${arg}"

     

       193
       190
        
               '';

     

       194
       191
        
             tailwind-watcher =

     

       195
       192
        
               pkgs.writeShellScriptBin "run"

     
···

       288
       285
        
           }: {

     

       289
       286
        
             imports = [./nix/modules/appview.nix];

     

       290
       287
        
       

     

       291
       291
       -
             services.tangled.appview.package = lib.mkDefault self.packages.${pkgs.system}.appview;

     

       288
       288
       +
             services.tangled.appview.package = lib.mkDefault self.packages.${pkgs.stdenv.hostPlatform.system}.appview;

     

       292
       289
        
           };

     

       293
       290
        
           nixosModules.knot = {

     

       294
       291
        
             lib,

     
···

       297
       294
        
           }: {

     

       298
       295
        
             imports = [./nix/modules/knot.nix];

     

       299
       296
        
       

     

       300
       300
       -
             services.tangled.knot.package = lib.mkDefault self.packages.${pkgs.system}.knot;

     

       297
       297
       +
             services.tangled.knot.package = lib.mkDefault self.packages.${pkgs.stdenv.hostPlatform.system}.knot;

     

       301
       298
        
           };

     

       302
       299
        
           nixosModules.spindle = {

     

       303
       300
        
             lib,

     
···

       306
       303
        
           }: {

     

       307
       304
        
             imports = [./nix/modules/spindle.nix];

     

       308
       305
        
       

     

       309
       309
       -
             services.tangled.spindle.package = lib.mkDefault self.packages.${pkgs.system}.spindle;

     

       306
       306
       +
             services.tangled.spindle.package = lib.mkDefault self.packages.${pkgs.stdenv.hostPlatform.system}.spindle;

     

       310
       307
        
           };

     

       311
       308
        
         };

     

       312
       309
        
       }

+4 -12

go.mod

···

       7
       7
        
       	github.com/alecthomas/assert/v2 v2.11.0

     

       8
       8
        
       	github.com/alecthomas/chroma/v2 v2.15.0

     

       9
       9
        
       	github.com/avast/retry-go/v4 v4.6.1

     

       10
       10
       +
       	github.com/blevesearch/bleve/v2 v2.5.3

     

       10
       11
        
       	github.com/bluekeyes/go-gitdiff v0.8.1

     

       11
       12
        
       	github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e

     

       12
       13
        
       	github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1

     

       14
       14
       +
       	github.com/bmatcuk/doublestar/v4 v4.9.1

     

       13
       15
        
       	github.com/carlmjohnson/versioninfo v0.22.5

     

       14
       16
        
       	github.com/casbin/casbin/v2 v2.103.0

     

       17
       17
       +
       	github.com/charmbracelet/log v0.4.2

     

       15
       18
        
       	github.com/cloudflare/cloudflare-go v0.115.0

     

       16
       19
        
       	github.com/cyphar/filepath-securejoin v0.4.1

     

       17
       20
        
       	github.com/dgraph-io/ristretto v0.2.0

     
···

       29
       32
        
       	github.com/hiddeco/sshsig v0.2.0

     

       30
       33
        
       	github.com/hpcloud/tail v1.0.0

     

       31
       34
        
       	github.com/ipfs/go-cid v0.5.0

     

       32
       32
       -
       	github.com/lestrrat-go/jwx/v2 v2.1.6

     

       33
       35
        
       	github.com/mattn/go-sqlite3 v1.14.24

     

       34
       36
        
       	github.com/microcosm-cc/bluemonday v1.0.27

     

       35
       37
        
       	github.com/openbao/openbao/api/v2 v2.3.0

     
···

       45
       47
        
       	github.com/wyatt915/goldmark-treeblood v0.0.1

     

       46
       48
        
       	github.com/yuin/goldmark v1.7.13

     

       47
       49
        
       	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc

     

       50
       50
       +
       	gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab

     

       48
       51
        
       	golang.org/x/crypto v0.40.0

     

       49
       52
        
       	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b

     

       50
       53
        
       	golang.org/x/image v0.31.0

     
···

       65
       68
        
       	github.com/aymerick/douceur v0.2.0 // indirect

     

       66
       69
        
       	github.com/beorn7/perks v1.0.1 // indirect

     

       67
       70
        
       	github.com/bits-and-blooms/bitset v1.22.0 // indirect

     

       68
       68
       -
       	github.com/blevesearch/bleve/v2 v2.5.3 // indirect

     

       69
       71
        
       	github.com/blevesearch/bleve_index_api v1.2.8 // indirect

     

       70
       72
        
       	github.com/blevesearch/geo v0.2.4 // indirect

     

       71
       73
        
       	github.com/blevesearch/go-faiss v1.0.25 // indirect

     
···

       83
       85
        
       	github.com/blevesearch/zapx/v14 v14.4.2 // indirect

     

       84
       86
        
       	github.com/blevesearch/zapx/v15 v15.4.2 // indirect

     

       85
       87
        
       	github.com/blevesearch/zapx/v16 v16.2.4 // indirect

     

       86
       86
       -
       	github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect

     

       87
       88
        
       	github.com/casbin/govaluate v1.3.0 // indirect

     

       88
       89
        
       	github.com/cenkalti/backoff/v4 v4.3.0 // indirect

     

       89
       90
        
       	github.com/cespare/xxhash/v2 v2.3.0 // indirect

     

       90
       91
        
       	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect

     

       91
       92
        
       	github.com/charmbracelet/lipgloss v1.1.0 // indirect

     

       92
       92
       -
       	github.com/charmbracelet/log v0.4.2 // indirect

     

       93
       93
        
       	github.com/charmbracelet/x/ansi v0.8.0 // indirect

     

       94
       94
        
       	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect

     

       95
       95
        
       	github.com/charmbracelet/x/term v0.2.1 // indirect

     
···

       98
       98
        
       	github.com/containerd/errdefs/pkg v0.3.0 // indirect

     

       99
       99
        
       	github.com/containerd/log v0.1.0 // indirect

     

       100
       100
        
       	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

     

       101
       101
       -
       	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect

     

       102
       101
        
       	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect

     

       103
       102
        
       	github.com/distribution/reference v0.6.0 // indirect

     

       104
       103
        
       	github.com/dlclark/regexp2 v1.11.5 // indirect

     
···

       152
       151
        
       	github.com/kevinburke/ssh_config v1.2.0 // indirect

     

       153
       152
        
       	github.com/klauspost/compress v1.18.0 // indirect

     

       154
       153
        
       	github.com/klauspost/cpuid/v2 v2.3.0 // indirect

     

       155
       155
       -
       	github.com/lestrrat-go/blackmagic v1.0.4 // indirect

     

       156
       156
       -
       	github.com/lestrrat-go/httpcc v1.0.1 // indirect

     

       157
       157
       -
       	github.com/lestrrat-go/httprc v1.0.6 // indirect

     

       158
       158
       -
       	github.com/lestrrat-go/iter v1.0.2 // indirect

     

       159
       159
       -
       	github.com/lestrrat-go/option v1.0.1 // indirect

     

       160
       154
        
       	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect

     

       161
       155
        
       	github.com/mattn/go-isatty v0.0.20 // indirect

     

       162
       156
        
       	github.com/mattn/go-runewidth v0.0.16 // indirect

     
···

       191
       185
        
       	github.com/prometheus/procfs v0.16.1 // indirect

     

       192
       186
        
       	github.com/rivo/uniseg v0.4.7 // indirect

     

       193
       187
        
       	github.com/ryanuber/go-glob v1.0.0 // indirect

     

       194
       194
       -
       	github.com/segmentio/asm v1.2.0 // indirect

     

       195
       188
        
       	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect

     

       196
       189
        
       	github.com/spaolacci/murmur3 v1.1.0 // indirect

     

       197
       190
        
       	github.com/vmihailenco/go-tinylfu v0.2.2 // indirect

     
···

       199
       192
        
       	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect

     

       200
       193
        
       	github.com/wyatt915/treeblood v0.1.16 // indirect

     

       201
       194
        
       	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect

     

       202
       202
       -
       	gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab // indirect

     

       203
       195
        
       	gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect

     

       204
       196
        
       	gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect

     

       205
       197
        
       	go.etcd.io/bbolt v1.4.0 // indirect

-17

go.sum

···

       71
       71
        
       github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1 h1:CFvRtYNSnWRAi/98M3O466t9dYuwtesNbu6FVPymRrA=

     

       72
       72
        
       github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1/go.mod h1:WiYEeyJSdUwqoaZ71KJSpTblemUCpwJfh5oVXplK6T4=

     

       73
       73
        
       github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=

     

       74
       74
       -
       github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=

     

       75
       74
        
       github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=

     

       76
       75
        
       github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE=

     

       77
       76
        
       github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=

     
···

       126
       125
        
       github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

     

       127
       126
        
       github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=

     

       128
       127
        
       github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

     

       129
       129
       -
       github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=

     

       130
       130
       -
       github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=

     

       131
       128
        
       github.com/dgraph-io/ristretto v0.2.0 h1:XAfl+7cmoUDWW/2Lx8TGZQjjxIQ2Ley9DSf52dru4WE=

     

       132
       129
        
       github.com/dgraph-io/ristretto v0.2.0/go.mod h1:8uBHCU/PBV4Ag0CJrP47b9Ofby5dqWNh4FicAdoqFNU=

     

       133
       130
        
       github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=

     
···

       330
       327
        
       github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=

     

       331
       328
        
       github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=

     

       332
       329
        
       github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=

     

       333
       333
       -
       github.com/lestrrat-go/blackmagic v1.0.4 h1:IwQibdnf8l2KoO+qC3uT4OaTWsW7tuRQXy9TRN9QanA=

     

       334
       334
       -
       github.com/lestrrat-go/blackmagic v1.0.4/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw=

     

       335
       335
       -
       github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=

     

       336
       336
       -
       github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=

     

       337
       337
       -
       github.com/lestrrat-go/httprc v1.0.6 h1:qgmgIRhpvBqexMJjA/PmwSvhNk679oqD1RbovdCGW8k=

     

       338
       338
       -
       github.com/lestrrat-go/httprc v1.0.6/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=

     

       339
       339
       -
       github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI=

     

       340
       340
       -
       github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=

     

       341
       341
       -
       github.com/lestrrat-go/jwx/v2 v2.1.6 h1:hxM1gfDILk/l5ylers6BX/Eq1m/pnxe9NBwW6lVfecA=

     

       342
       342
       -
       github.com/lestrrat-go/jwx/v2 v2.1.6/go.mod h1:Y722kU5r/8mV7fYDifjug0r8FK8mZdw0K0GpJw/l8pU=

     

       343
       343
       -
       github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=

     

       344
       344
       -
       github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=

     

       345
       330
        
       github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=

     

       346
       331
        
       github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=

     

       347
       332
        
       github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=

     
···

       466
       451
        
       github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

     

       467
       452
        
       github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=

     

       468
       453
        
       github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=

     

       469
       469
       -
       github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=

     

       470
       470
       -
       github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=

     

       471
       454
        
       github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=

     

       472
       455
        
       github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=

     

       473
       456
        
       github.com/sethvargo/go-envconfig v1.1.0 h1:cWZiJxeTm7AlCvzGXrEXaSTCNgip5oJepekh/BOQuog=

+4 -13

knotserver/git/tree.go

···

       7
       7
        
       	"path"

     

       8
       8
        
       	"time"

     

       9
       9
        
       

     

       10
       10
       +
       	"github.com/go-git/go-git/v5/plumbing/filemode"

     

       10
       11
        
       	"github.com/go-git/go-git/v5/plumbing/object"

     

       11
       12
        
       	"tangled.org/core/types"

     

       12
       13
        
       )

     
···

       53
       54
        
       	}

     

       54
       55
        
       

     

       55
       56
        
       	for _, e := range subtree.Entries {

     

       56
       56
       -
       		mode, _ := e.Mode.ToOSFileMode()

     

       57
       57
        
       		sz, _ := subtree.Size(e.Name)

     

       58
       58
       -
       

     

       59
       58
        
       		fpath := path.Join(parent, e.Name)

     

       60
       59
        
       

     

       61
       60
        
       		var lastCommit *types.LastCommitInfo

     
···

       69
       68
        
       

     

       70
       69
        
       		nts = append(nts, types.NiceTree{

     

       71
       70
        
       			Name:       e.Name,

     

       72
       72
       -
       			Mode:       mode.String(),

     

       73
       73
       -
       			IsFile:     e.Mode.IsFile(),

     

       71
       71
       +
       			Mode:       e.Mode.String(),

     

       74
       72
        
       			Size:       sz,

     

       75
       73
        
       			LastCommit: lastCommit,

     

       76
       74
        
       		})

     
···

       126
       124
        
       		default:

     

       127
       125
        
       		}

     

       128
       126
        
       

     

       129
       129
       -
       		mode, err := e.Mode.ToOSFileMode()

     

       130
       130
       -
       		if err != nil {

     

       131
       131
       -
       			// TODO: log this

     

       132
       132
       -
       			continue

     

       133
       133
       -
       		}

     

       134
       134
       -
       

     

       135
       127
        
       		if e.Mode.IsFile() {

     

       136
       136
       -
       			err = cb(e, currentTree, root)

     

       137
       137
       -
       			if errors.Is(err, TerminateWalk) {

     

       128
       128
       +
       			if err := cb(e, currentTree, root); errors.Is(err, TerminateWalk) {

     

       138
       129
        
       				return err

     

       139
       130
        
       			}

     

       140
       131
        
       		}

     

       141
       132
        
       

     

       142
       133
        
       		// e is a directory

     

       143
       143
       -
       		if mode.IsDir() {

     

       134
       134
       +
       		if e.Mode == filemode.Dir {

     

       144
       135
        
       			subtree, err := currentTree.Tree(e.Name)

     

       145
       136
        
       			if err != nil {

     

       146
       137
        
       				return fmt.Errorf("sub tree %s: %w", e.Name, err)

+1 -1

knotserver/ingester.go

···

       161
       161
        
       

     

       162
       162
        
       	var pipeline workflow.RawPipeline

     

       163
       163
        
       	for _, e := range workflowDir {

     

       164
       164
       -
       		if !e.IsFile {

     

       164
       164
       +
       		if !e.IsFile() {

     

       165
       165
        
       			continue

     

       166
       166
        
       		}

     

       167
       167

+1 -1

knotserver/internal.go

···

       277
       277
        
       

     

       278
       278
        
       	var pipeline workflow.RawPipeline

     

       279
       279
        
       	for _, e := range workflowDir {

     

       280
       280
       -
       		if !e.IsFile {

     

       280
       280
       +
       		if !e.IsFile() {

     

       281
       281
        
       			continue

     

       282
       282
        
       		}

     

       283
       283

+25

knotserver/router.go

···

       5
       5
        
       	"fmt"

     

       6
       6
        
       	"log/slog"

     

       7
       7
        
       	"net/http"

     

       8
       8
       +
       	"strings"

     

       8
       9
        
       

     

       9
       10
        
       	"github.com/go-chi/chi/v5"

     

       10
       11
        
       	"tangled.org/core/idresolver"

     
···

       79
       80
        
       	})

     

       80
       81
        
       

     

       81
       82
        
       	r.Route("/{did}", func(r chi.Router) {

     

       83
       83
       +
       		r.Use(h.resolveDidRedirect)

     

       82
       84
        
       		r.Route("/{name}", func(r chi.Router) {

     

       83
       85
        
       			// routes for git operations

     

       84
       86
        
       			r.Get("/info/refs", h.InfoRefs)

     
···

       113
       115
        
       	}

     

       114
       116
        
       

     

       115
       117
        
       	return xrpc.Router()

     

       118
       118
       +
       }

     

       119
       119
       +
       

     

       120
       120
       +
       func (h *Knot) resolveDidRedirect(next http.Handler) http.Handler {

     

       121
       121
       +
       	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       122
       122
       +
       		didOrHandle := chi.URLParam(r, "did")

     

       123
       123
       +
       		if strings.HasPrefix(didOrHandle, "did:") {

     

       124
       124
       +
       			next.ServeHTTP(w, r)

     

       125
       125
       +
       			return

     

       126
       126
       +
       		}

     

       127
       127
       +
       

     

       128
       128
       +
       		trimmed := strings.TrimPrefix(didOrHandle, "@")

     

       129
       129
       +
       		id, err := h.resolver.ResolveIdent(r.Context(), trimmed)

     

       130
       130
       +
       		if err != nil {

     

       131
       131
       +
       			// invalid did or handle

     

       132
       132
       +
       			h.l.Error("failed to resolve did/handle", "handle", trimmed, "err", err)

     

       133
       133
       +
       			http.Error(w, fmt.Sprintf("failed to resolve did/handle: %s", trimmed), http.StatusInternalServerError)

     

       134
       134
       +
       			return

     

       135
       135
       +
       		}

     

       136
       136
       +
       

     

       137
       137
       +
       		suffix := strings.TrimPrefix(r.URL.Path, "/"+didOrHandle)

     

       138
       138
       +
       		newPath := fmt.Sprintf("/%s/%s?%s", id.DID.String(), suffix, r.URL.RawQuery)

     

       139
       139
       +
       		http.Redirect(w, r, newPath, http.StatusTemporaryRedirect)

     

       140
       140
       +
       	})

     

       116
       141
        
       }

     

       117
       142
        
       

     

       118
       143
        
       func (h *Knot) configureOwner() error {

+3 -5

knotserver/xrpc/repo_tree.go

···

       67
       67
        
       	treeEntries := make([]*tangled.RepoTree_TreeEntry, len(files))

     

       68
       68
        
       	for i, file := range files {

     

       69
       69
        
       		entry := &tangled.RepoTree_TreeEntry{

     

       70
       70
       -
       			Name:       file.Name,

     

       71
       71
       -
       			Mode:       file.Mode,

     

       72
       72
       -
       			Size:       file.Size,

     

       73
       73
       -
       			Is_file:    file.IsFile,

     

       74
       74
       -
       			Is_subtree: file.IsSubtree,

     

       70
       70
       +
       			Name: file.Name,

     

       71
       71
       +
       			Mode: file.Mode,

     

       72
       72
       +
       			Size: file.Size,

     

       75
       73
        
       		}

     

       76
       74
        
       

     

       77
       75
        
       		if file.LastCommit != nil {

+1 -1

nix/pkgs/knot-unwrapped.nix

···

       4
       4
        
         sqlite-lib,

     

       5
       5
        
         src,

     

       6
       6
        
       }: let

     

       7
       7
       -
         version = "1.9.1-alpha";

     

       7
       7
       +
         version = "1.11.0-alpha";

     

       8
       8
        
       in

     

       9
       9
        
         buildGoApplication {

     

       10
       10
        
           pname = "knot";

+1 -1

spindle/engines/nixery/engine.go

···

       109
       109
        
       	setup := &setupSteps{}

     

       110
       110
        
       

     

       111
       111
        
       	setup.addStep(nixConfStep())

     

       112
       112
       -
       	setup.addStep(cloneStep(twf, *tpl.TriggerMetadata, e.cfg.Server.Dev))

     

       112
       112
       +
       	setup.addStep(models.BuildCloneStep(twf, *tpl.TriggerMetadata, e.cfg.Server.Dev))

     

       113
       113
        
       	// this step could be empty

     

       114
       114
        
       	if s := dependencyStep(dwf.Dependencies); s != nil {

     

       115
       115
        
       		setup.addStep(*s)

-73

spindle/engines/nixery/setup_steps.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"fmt"

     

       5
       5
       -
       	"path"

     

       6
       5
        
       	"strings"

     

       7
       7
       -
       

     

       8
       8
       -
       	"tangled.org/core/api/tangled"

     

       9
       9
       -
       	"tangled.org/core/workflow"

     

       10
       6
        
       )

     

       11
       7
        
       

     

       12
       8
        
       func nixConfStep() Step {

     
···

       17
       13
        
       		command: setupCmd,

     

       18
       14
        
       		name:    "Configure Nix",

     

       19
       15
        
       	}

     

       20
       20
       -
       }

     

       21
       21
       -
       

     

       22
       22
       -
       // cloneOptsAsSteps processes clone options and adds corresponding steps

     

       23
       23
       -
       // to the beginning of the workflow's step list if cloning is not skipped.

     

       24
       24
       -
       //

     

       25
       25
       -
       // the steps to do here are:

     

       26
       26
       -
       // - git init

     

       27
       27
       -
       // - git remote add origin <url>

     

       28
       28
       -
       // - git fetch --depth=<d> --recurse-submodules=<yes|no> <sha>

     

       29
       29
       -
       // - git checkout FETCH_HEAD

     

       30
       30
       -
       func cloneStep(twf tangled.Pipeline_Workflow, tr tangled.Pipeline_TriggerMetadata, dev bool) Step {

     

       31
       31
       -
       	if twf.Clone.Skip {

     

       32
       32
       -
       		return Step{}

     

       33
       33
       -
       	}

     

       34
       34
       -
       

     

       35
       35
       -
       	var commands []string

     

       36
       36
       -
       

     

       37
       37
       -
       	// initialize git repo in workspace

     

       38
       38
       -
       	commands = append(commands, "git init")

     

       39
       39
       -
       

     

       40
       40
       -
       	// add repo as git remote

     

       41
       41
       -
       	scheme := "https://"

     

       42
       42
       -
       	if dev {

     

       43
       43
       -
       		scheme = "http://"

     

       44
       44
       -
       		tr.Repo.Knot = strings.ReplaceAll(tr.Repo.Knot, "localhost", "host.docker.internal")

     

       45
       45
       -
       	}

     

       46
       46
       -
       	url := scheme + path.Join(tr.Repo.Knot, tr.Repo.Did, tr.Repo.Repo)

     

       47
       47
       -
       	commands = append(commands, fmt.Sprintf("git remote add origin %s", url))

     

       48
       48
       -
       

     

       49
       49
       -
       	// run git fetch

     

       50
       50
       -
       	{

     

       51
       51
       -
       		var fetchArgs []string

     

       52
       52
       -
       

     

       53
       53
       -
       		// default clone depth is 1

     

       54
       54
       -
       		depth := 1

     

       55
       55
       -
       		if twf.Clone.Depth > 1 {

     

       56
       56
       -
       			depth = int(twf.Clone.Depth)

     

       57
       57
       -
       		}

     

       58
       58
       -
       		fetchArgs = append(fetchArgs, fmt.Sprintf("--depth=%d", depth))

     

       59
       59
       -
       

     

       60
       60
       -
       		// optionally recurse submodules

     

       61
       61
       -
       		if twf.Clone.Submodules {

     

       62
       62
       -
       			fetchArgs = append(fetchArgs, "--recurse-submodules=yes")

     

       63
       63
       -
       		}

     

       64
       64
       -
       

     

       65
       65
       -
       		// set remote to fetch from

     

       66
       66
       -
       		fetchArgs = append(fetchArgs, "origin")

     

       67
       67
       -
       

     

       68
       68
       -
       		// set revision to checkout

     

       69
       69
       -
       		switch workflow.TriggerKind(tr.Kind) {

     

       70
       70
       -
       		case workflow.TriggerKindManual:

     

       71
       71
       -
       			// TODO: unimplemented

     

       72
       72
       -
       		case workflow.TriggerKindPush:

     

       73
       73
       -
       			fetchArgs = append(fetchArgs, tr.Push.NewSha)

     

       74
       74
       -
       		case workflow.TriggerKindPullRequest:

     

       75
       75
       -
       			fetchArgs = append(fetchArgs, tr.PullRequest.SourceSha)

     

       76
       76
       -
       		}

     

       77
       77
       -
       

     

       78
       78
       -
       		commands = append(commands, fmt.Sprintf("git fetch %s", strings.Join(fetchArgs, " ")))

     

       79
       79
       -
       	}

     

       80
       80
       -
       

     

       81
       81
       -
       	// run git checkout

     

       82
       82
       -
       	commands = append(commands, "git checkout FETCH_HEAD")

     

       83
       83
       -
       

     

       84
       84
       -
       	cloneStep := Step{

     

       85
       85
       -
       		command: strings.Join(commands, "\n"),

     

       86
       86
       -
       		name:    "Clone repository into workspace",

     

       87
       87
       -
       	}

     

       88
       88
       -
       	return cloneStep

     

       89
       16
        
       }

     

       90
       17
        
       

     

       91
       18
        
       // dependencyStep processes dependencies defined in the workflow.

+151

spindle/models/clone.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"strings"

     

       6
       6
       +
       

     

       7
       7
       +
       	"tangled.org/core/api/tangled"

     

       8
       8
       +
       	"tangled.org/core/workflow"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       type CloneStep struct {

     

       12
       12
       +
       	name     string

     

       13
       13
       +
       	kind     StepKind

     

       14
       14
       +
       	commands []string

     

       15
       15
       +
       }

     

       16
       16
       +
       

     

       17
       17
       +
       func (s CloneStep) Name() string {

     

       18
       18
       +
       	return s.name

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       func (s CloneStep) Commands() []string {

     

       22
       22
       +
       	return s.commands

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       func (s CloneStep) Command() string {

     

       26
       26
       +
       	return strings.Join(s.commands, "\n")

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       func (s CloneStep) Kind() StepKind {

     

       30
       30
       +
       	return s.kind

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       // BuildCloneStep generates git clone commands.

     

       34
       34
       +
       // The caller must ensure the current working directory is set to the desired

     

       35
       35
       +
       // workspace directory before executing these commands.

     

       36
       36
       +
       //

     

       37
       37
       +
       // The generated commands are:

     

       38
       38
       +
       // - git init

     

       39
       39
       +
       // - git remote add origin <url>

     

       40
       40
       +
       // - git fetch --depth=<d> --recurse-submodules=<yes|no> <sha>

     

       41
       41
       +
       // - git checkout FETCH_HEAD

     

       42
       42
       +
       //

     

       43
       43
       +
       // Supports all trigger types (push, PR, manual) and clone options.

     

       44
       44
       +
       func BuildCloneStep(twf tangled.Pipeline_Workflow, tr tangled.Pipeline_TriggerMetadata, dev bool) CloneStep {

     

       45
       45
       +
       	if twf.Clone != nil && twf.Clone.Skip {

     

       46
       46
       +
       		return CloneStep{}

     

       47
       47
       +
       	}

     

       48
       48
       +
       

     

       49
       49
       +
       	commitSHA, err := extractCommitSHA(tr)

     

       50
       50
       +
       	if err != nil {

     

       51
       51
       +
       		return CloneStep{

     

       52
       52
       +
       			kind:     StepKindSystem,

     

       53
       53
       +
       			name:     "Clone repository into workspace (error)",

     

       54
       54
       +
       			commands: []string{fmt.Sprintf("echo 'Failed to get clone info: %s' && exit 1", err.Error())},

     

       55
       55
       +
       		}

     

       56
       56
       +
       	}

     

       57
       57
       +
       

     

       58
       58
       +
       	repoURL := buildRepoURL(tr, dev)

     

       59
       59
       +
       

     

       60
       60
       +
       	var cloneOpts tangled.Pipeline_CloneOpts

     

       61
       61
       +
       	if twf.Clone != nil {

     

       62
       62
       +
       		cloneOpts = *twf.Clone

     

       63
       63
       +
       	}

     

       64
       64
       +
       	fetchArgs := buildFetchArgs(cloneOpts, commitSHA)

     

       65
       65
       +
       

     

       66
       66
       +
       	return CloneStep{

     

       67
       67
       +
       		kind: StepKindSystem,

     

       68
       68
       +
       		name: "Clone repository into workspace",

     

       69
       69
       +
       		commands: []string{

     

       70
       70
       +
       			"git init",

     

       71
       71
       +
       			fmt.Sprintf("git remote add origin %s", repoURL),

     

       72
       72
       +
       			fmt.Sprintf("git fetch %s", strings.Join(fetchArgs, " ")),

     

       73
       73
       +
       			"git checkout FETCH_HEAD",

     

       74
       74
       +
       		},

     

       75
       75
       +
       	}

     

       76
       76
       +
       }

     

       77
       77
       +
       

     

       78
       78
       +
       // extractCommitSHA extracts the commit SHA from trigger metadata based on trigger type

     

       79
       79
       +
       func extractCommitSHA(tr tangled.Pipeline_TriggerMetadata) (string, error) {

     

       80
       80
       +
       	switch workflow.TriggerKind(tr.Kind) {

     

       81
       81
       +
       	case workflow.TriggerKindPush:

     

       82
       82
       +
       		if tr.Push == nil {

     

       83
       83
       +
       			return "", fmt.Errorf("push trigger metadata is nil")

     

       84
       84
       +
       		}

     

       85
       85
       +
       		return tr.Push.NewSha, nil

     

       86
       86
       +
       

     

       87
       87
       +
       	case workflow.TriggerKindPullRequest:

     

       88
       88
       +
       		if tr.PullRequest == nil {

     

       89
       89
       +
       			return "", fmt.Errorf("pull request trigger metadata is nil")

     

       90
       90
       +
       		}

     

       91
       91
       +
       		return tr.PullRequest.SourceSha, nil

     

       92
       92
       +
       

     

       93
       93
       +
       	case workflow.TriggerKindManual:

     

       94
       94
       +
       		// Manual triggers don't have an explicit SHA in the metadata

     

       95
       95
       +
       		// For now, return empty string - could be enhanced to fetch from default branch

     

       96
       96
       +
       		// TODO: Implement manual trigger SHA resolution (fetch default branch HEAD)

     

       97
       97
       +
       		return "", nil

     

       98
       98
       +
       

     

       99
       99
       +
       	default:

     

       100
       100
       +
       		return "", fmt.Errorf("unknown trigger kind: %s", tr.Kind)

     

       101
       101
       +
       	}

     

       102
       102
       +
       }

     

       103
       103
       +
       

     

       104
       104
       +
       // buildRepoURL constructs the repository URL from trigger metadata

     

       105
       105
       +
       func buildRepoURL(tr tangled.Pipeline_TriggerMetadata, devMode bool) string {

     

       106
       106
       +
       	if tr.Repo == nil {

     

       107
       107
       +
       		return ""

     

       108
       108
       +
       	}

     

       109
       109
       +
       

     

       110
       110
       +
       	// Determine protocol

     

       111
       111
       +
       	scheme := "https://"

     

       112
       112
       +
       	if devMode {

     

       113
       113
       +
       		scheme = "http://"

     

       114
       114
       +
       	}

     

       115
       115
       +
       

     

       116
       116
       +
       	// Get host from knot

     

       117
       117
       +
       	host := tr.Repo.Knot

     

       118
       118
       +
       

     

       119
       119
       +
       	// In dev mode, replace localhost with host.docker.internal for Docker networking

     

       120
       120
       +
       	if devMode && strings.Contains(host, "localhost") {

     

       121
       121
       +
       		host = strings.ReplaceAll(host, "localhost", "host.docker.internal")

     

       122
       122
       +
       	}

     

       123
       123
       +
       

     

       124
       124
       +
       	// Build URL: {scheme}{knot}/{did}/{repo}

     

       125
       125
       +
       	return fmt.Sprintf("%s%s/%s/%s", scheme, host, tr.Repo.Did, tr.Repo.Repo)

     

       126
       126
       +
       }

     

       127
       127
       +
       

     

       128
       128
       +
       // buildFetchArgs constructs the arguments for git fetch based on clone options

     

       129
       129
       +
       func buildFetchArgs(clone tangled.Pipeline_CloneOpts, sha string) []string {

     

       130
       130
       +
       	args := []string{}

     

       131
       131
       +
       

     

       132
       132
       +
       	// Set fetch depth (default to 1 for shallow clone)

     

       133
       133
       +
       	depth := clone.Depth

     

       134
       134
       +
       	if depth == 0 {

     

       135
       135
       +
       		depth = 1

     

       136
       136
       +
       	}

     

       137
       137
       +
       	args = append(args, fmt.Sprintf("--depth=%d", depth))

     

       138
       138
       +
       

     

       139
       139
       +
       	// Add submodules if requested

     

       140
       140
       +
       	if clone.Submodules {

     

       141
       141
       +
       		args = append(args, "--recurse-submodules=yes")

     

       142
       142
       +
       	}

     

       143
       143
       +
       

     

       144
       144
       +
       	// Add remote and SHA

     

       145
       145
       +
       	args = append(args, "origin")

     

       146
       146
       +
       	if sha != "" {

     

       147
       147
       +
       		args = append(args, sha)

     

       148
       148
       +
       	}

     

       149
       149
       +
       

     

       150
       150
       +
       	return args

     

       151
       151
       +
       }

+371

spindle/models/clone_test.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"strings"

     

       5
       5
       +
       	"testing"

     

       6
       6
       +
       

     

       7
       7
       +
       	"tangled.org/core/api/tangled"

     

       8
       8
       +
       	"tangled.org/core/workflow"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       func TestBuildCloneStep_PushTrigger(t *testing.T) {

     

       12
       12
       +
       	twf := tangled.Pipeline_Workflow{

     

       13
       13
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       14
       14
       +
       			Depth:      1,

     

       15
       15
       +
       			Submodules: false,

     

       16
       16
       +
       			Skip:       false,

     

       17
       17
       +
       		},

     

       18
       18
       +
       	}

     

       19
       19
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       20
       20
       +
       		Kind: string(workflow.TriggerKindPush),

     

       21
       21
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       22
       22
       +
       			NewSha: "abc123",

     

       23
       23
       +
       			OldSha: "def456",

     

       24
       24
       +
       			Ref:    "refs/heads/main",

     

       25
       25
       +
       		},

     

       26
       26
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       27
       27
       +
       			Knot: "example.com",

     

       28
       28
       +
       			Did:  "did:plc:user123",

     

       29
       29
       +
       			Repo: "my-repo",

     

       30
       30
       +
       		},

     

       31
       31
       +
       	}

     

       32
       32
       +
       

     

       33
       33
       +
       	step := BuildCloneStep(twf, tr, false)

     

       34
       34
       +
       

     

       35
       35
       +
       	if step.Kind() != StepKindSystem {

     

       36
       36
       +
       		t.Errorf("Expected StepKindSystem, got %v", step.Kind())

     

       37
       37
       +
       	}

     

       38
       38
       +
       

     

       39
       39
       +
       	if step.Name() != "Clone repository into workspace" {

     

       40
       40
       +
       		t.Errorf("Expected 'Clone repository into workspace', got '%s'", step.Name())

     

       41
       41
       +
       	}

     

       42
       42
       +
       

     

       43
       43
       +
       	commands := step.Commands()

     

       44
       44
       +
       	if len(commands) != 4 {

     

       45
       45
       +
       		t.Errorf("Expected 4 commands, got %d", len(commands))

     

       46
       46
       +
       	}

     

       47
       47
       +
       

     

       48
       48
       +
       	// Verify commands contain expected git operations

     

       49
       49
       +
       	allCmds := strings.Join(commands, " ")

     

       50
       50
       +
       	if !strings.Contains(allCmds, "git init") {

     

       51
       51
       +
       		t.Error("Commands should contain 'git init'")

     

       52
       52
       +
       	}

     

       53
       53
       +
       	if !strings.Contains(allCmds, "git remote add origin") {

     

       54
       54
       +
       		t.Error("Commands should contain 'git remote add origin'")

     

       55
       55
       +
       	}

     

       56
       56
       +
       	if !strings.Contains(allCmds, "git fetch") {

     

       57
       57
       +
       		t.Error("Commands should contain 'git fetch'")

     

       58
       58
       +
       	}

     

       59
       59
       +
       	if !strings.Contains(allCmds, "abc123") {

     

       60
       60
       +
       		t.Error("Commands should contain commit SHA")

     

       61
       61
       +
       	}

     

       62
       62
       +
       	if !strings.Contains(allCmds, "git checkout FETCH_HEAD") {

     

       63
       63
       +
       		t.Error("Commands should contain 'git checkout FETCH_HEAD'")

     

       64
       64
       +
       	}

     

       65
       65
       +
       	if !strings.Contains(allCmds, "https://example.com/did:plc:user123/my-repo") {

     

       66
       66
       +
       		t.Error("Commands should contain expected repo URL")

     

       67
       67
       +
       	}

     

       68
       68
       +
       }

     

       69
       69
       +
       

     

       70
       70
       +
       func TestBuildCloneStep_PullRequestTrigger(t *testing.T) {

     

       71
       71
       +
       	twf := tangled.Pipeline_Workflow{

     

       72
       72
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       73
       73
       +
       			Depth: 1,

     

       74
       74
       +
       			Skip:  false,

     

       75
       75
       +
       		},

     

       76
       76
       +
       	}

     

       77
       77
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       78
       78
       +
       		Kind: string(workflow.TriggerKindPullRequest),

     

       79
       79
       +
       		PullRequest: &tangled.Pipeline_PullRequestTriggerData{

     

       80
       80
       +
       			SourceSha:    "pr-sha-789",

     

       81
       81
       +
       			SourceBranch: "feature-branch",

     

       82
       82
       +
       			TargetBranch: "main",

     

       83
       83
       +
       			Action:       "opened",

     

       84
       84
       +
       		},

     

       85
       85
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       86
       86
       +
       			Knot: "example.com",

     

       87
       87
       +
       			Did:  "did:plc:user123",

     

       88
       88
       +
       			Repo: "my-repo",

     

       89
       89
       +
       		},

     

       90
       90
       +
       	}

     

       91
       91
       +
       

     

       92
       92
       +
       	step := BuildCloneStep(twf, tr, false)

     

       93
       93
       +
       

     

       94
       94
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       95
       95
       +
       	if !strings.Contains(allCmds, "pr-sha-789") {

     

       96
       96
       +
       		t.Error("Commands should contain PR commit SHA")

     

       97
       97
       +
       	}

     

       98
       98
       +
       }

     

       99
       99
       +
       

     

       100
       100
       +
       func TestBuildCloneStep_ManualTrigger(t *testing.T) {

     

       101
       101
       +
       	twf := tangled.Pipeline_Workflow{

     

       102
       102
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       103
       103
       +
       			Depth: 1,

     

       104
       104
       +
       			Skip:  false,

     

       105
       105
       +
       		},

     

       106
       106
       +
       	}

     

       107
       107
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       108
       108
       +
       		Kind: string(workflow.TriggerKindManual),

     

       109
       109
       +
       		Manual: &tangled.Pipeline_ManualTriggerData{

     

       110
       110
       +
       			Inputs: nil,

     

       111
       111
       +
       		},

     

       112
       112
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       113
       113
       +
       			Knot: "example.com",

     

       114
       114
       +
       			Did:  "did:plc:user123",

     

       115
       115
       +
       			Repo: "my-repo",

     

       116
       116
       +
       		},

     

       117
       117
       +
       	}

     

       118
       118
       +
       

     

       119
       119
       +
       	step := BuildCloneStep(twf, tr, false)

     

       120
       120
       +
       

     

       121
       121
       +
       	// Manual triggers don't have a SHA yet (TODO), so git fetch won't include a SHA

     

       122
       122
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       123
       123
       +
       	// Should still have basic git commands

     

       124
       124
       +
       	if !strings.Contains(allCmds, "git init") {

     

       125
       125
       +
       		t.Error("Commands should contain 'git init'")

     

       126
       126
       +
       	}

     

       127
       127
       +
       	if !strings.Contains(allCmds, "git fetch") {

     

       128
       128
       +
       		t.Error("Commands should contain 'git fetch'")

     

       129
       129
       +
       	}

     

       130
       130
       +
       }

     

       131
       131
       +
       

     

       132
       132
       +
       func TestBuildCloneStep_SkipFlag(t *testing.T) {

     

       133
       133
       +
       	twf := tangled.Pipeline_Workflow{

     

       134
       134
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       135
       135
       +
       			Skip: true,

     

       136
       136
       +
       		},

     

       137
       137
       +
       	}

     

       138
       138
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       139
       139
       +
       		Kind: string(workflow.TriggerKindPush),

     

       140
       140
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       141
       141
       +
       			NewSha: "abc123",

     

       142
       142
       +
       		},

     

       143
       143
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       144
       144
       +
       			Knot: "example.com",

     

       145
       145
       +
       			Did:  "did:plc:user123",

     

       146
       146
       +
       			Repo: "my-repo",

     

       147
       147
       +
       		},

     

       148
       148
       +
       	}

     

       149
       149
       +
       

     

       150
       150
       +
       	step := BuildCloneStep(twf, tr, false)

     

       151
       151
       +
       

     

       152
       152
       +
       	// Empty step when skip is true

     

       153
       153
       +
       	if step.Name() != "" {

     

       154
       154
       +
       		t.Error("Expected empty step name when Skip is true")

     

       155
       155
       +
       	}

     

       156
       156
       +
       	if len(step.Commands()) != 0 {

     

       157
       157
       +
       		t.Errorf("Expected no commands when Skip is true, got %d commands", len(step.Commands()))

     

       158
       158
       +
       	}

     

       159
       159
       +
       }

     

       160
       160
       +
       

     

       161
       161
       +
       func TestBuildCloneStep_DevMode(t *testing.T) {

     

       162
       162
       +
       	twf := tangled.Pipeline_Workflow{

     

       163
       163
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       164
       164
       +
       			Depth: 1,

     

       165
       165
       +
       			Skip:  false,

     

       166
       166
       +
       		},

     

       167
       167
       +
       	}

     

       168
       168
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       169
       169
       +
       		Kind: string(workflow.TriggerKindPush),

     

       170
       170
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       171
       171
       +
       			NewSha: "abc123",

     

       172
       172
       +
       		},

     

       173
       173
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       174
       174
       +
       			Knot: "localhost:3000",

     

       175
       175
       +
       			Did:  "did:plc:user123",

     

       176
       176
       +
       			Repo: "my-repo",

     

       177
       177
       +
       		},

     

       178
       178
       +
       	}

     

       179
       179
       +
       

     

       180
       180
       +
       	step := BuildCloneStep(twf, tr, true)

     

       181
       181
       +
       

     

       182
       182
       +
       	// In dev mode, should use http:// and replace localhost with host.docker.internal

     

       183
       183
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       184
       184
       +
       	expectedURL := "http://host.docker.internal:3000/did:plc:user123/my-repo"

     

       185
       185
       +
       	if !strings.Contains(allCmds, expectedURL) {

     

       186
       186
       +
       		t.Errorf("Expected dev mode URL '%s' in commands", expectedURL)

     

       187
       187
       +
       	}

     

       188
       188
       +
       }

     

       189
       189
       +
       

     

       190
       190
       +
       func TestBuildCloneStep_DepthAndSubmodules(t *testing.T) {

     

       191
       191
       +
       	twf := tangled.Pipeline_Workflow{

     

       192
       192
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       193
       193
       +
       			Depth:      10,

     

       194
       194
       +
       			Submodules: true,

     

       195
       195
       +
       			Skip:       false,

     

       196
       196
       +
       		},

     

       197
       197
       +
       	}

     

       198
       198
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       199
       199
       +
       		Kind: string(workflow.TriggerKindPush),

     

       200
       200
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       201
       201
       +
       			NewSha: "abc123",

     

       202
       202
       +
       		},

     

       203
       203
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       204
       204
       +
       			Knot: "example.com",

     

       205
       205
       +
       			Did:  "did:plc:user123",

     

       206
       206
       +
       			Repo: "my-repo",

     

       207
       207
       +
       		},

     

       208
       208
       +
       	}

     

       209
       209
       +
       

     

       210
       210
       +
       	step := BuildCloneStep(twf, tr, false)

     

       211
       211
       +
       

     

       212
       212
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       213
       213
       +
       	if !strings.Contains(allCmds, "--depth=10") {

     

       214
       214
       +
       		t.Error("Commands should contain '--depth=10'")

     

       215
       215
       +
       	}

     

       216
       216
       +
       

     

       217
       217
       +
       	if !strings.Contains(allCmds, "--recurse-submodules=yes") {

     

       218
       218
       +
       		t.Error("Commands should contain '--recurse-submodules=yes'")

     

       219
       219
       +
       	}

     

       220
       220
       +
       }

     

       221
       221
       +
       

     

       222
       222
       +
       func TestBuildCloneStep_DefaultDepth(t *testing.T) {

     

       223
       223
       +
       	twf := tangled.Pipeline_Workflow{

     

       224
       224
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       225
       225
       +
       			Depth: 0, // Default should be 1

     

       226
       226
       +
       			Skip:  false,

     

       227
       227
       +
       		},

     

       228
       228
       +
       	}

     

       229
       229
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       230
       230
       +
       		Kind: string(workflow.TriggerKindPush),

     

       231
       231
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       232
       232
       +
       			NewSha: "abc123",

     

       233
       233
       +
       		},

     

       234
       234
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       235
       235
       +
       			Knot: "example.com",

     

       236
       236
       +
       			Did:  "did:plc:user123",

     

       237
       237
       +
       			Repo: "my-repo",

     

       238
       238
       +
       		},

     

       239
       239
       +
       	}

     

       240
       240
       +
       

     

       241
       241
       +
       	step := BuildCloneStep(twf, tr, false)

     

       242
       242
       +
       

     

       243
       243
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       244
       244
       +
       	if !strings.Contains(allCmds, "--depth=1") {

     

       245
       245
       +
       		t.Error("Commands should default to '--depth=1'")

     

       246
       246
       +
       	}

     

       247
       247
       +
       }

     

       248
       248
       +
       

     

       249
       249
       +
       func TestBuildCloneStep_NilPushData(t *testing.T) {

     

       250
       250
       +
       	twf := tangled.Pipeline_Workflow{

     

       251
       251
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       252
       252
       +
       			Depth: 1,

     

       253
       253
       +
       			Skip:  false,

     

       254
       254
       +
       		},

     

       255
       255
       +
       	}

     

       256
       256
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       257
       257
       +
       		Kind: string(workflow.TriggerKindPush),

     

       258
       258
       +
       		Push: nil, // Nil push data should create error step

     

       259
       259
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       260
       260
       +
       			Knot: "example.com",

     

       261
       261
       +
       			Did:  "did:plc:user123",

     

       262
       262
       +
       			Repo: "my-repo",

     

       263
       263
       +
       		},

     

       264
       264
       +
       	}

     

       265
       265
       +
       

     

       266
       266
       +
       	step := BuildCloneStep(twf, tr, false)

     

       267
       267
       +
       

     

       268
       268
       +
       	// Should return an error step

     

       269
       269
       +
       	if !strings.Contains(step.Name(), "error") {

     

       270
       270
       +
       		t.Error("Expected error in step name when push data is nil")

     

       271
       271
       +
       	}

     

       272
       272
       +
       

     

       273
       273
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       274
       274
       +
       	if !strings.Contains(allCmds, "Failed to get clone info") {

     

       275
       275
       +
       		t.Error("Commands should contain error message")

     

       276
       276
       +
       	}

     

       277
       277
       +
       	if !strings.Contains(allCmds, "exit 1") {

     

       278
       278
       +
       		t.Error("Commands should exit with error")

     

       279
       279
       +
       	}

     

       280
       280
       +
       }

     

       281
       281
       +
       

     

       282
       282
       +
       func TestBuildCloneStep_NilPRData(t *testing.T) {

     

       283
       283
       +
       	twf := tangled.Pipeline_Workflow{

     

       284
       284
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       285
       285
       +
       			Depth: 1,

     

       286
       286
       +
       			Skip:  false,

     

       287
       287
       +
       		},

     

       288
       288
       +
       	}

     

       289
       289
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       290
       290
       +
       		Kind:        string(workflow.TriggerKindPullRequest),

     

       291
       291
       +
       		PullRequest: nil, // Nil PR data should create error step

     

       292
       292
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       293
       293
       +
       			Knot: "example.com",

     

       294
       294
       +
       			Did:  "did:plc:user123",

     

       295
       295
       +
       			Repo: "my-repo",

     

       296
       296
       +
       		},

     

       297
       297
       +
       	}

     

       298
       298
       +
       

     

       299
       299
       +
       	step := BuildCloneStep(twf, tr, false)

     

       300
       300
       +
       

     

       301
       301
       +
       	// Should return an error step

     

       302
       302
       +
       	if !strings.Contains(step.Name(), "error") {

     

       303
       303
       +
       		t.Error("Expected error in step name when pull request data is nil")

     

       304
       304
       +
       	}

     

       305
       305
       +
       

     

       306
       306
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       307
       307
       +
       	if !strings.Contains(allCmds, "Failed to get clone info") {

     

       308
       308
       +
       		t.Error("Commands should contain error message")

     

       309
       309
       +
       	}

     

       310
       310
       +
       }

     

       311
       311
       +
       

     

       312
       312
       +
       func TestBuildCloneStep_UnknownTriggerKind(t *testing.T) {

     

       313
       313
       +
       	twf := tangled.Pipeline_Workflow{

     

       314
       314
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       315
       315
       +
       			Depth: 1,

     

       316
       316
       +
       			Skip:  false,

     

       317
       317
       +
       		},

     

       318
       318
       +
       	}

     

       319
       319
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       320
       320
       +
       		Kind: "unknown_trigger",

     

       321
       321
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       322
       322
       +
       			Knot: "example.com",

     

       323
       323
       +
       			Did:  "did:plc:user123",

     

       324
       324
       +
       			Repo: "my-repo",

     

       325
       325
       +
       		},

     

       326
       326
       +
       	}

     

       327
       327
       +
       

     

       328
       328
       +
       	step := BuildCloneStep(twf, tr, false)

     

       329
       329
       +
       

     

       330
       330
       +
       	// Should return an error step

     

       331
       331
       +
       	if !strings.Contains(step.Name(), "error") {

     

       332
       332
       +
       		t.Error("Expected error in step name for unknown trigger kind")

     

       333
       333
       +
       	}

     

       334
       334
       +
       

     

       335
       335
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       336
       336
       +
       	if !strings.Contains(allCmds, "unknown trigger kind") {

     

       337
       337
       +
       		t.Error("Commands should contain error message about unknown trigger kind")

     

       338
       338
       +
       	}

     

       339
       339
       +
       }

     

       340
       340
       +
       

     

       341
       341
       +
       func TestBuildCloneStep_NilCloneOpts(t *testing.T) {

     

       342
       342
       +
       	twf := tangled.Pipeline_Workflow{

     

       343
       343
       +
       		Clone: nil, // Nil clone options should use defaults

     

       344
       344
       +
       	}

     

       345
       345
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       346
       346
       +
       		Kind: string(workflow.TriggerKindPush),

     

       347
       347
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       348
       348
       +
       			NewSha: "abc123",

     

       349
       349
       +
       		},

     

       350
       350
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       351
       351
       +
       			Knot: "example.com",

     

       352
       352
       +
       			Did:  "did:plc:user123",

     

       353
       353
       +
       			Repo: "my-repo",

     

       354
       354
       +
       		},

     

       355
       355
       +
       	}

     

       356
       356
       +
       

     

       357
       357
       +
       	step := BuildCloneStep(twf, tr, false)

     

       358
       358
       +
       

     

       359
       359
       +
       	// Should still work with default options

     

       360
       360
       +
       	if step.Kind() != StepKindSystem {

     

       361
       361
       +
       		t.Errorf("Expected StepKindSystem, got %v", step.Kind())

     

       362
       362
       +
       	}

     

       363
       363
       +
       

     

       364
       364
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       365
       365
       +
       	if !strings.Contains(allCmds, "--depth=1") {

     

       366
       366
       +
       		t.Error("Commands should default to '--depth=1' when Clone is nil")

     

       367
       367
       +
       	}

     

       368
       368
       +
       	if !strings.Contains(allCmds, "git init") {

     

       369
       369
       +
       		t.Error("Commands should contain 'git init'")

     

       370
       370
       +
       	}

     

       371
       371
       +
       }

+15 -7

spindle/secrets/openbao.go

···

       13
       13
        
       )

     

       14
       14
        
       

     

       15
       15
        
       type OpenBaoManager struct {

     

       16
       16
       -
       	client    *vault.Client

     

       17
       17
       -
       	mountPath string

     

       18
       18
       -
       	logger    *slog.Logger

     

       16
       16
       +
       	client            *vault.Client

     

       17
       17
       +
       	mountPath         string

     

       18
       18
       +
       	logger            *slog.Logger

     

       19
       19
       +
       	connectionTimeout time.Duration

     

       19
       20
        
       }

     

       20
       21
        
       

     

       21
       22
        
       type OpenBaoManagerOpt func(*OpenBaoManager)

     
···

       26
       27
        
       	}

     

       27
       28
        
       }

     

       28
       29
        
       

     

       30
       30
       +
       func WithConnectionTimeout(timeout time.Duration) OpenBaoManagerOpt {

     

       31
       31
       +
       	return func(v *OpenBaoManager) {

     

       32
       32
       +
       		v.connectionTimeout = timeout

     

       33
       33
       +
       	}

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       29
       36
        
       // NewOpenBaoManager creates a new OpenBao manager that connects to a Bao Proxy

     

       30
       37
        
       // The proxyAddress should point to the local Bao Proxy (e.g., "http://127.0.0.1:8200")

     

       31
       38
        
       // The proxy handles all authentication automatically via Auto-Auth

     
···

       43
       50
        
       	}

     

       44
       51
        
       

     

       45
       52
        
       	manager := &OpenBaoManager{

     

       46
       46
       -
       		client:    client,

     

       47
       47
       -
       		mountPath: "spindle", // default KV v2 mount path

     

       48
       48
       -
       		logger:    logger,

     

       53
       53
       +
       		client:            client,

     

       54
       54
       +
       		mountPath:         "spindle", // default KV v2 mount path

     

       55
       55
       +
       		logger:            logger,

     

       56
       56
       +
       		connectionTimeout: 10 * time.Second, // default connection timeout

     

       49
       57
        
       	}

     

       50
       58
        
       

     

       51
       59
        
       	for _, opt := range opts {

     
···

       62
       70
        
       

     

       63
       71
        
       // testConnection verifies that we can connect to the proxy

     

       64
       72
        
       func (v *OpenBaoManager) testConnection() error {

     

       65
       65
       -
       	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)

     

       73
       73
       +
       	ctx, cancel := context.WithTimeout(context.Background(), v.connectionTimeout)

     

       66
       74
        
       	defer cancel()

     

       67
       75
        
       

     

       68
       76
        
       	// try token self-lookup as a quick way to verify proxy works

+5 -2

spindle/secrets/openbao_test.go

···

       152
       152
        
       	for _, tt := range tests {

     

       153
       153
        
       		t.Run(tt.name, func(t *testing.T) {

     

       154
       154
        
       			logger := slog.New(slog.NewTextHandler(os.Stderr, nil))

     

       155
       155
       -
       			manager, err := NewOpenBaoManager(tt.proxyAddr, logger, tt.opts...)

     

       155
       155
       +
       			// Use shorter timeout for tests to avoid long waits

     

       156
       156
       +
       			opts := append(tt.opts, WithConnectionTimeout(1*time.Second))

     

       157
       157
       +
       			manager, err := NewOpenBaoManager(tt.proxyAddr, logger, opts...)

     

       156
       158
        
       

     

       157
       159
        
       			if tt.expectError {

     

       158
       160
        
       				assert.Error(t, err)

     
···

       596
       598
        
       

     

       597
       599
        
       			// All these will fail because no real proxy is running

     

       598
       600
        
       			// but we can test that the configuration is properly accepted

     

       599
       599
       -
       			manager, err := NewOpenBaoManager(tt.proxyAddr, logger)

     

       601
       601
       +
       			// Use shorter timeout for tests to avoid long waits

     

       602
       602
       +
       			manager, err := NewOpenBaoManager(tt.proxyAddr, logger, WithConnectionTimeout(1*time.Second))

     

       600
       603
        
       			assert.Error(t, err) // Expected because no real proxy

     

       601
       604
        
       			assert.Nil(t, manager)

     

       602
       605
        
       			assert.Contains(t, err.Error(), "failed to connect to bao proxy")

+22 -1

types/repo.go

···

       1
       1
        
       package types

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"encoding/json"

     

       5
       5
       +
       

     

       4
       6
        
       	"github.com/bluekeyes/go-gitdiff/gitdiff"

     

       5
       7
        
       	"github.com/go-git/go-git/v5/plumbing/object"

     

       6
       8
        
       )

     
···

       66
       68
        
       type Branch struct {

     

       67
       69
        
       	Reference `json:"reference"`

     

       68
       70
        
       	Commit    *object.Commit `json:"commit,omitempty"`

     

       69
       69
       -
       	IsDefault bool           `json:"is_deafult,omitempty"`

     

       71
       71
       +
       	IsDefault bool           `json:"is_default,omitempty"`

     

       72
       72
       +
       }

     

       73
       73
       +
       

     

       74
       74
       +
       func (b *Branch) UnmarshalJSON(data []byte) error {

     

       75
       75
       +
       	aux := &struct {

     

       76
       76
       +
       		Reference          `json:"reference"`

     

       77
       77
       +
       		Commit             *object.Commit `json:"commit,omitempty"`

     

       78
       78
       +
       		IsDefault          bool           `json:"is_default,omitempty"`

     

       79
       79
       +
       		MispelledIsDefault bool           `json:"is_deafult,omitempty"` // mispelled name

     

       80
       80
       +
       	}{}

     

       81
       81
       +
       

     

       82
       82
       +
       	if err := json.Unmarshal(data, aux); err != nil {

     

       83
       83
       +
       		return err

     

       84
       84
       +
       	}

     

       85
       85
       +
       

     

       86
       86
       +
       	b.Reference = aux.Reference

     

       87
       87
       +
       	b.Commit = aux.Commit

     

       88
       88
       +
       	b.IsDefault = aux.IsDefault || aux.MispelledIsDefault // whichever was set

     

       89
       89
       +
       

     

       90
       90
       +
       	return nil

     

       70
       91
        
       }

     

       71
       92
        
       

     

       72
       93
        
       type RepoTagsResponse struct {

+88 -5

types/tree.go

···

       1
       1
        
       package types

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"os"

     

       4
       6
        
       	"time"

     

       5
       7
        
       

     

       6
       8
        
       	"github.com/go-git/go-git/v5/plumbing"

     

       9
       9
       +
       	"github.com/go-git/go-git/v5/plumbing/filemode"

     

       7
       10
        
       )

     

       8
       11
        
       

     

       9
       12
        
       // A nicer git tree representation.

     

       10
       13
        
       type NiceTree struct {

     

       11
       14
        
       	// Relative path

     

       12
       12
       -
       	Name      string `json:"name"`

     

       13
       13
       -
       	Mode      string `json:"mode"`

     

       14
       14
       -
       	Size      int64  `json:"size"`

     

       15
       15
       -
       	IsFile    bool   `json:"is_file"`

     

       16
       16
       -
       	IsSubtree bool   `json:"is_subtree"`

     

       15
       15
       +
       	Name string `json:"name"`

     

       16
       16
       +
       	Mode string `json:"mode"`

     

       17
       17
       +
       	Size int64  `json:"size"`

     

       17
       18
        
       

     

       18
       19
        
       	LastCommit *LastCommitInfo `json:"last_commit,omitempty"`

     

       20
       20
       +
       }

     

       21
       21
       +
       

     

       22
       22
       +
       func (t *NiceTree) FileMode() (filemode.FileMode, error) {

     

       23
       23
       +
       	if numericMode, err := filemode.New(t.Mode); err == nil {

     

       24
       24
       +
       		return numericMode, nil

     

       25
       25
       +
       	}

     

       26
       26
       +
       

     

       27
       27
       +
       	// TODO: this is here for backwards compat, can be removed in future versions

     

       28
       28
       +
       	osMode, err := parseModeString(t.Mode)

     

       29
       29
       +
       	if err != nil {

     

       30
       30
       +
       		return filemode.Empty, nil

     

       31
       31
       +
       	}

     

       32
       32
       +
       

     

       33
       33
       +
       	conv, err := filemode.NewFromOSFileMode(osMode)

     

       34
       34
       +
       	if err != nil {

     

       35
       35
       +
       		return filemode.Empty, nil

     

       36
       36
       +
       	}

     

       37
       37
       +
       

     

       38
       38
       +
       	return conv, nil

     

       39
       39
       +
       }

     

       40
       40
       +
       

     

       41
       41
       +
       // ParseFileModeString parses a file mode string like "-rw-r--r--"

     

       42
       42
       +
       // and returns an os.FileMode

     

       43
       43
       +
       func parseModeString(modeStr string) (os.FileMode, error) {

     

       44
       44
       +
       	if len(modeStr) != 10 {

     

       45
       45
       +
       		return 0, fmt.Errorf("invalid mode string length: expected 10, got %d", len(modeStr))

     

       46
       46
       +
       	}

     

       47
       47
       +
       

     

       48
       48
       +
       	var mode os.FileMode

     

       49
       49
       +
       

     

       50
       50
       +
       	// Parse file type (first character)

     

       51
       51
       +
       	switch modeStr[0] {

     

       52
       52
       +
       	case 'd':

     

       53
       53
       +
       		mode |= os.ModeDir

     

       54
       54
       +
       	case 'l':

     

       55
       55
       +
       		mode |= os.ModeSymlink

     

       56
       56
       +
       	case '-':

     

       57
       57
       +
       		// regular file

     

       58
       58
       +
       	default:

     

       59
       59
       +
       		return 0, fmt.Errorf("unknown file type: %c", modeStr[0])

     

       60
       60
       +
       	}

     

       61
       61
       +
       

     

       62
       62
       +
       	// parse permissions for owner, group, and other

     

       63
       63
       +
       	perms := modeStr[1:]

     

       64
       64
       +
       	shifts := []int{6, 3, 0} // bit shifts for owner, group, other

     

       65
       65
       +
       

     

       66
       66
       +
       	for i := range 3 {

     

       67
       67
       +
       		offset := i * 3

     

       68
       68
       +
       		shift := shifts[i]

     

       69
       69
       +
       

     

       70
       70
       +
       		if perms[offset] == 'r' {

     

       71
       71
       +
       			mode |= os.FileMode(4 << shift)

     

       72
       72
       +
       		}

     

       73
       73
       +
       		if perms[offset+1] == 'w' {

     

       74
       74
       +
       			mode |= os.FileMode(2 << shift)

     

       75
       75
       +
       		}

     

       76
       76
       +
       		if perms[offset+2] == 'x' {

     

       77
       77
       +
       			mode |= os.FileMode(1 << shift)

     

       78
       78
       +
       		}

     

       79
       79
       +
       	}

     

       80
       80
       +
       

     

       81
       81
       +
       	return mode, nil

     

       82
       82
       +
       }

     

       83
       83
       +
       

     

       84
       84
       +
       func (t *NiceTree) IsFile() bool {

     

       85
       85
       +
       	m, err := t.FileMode()

     

       86
       86
       +
       

     

       87
       87
       +
       	if err != nil {

     

       88
       88
       +
       		return false

     

       89
       89
       +
       	}

     

       90
       90
       +
       

     

       91
       91
       +
       	return m.IsFile()

     

       92
       92
       +
       }

     

       93
       93
       +
       

     

       94
       94
       +
       func (t *NiceTree) IsSubmodule() bool {

     

       95
       95
       +
       	m, err := t.FileMode()

     

       96
       96
       +
       

     

       97
       97
       +
       	if err != nil {

     

       98
       98
       +
       		return false

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	return m == filemode.Submodule

     

       19
       102
        
       }

     

       20
       103
        
       

     

       21
       104
        
       type LastCommitInfo struct {

Compare changes