Merge branch 'cursor/repo-pagina-65da' into 'master'
Projectpagina met Overzicht en Bestanden See merge request Timfa/bluegit!3
@@ -10,6 +10,7 @@ import (
10
10
"os"
11
11
"os/exec"
12
12
"path/filepath"
13
"strconv"
13
14
"strings"
14
15
15
16
"gitlab.com/Timfa/bluegit/internal/access"
@@ -102,6 +103,7 @@ type Commit struct {
102
103
Short string
103
104
Author string
104
105
Date string
106
Unix int64
105
107
Subject string
106
108
Body string
107
109
}
@@ -119,7 +121,7 @@ func Log(ctx context.Context, gitBin, dir, rev string, limit int) ([]Commit, err
119
121
if rev == "" {
120
122
rev = "HEAD"
121
123
}
122
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%H%x1f%an%x1f%ad%x1f%s%x1f%b%x1e", "--date=short", fmt.Sprintf("-n%d", limit), rev)
124
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%H%x1f%an%x1f%ad%x1f%at%x1f%s%x1f%b%x1e", "--date=short", fmt.Sprintf("-n%d", limit), rev)
123
125
if err != nil {
124
126
if strings.Contains(err.Error(), "does not have any commits") || strings.Contains(err.Error(), "bad default revision") || strings.Contains(err.Error(), "ambiguous argument") {
125
127
return nil, nil
@@ -137,15 +139,16 @@ func parseLog(out string) []Commit {
137
139
continue
138
140
}
139
141
parts := strings.Split(rec, "\x1f")
140
if len(parts) < 4 {
142
if len(parts) < 5 {
141
143
continue
142
144
}
143
c := Commit{SHA: parts[0], Author: parts[1], Date: parts[2], Subject: parts[3]}
145
c := Commit{SHA: parts[0], Author: parts[1], Date: parts[2], Subject: parts[4]}
146
c.Unix, _ = strconv.ParseInt(parts[3], 10, 64)
144
147
if len(c.SHA) >= 10 {
145
148
c.Short = c.SHA[:10]
146
149
}
147
if len(parts) > 4 {
148
c.Body = strings.TrimSpace(parts[4])
150
if len(parts) > 5 {
151
c.Body = strings.TrimSpace(parts[5])
149
152
}
150
153
commits = append(commits, c)
151
154
}
@@ -249,6 +252,180 @@ func Refs(ctx context.Context, gitBin, dir string) (map[string]string, error) {
249
252
return m, nil
250
253
}
251
254
255
// Touch geeft per pad de nieuwste commit uit de recente geschiedenis.
256
// Mappen erven de nieuwste commit van een bestand erin.
257
func Touch(ctx context.Context, gitBin, dir, rev string) (map[string]Commit, error) {
258
if rev == "" {
259
rev = "HEAD"
260
}
261
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%H%x1f%an%x1f%at%x1f%s", "--name-only", "-n", "400", rev)
262
if err != nil {
263
if emptyHistory(err) {
264
return map[string]Commit{}, nil
265
}
266
return nil, err
267
}
268
m := map[string]Commit{}
269
var cur Commit
270
have := false
271
for _, line := range strings.Split(out, "\n") {
272
if strings.Contains(line, "\x1f") {
273
parts := strings.Split(line, "\x1f")
274
if len(parts) < 4 {
275
continue
276
}
277
cur = Commit{SHA: parts[0], Author: parts[1], Subject: parts[3]}
278
cur.Unix, _ = strconv.ParseInt(parts[2], 10, 64)
279
if len(cur.SHA) >= 10 {
280
cur.Short = cur.SHA[:10]
281
}
282
have = true
283
continue
284
}
285
line = strings.TrimSpace(line)
286
if line == "" || !have {
287
continue
288
}
289
notePath(m, line, cur)
290
}
291
return m, nil
292
}
293
294
func notePath(m map[string]Commit, path string, c Commit) {
295
for path != "" && path != "." {
296
if _, ok := m[path]; !ok {
297
m[path] = c
298
}
299
i := strings.LastIndex(path, "/")
300
if i < 0 {
301
return
302
}
303
path = path[:i]
304
}
305
}
306
307
func emptyHistory(err error) bool {
308
msg := err.Error()
309
return strings.Contains(msg, "does not have any commits") || strings.Contains(msg, "bad default revision") || strings.Contains(msg, "ambiguous argument")
310
}
311
312
// Stats telt commits op rev, lokale branches en tags.
313
func Stats(ctx context.Context, gitBin, dir, rev string) (commits, branches, tags int, err error) {
314
if rev == "" {
315
rev = "HEAD"
316
}
317
out, err := run(ctx, gitBin, nil, "-C", dir, "rev-list", "--count", rev)
318
if err != nil {
319
if emptyHistory(err) {
320
return 0, 0, 0, nil
321
}
322
return 0, 0, 0, err
323
}
324
commits, _ = strconv.Atoi(strings.TrimSpace(out))
325
names, err := Branches(ctx, gitBin, dir)
326
if err != nil {
327
return commits, 0, 0, err
328
}
329
branches = len(names)
330
out, err = run(ctx, gitBin, nil, "-C", dir, "for-each-ref", "--format=%(refname:short)", "refs/tags")
331
if err != nil {
332
return commits, branches, 0, err
333
}
334
for _, line := range strings.Split(strings.TrimSpace(out), "\n") {
335
if line != "" {
336
tags++
337
}
338
}
339
return commits, branches, tags, nil
340
}
341
342
// Tags geeft tagnamen.
343
func Tags(ctx context.Context, gitBin, dir string) ([]string, error) {
344
out, err := run(ctx, gitBin, nil, "-C", dir, "for-each-ref", "--format=%(refname:short)", "refs/tags")
345
if err != nil {
346
return nil, err
347
}
348
var names []string
349
for _, line := range strings.Split(strings.TrimSpace(out), "\n") {
350
if line != "" {
351
names = append(names, line)
352
}
353
}
354
return names, nil
355
}
356
357
// TreeAll leest de hele boom. Name is het pad vanaf de root.
358
func TreeAll(ctx context.Context, gitBin, dir, rev string) ([]Entry, error) {
359
if rev == "" {
360
rev = "HEAD"
361
}
362
out, err := run(ctx, gitBin, nil, "-C", dir, "ls-tree", "-r", "-t", rev)
363
if err != nil {
364
if emptyHistory(err) {
365
return nil, nil
366
}
367
return nil, err
368
}
369
return parseTree(out), nil
370
}
371
372
func parseTree(out string) []Entry {
373
var entries []Entry
374
for _, line := range strings.Split(strings.TrimSpace(out), "\n") {
375
if line == "" {
376
continue
377
}
378
tab := strings.SplitN(line, "\t", 2)
379
if len(tab) != 2 {
380
continue
381
}
382
head := strings.Fields(tab[0])
383
if len(head) != 3 {
384
continue
385
}
386
entries = append(entries, Entry{Mode: head[0], Type: head[1], SHA: head[2], Name: tab[1]})
387
}
388
return entries
389
}
390
391
// LastCommit is de nieuwste commit die path heeft geraakt. Leeg pad is de tip.
392
func LastCommit(ctx context.Context, gitBin, dir, rev, path string) (Commit, error) {
393
if rev == "" {
394
rev = "HEAD"
395
}
396
args := []string{"-C", dir, "log", "-1", "--format=%H%x1f%an%x1f%at%x1f%s", rev}
397
if path != "" {
398
args = append(args, "--", path)
399
}
400
out, err := run(ctx, gitBin, nil, args...)
401
if err != nil {
402
if emptyHistory(err) {
403
return Commit{}, nil
404
}
405
return Commit{}, err
406
}
407
line := strings.TrimSpace(out)
408
parts := strings.Split(line, "\x1f")
409
if len(parts) < 4 {
410
return Commit{}, nil
411
}
412
c := Commit{SHA: parts[0], Author: parts[1], Subject: parts[3]}
413
c.Unix, _ = strconv.ParseInt(parts[2], 10, 64)
414
if len(c.SHA) >= 10 {
415
c.Short = c.SHA[:10]
416
}
417
return c, nil
418
}
419
420
// BlobSize is de grootte in bytes.
421
func BlobSize(ctx context.Context, gitBin, dir, rev, rel string) (int64, error) {
422
out, err := run(ctx, gitBin, nil, "-C", dir, "cat-file", "-s", rev+":"+rel)
423
if err != nil {
424
return 0, err
425
}
426
return strconv.ParseInt(strings.TrimSpace(out), 10, 64)
427
}
428
252
429
// BranchOfRef haalt de branch uit refs/heads/… .
253
430
func BranchOfRef(ref string) (string, bool) {
254
431
const p = "refs/heads/"
@@ -10,6 +10,7 @@ import (10
"os"10
"os"11
"os/exec"11
"os/exec"12
"path/filepath"12
"path/filepath"13
"strconv"13
"strings"14
"strings"14
15
15
"gitlab.com/Timfa/bluegit/internal/access"16
"gitlab.com/Timfa/bluegit/internal/access"@@ -102,6 +103,7 @@ type Commit struct {102
Short string103
Short string103
Author string104
Author string104
Date string105
Date string106
Unix int64105
Subject string107
Subject string106
Body string108
Body string107
}109
}@@ -119,7 +121,7 @@ func Log(ctx context.Context, gitBin, dir, rev string, limit int) ([]Commit, err119
if rev == "" {121
if rev == "" {120
rev = "HEAD"122
rev = "HEAD"121
}123
}122
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%H%x1f%an%x1f%ad%x1f%s%x1f%b%x1e", "--date=short", fmt.Sprintf("-n%d", limit), rev)124
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%H%x1f%an%x1f%ad%x1f%at%x1f%s%x1f%b%x1e", "--date=short", fmt.Sprintf("-n%d", limit), rev)123
if err != nil {125
if err != nil {124
if strings.Contains(err.Error(), "does not have any commits") || strings.Contains(err.Error(), "bad default revision") || strings.Contains(err.Error(), "ambiguous argument") {126
if strings.Contains(err.Error(), "does not have any commits") || strings.Contains(err.Error(), "bad default revision") || strings.Contains(err.Error(), "ambiguous argument") {125
return nil, nil127
return nil, nil@@ -137,15 +139,16 @@ func parseLog(out string) []Commit {137
continue139
continue138
}140
}139
parts := strings.Split(rec, "\x1f")141
parts := strings.Split(rec, "\x1f")140
if len(parts) < 4 {142
if len(parts) < 5 {141
continue143
continue142
}144
}143
c := Commit{SHA: parts[0], Author: parts[1], Date: parts[2], Subject: parts[3]}145
c := Commit{SHA: parts[0], Author: parts[1], Date: parts[2], Subject: parts[4]}146
c.Unix, _ = strconv.ParseInt(parts[3], 10, 64)144
if len(c.SHA) >= 10 {147
if len(c.SHA) >= 10 {145
c.Short = c.SHA[:10]148
c.Short = c.SHA[:10]146
}149
}147
if len(parts) > 4 {150
if len(parts) > 5 {148
c.Body = strings.TrimSpace(parts[4])151
c.Body = strings.TrimSpace(parts[5])149
}152
}150
commits = append(commits, c)153
commits = append(commits, c)151
}154
}@@ -249,6 +252,180 @@ func Refs(ctx context.Context, gitBin, dir string) (map[string]string, error) {249
return m, nil252
return m, nil250
}253
}251
254
255
// Touch geeft per pad de nieuwste commit uit de recente geschiedenis.256
// Mappen erven de nieuwste commit van een bestand erin.257
func Touch(ctx context.Context, gitBin, dir, rev string) (map[string]Commit, error) {258
if rev == "" {259
rev = "HEAD"260
}261
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%H%x1f%an%x1f%at%x1f%s", "--name-only", "-n", "400", rev)262
if err != nil {263
if emptyHistory(err) {264
return map[string]Commit{}, nil265
}266
return nil, err267
}268
m := map[string]Commit{}269
var cur Commit270
have := false271
for _, line := range strings.Split(out, "\n") {272
if strings.Contains(line, "\x1f") {273
parts := strings.Split(line, "\x1f")274
if len(parts) < 4 {275
continue276
}277
cur = Commit{SHA: parts[0], Author: parts[1], Subject: parts[3]}278
cur.Unix, _ = strconv.ParseInt(parts[2], 10, 64)279
if len(cur.SHA) >= 10 {280
cur.Short = cur.SHA[:10]281
}282
have = true283
continue284
}285
line = strings.TrimSpace(line)286
if line == "" || !have {287
continue288
}289
notePath(m, line, cur)290
}291
return m, nil292
}293
294
func notePath(m map[string]Commit, path string, c Commit) {295
for path != "" && path != "." {296
if _, ok := m[path]; !ok {297
m[path] = c298
}299
i := strings.LastIndex(path, "/")300
if i < 0 {301
return302
}303
path = path[:i]304
}305
}306
307
func emptyHistory(err error) bool {308
msg := err.Error()309
return strings.Contains(msg, "does not have any commits") || strings.Contains(msg, "bad default revision") || strings.Contains(msg, "ambiguous argument")310
}311
312
// Stats telt commits op rev, lokale branches en tags.313
func Stats(ctx context.Context, gitBin, dir, rev string) (commits, branches, tags int, err error) {314
if rev == "" {315
rev = "HEAD"316
}317
out, err := run(ctx, gitBin, nil, "-C", dir, "rev-list", "--count", rev)318
if err != nil {319
if emptyHistory(err) {320
return 0, 0, 0, nil321
}322
return 0, 0, 0, err323
}324
commits, _ = strconv.Atoi(strings.TrimSpace(out))325
names, err := Branches(ctx, gitBin, dir)326
if err != nil {327
return commits, 0, 0, err328
}329
branches = len(names)330
out, err = run(ctx, gitBin, nil, "-C", dir, "for-each-ref", "--format=%(refname:short)", "refs/tags")331
if err != nil {332
return commits, branches, 0, err333
}334
for _, line := range strings.Split(strings.TrimSpace(out), "\n") {335
if line != "" {336
tags++337
}338
}339
return commits, branches, tags, nil340
}341
342
// Tags geeft tagnamen.343
func Tags(ctx context.Context, gitBin, dir string) ([]string, error) {344
out, err := run(ctx, gitBin, nil, "-C", dir, "for-each-ref", "--format=%(refname:short)", "refs/tags")345
if err != nil {346
return nil, err347
}348
var names []string349
for _, line := range strings.Split(strings.TrimSpace(out), "\n") {350
if line != "" {351
names = append(names, line)352
}353
}354
return names, nil355
}356
357
// TreeAll leest de hele boom. Name is het pad vanaf de root.358
func TreeAll(ctx context.Context, gitBin, dir, rev string) ([]Entry, error) {359
if rev == "" {360
rev = "HEAD"361
}362
out, err := run(ctx, gitBin, nil, "-C", dir, "ls-tree", "-r", "-t", rev)363
if err != nil {364
if emptyHistory(err) {365
return nil, nil366
}367
return nil, err368
}369
return parseTree(out), nil370
}371
372
func parseTree(out string) []Entry {373
var entries []Entry374
for _, line := range strings.Split(strings.TrimSpace(out), "\n") {375
if line == "" {376
continue377
}378
tab := strings.SplitN(line, "\t", 2)379
if len(tab) != 2 {380
continue381
}382
head := strings.Fields(tab[0])383
if len(head) != 3 {384
continue385
}386
entries = append(entries, Entry{Mode: head[0], Type: head[1], SHA: head[2], Name: tab[1]})387
}388
return entries389
}390
391
// LastCommit is de nieuwste commit die path heeft geraakt. Leeg pad is de tip.392
func LastCommit(ctx context.Context, gitBin, dir, rev, path string) (Commit, error) {393
if rev == "" {394
rev = "HEAD"395
}396
args := []string{"-C", dir, "log", "-1", "--format=%H%x1f%an%x1f%at%x1f%s", rev}397
if path != "" {398
args = append(args, "--", path)399
}400
out, err := run(ctx, gitBin, nil, args...)401
if err != nil {402
if emptyHistory(err) {403
return Commit{}, nil404
}405
return Commit{}, err406
}407
line := strings.TrimSpace(out)408
parts := strings.Split(line, "\x1f")409
if len(parts) < 4 {410
return Commit{}, nil411
}412
c := Commit{SHA: parts[0], Author: parts[1], Subject: parts[3]}413
c.Unix, _ = strconv.ParseInt(parts[2], 10, 64)414
if len(c.SHA) >= 10 {415
c.Short = c.SHA[:10]416
}417
return c, nil418
}419
420
// BlobSize is de grootte in bytes.421
func BlobSize(ctx context.Context, gitBin, dir, rev, rel string) (int64, error) {422
out, err := run(ctx, gitBin, nil, "-C", dir, "cat-file", "-s", rev+":"+rel)423
if err != nil {424
return 0, err425
}426
return strconv.ParseInt(strings.TrimSpace(out), 10, 64)427
}428
252
// BranchOfRef haalt de branch uit refs/heads/… .429
// BranchOfRef haalt de branch uit refs/heads/… .253
func BranchOfRef(ref string) (string, bool) {430
func BranchOfRef(ref string) (string, bool) {254
const p = "refs/heads/"431
const p = "refs/heads/"@@ -2,6 +2,7 @@ package gitrepo
2
2
3
3
import (
4
4
"bytes"
5
"context"
5
6
"os"
6
7
"path/filepath"
7
8
"strings"
@@ -27,6 +28,62 @@ func TestEvaluatePush(t *testing.T) {
27
28
}
28
29
}
29
30
31
func TestTouchAndStats(t *testing.T) {
32
if _, err := os.Stat("/usr/bin/git"); err != nil {
33
t.Skip("git ontbreekt")
34
}
35
ctx := context.Background()
36
dir := filepath.Join(t.TempDir(), "demo.git")
37
if err := Init("git", dir, "master", "/bin/true"); err != nil {
38
t.Fatal(err)
39
}
40
work := t.TempDir()
41
runGit := func(args ...string) {
42
t.Helper()
43
cmd := execCommand(t, work, args...)
44
if cmd != nil {
45
t.Fatal(cmd)
46
}
47
}
48
runGit("init", "-b", "master")
49
runGit("config", "user.email", "tim@example.com")
50
runGit("config", "user.name", "tim")
51
if err := os.WriteFile(filepath.Join(work, "README.md"), []byte("# Hallo\n"), 0o644); err != nil {
52
t.Fatal(err)
53
}
54
if err := os.MkdirAll(filepath.Join(work, "src"), 0o755); err != nil {
55
t.Fatal(err)
56
}
57
if err := os.WriteFile(filepath.Join(work, "src", "main.go"), []byte("package main\n"), 0o644); err != nil {
58
t.Fatal(err)
59
}
60
runGit("add", ".")
61
runGit("commit", "-m", "eerste")
62
if _, err := run(ctx, "git", nil, "-C", work, "remote", "add", "origin", dir); err != nil {
63
t.Fatal(err)
64
}
65
if _, err := run(ctx, "git", nil, "-C", work, "push", "origin", "master"); err != nil {
66
t.Fatal(err)
67
}
68
touch, err := Touch(ctx, "git", dir, "master")
69
if err != nil {
70
t.Fatal(err)
71
}
72
if touch["README.md"].Subject != "eerste" || touch["src"].Subject != "eerste" || touch["src/main.go"].Subject != "eerste" {
73
t.Fatalf("%v", touch)
74
}
75
commits, branches, tags, err := Stats(ctx, "git", dir, "master")
76
if err != nil || commits != 1 || branches != 1 || tags != 0 {
77
t.Fatalf("stats %d %d %d %v", commits, branches, tags, err)
78
}
79
}
80
81
func execCommand(t *testing.T, dir string, args ...string) error {
82
t.Helper()
83
_, err := run(context.Background(), "git", nil, append([]string{"-C", dir}, args...)...)
84
return err
85
}
86
30
87
func TestInitWritesHook(t *testing.T) {
31
88
if _, err := os.Stat("/usr/bin/git"); err != nil {
32
89
t.Skip("git ontbreekt")
@@ -2,6 +2,7 @@ package gitrepo2
2
3
import (3
import (4
"bytes"4
"bytes"5
"context"5
"os"6
"os"6
"path/filepath"7
"path/filepath"7
"strings"8
"strings"@@ -27,6 +28,62 @@ func TestEvaluatePush(t *testing.T) {27
}28
}28
}29
}29
30
31
func TestTouchAndStats(t *testing.T) {32
if _, err := os.Stat("/usr/bin/git"); err != nil {33
t.Skip("git ontbreekt")34
}35
ctx := context.Background()36
dir := filepath.Join(t.TempDir(), "demo.git")37
if err := Init("git", dir, "master", "/bin/true"); err != nil {38
t.Fatal(err)39
}40
work := t.TempDir()41
runGit := func(args ...string) {42
t.Helper()43
cmd := execCommand(t, work, args...)44
if cmd != nil {45
t.Fatal(cmd)46
}47
}48
runGit("init", "-b", "master")49
runGit("config", "user.email", "tim@example.com")50
runGit("config", "user.name", "tim")51
if err := os.WriteFile(filepath.Join(work, "README.md"), []byte("# Hallo\n"), 0o644); err != nil {52
t.Fatal(err)53
}54
if err := os.MkdirAll(filepath.Join(work, "src"), 0o755); err != nil {55
t.Fatal(err)56
}57
if err := os.WriteFile(filepath.Join(work, "src", "main.go"), []byte("package main\n"), 0o644); err != nil {58
t.Fatal(err)59
}60
runGit("add", ".")61
runGit("commit", "-m", "eerste")62
if _, err := run(ctx, "git", nil, "-C", work, "remote", "add", "origin", dir); err != nil {63
t.Fatal(err)64
}65
if _, err := run(ctx, "git", nil, "-C", work, "push", "origin", "master"); err != nil {66
t.Fatal(err)67
}68
touch, err := Touch(ctx, "git", dir, "master")69
if err != nil {70
t.Fatal(err)71
}72
if touch["README.md"].Subject != "eerste" || touch["src"].Subject != "eerste" || touch["src/main.go"].Subject != "eerste" {73
t.Fatalf("%v", touch)74
}75
commits, branches, tags, err := Stats(ctx, "git", dir, "master")76
if err != nil || commits != 1 || branches != 1 || tags != 0 {77
t.Fatalf("stats %d %d %d %v", commits, branches, tags, err)78
}79
}80
81
func execCommand(t *testing.T, dir string, args ...string) error {82
t.Helper()83
_, err := run(context.Background(), "git", nil, append([]string{"-C", dir}, args...)...)84
return err85
}86
30
func TestInitWritesHook(t *testing.T) {87
func TestInitWritesHook(t *testing.T) {31
if _, err := os.Stat("/usr/bin/git"); err != nil {88
if _, err := os.Stat("/usr/bin/git"); err != nil {32
t.Skip("git ontbreekt")89
t.Skip("git ontbreekt")@@ -0,0 +1,192 @@
1
// Package highlight kleurt een bronbestand per regel.
2
package highlight
3
4
import (
5
"html"
6
"path"
7
"strings"
8
)
9
10
// Lines geeft per regel HTML. Tekst uit het bestand is geëscaped.
11
func Lines(filename, src string) []string {
12
lang := langOf(filename)
13
inBlock := false
14
raw := strings.Split(src, "\n")
15
if len(raw) > 0 && raw[len(raw)-1] == "" && strings.HasSuffix(src, "\n") {
16
raw = raw[:len(raw)-1]
17
}
18
out := make([]string, 0, len(raw))
19
for _, line := range raw {
20
var htmlLine string
21
htmlLine, inBlock = paint(lang, line, inBlock)
22
out = append(out, htmlLine)
23
}
24
return out
25
}
26
27
func langOf(filename string) string {
28
switch strings.ToLower(path.Ext(filename)) {
29
case ".go":
30
return "go"
31
case ".js", ".mjs":
32
return "js"
33
case ".ts":
34
return "ts"
35
case ".py":
36
return "py"
37
case ".rs":
38
return "rs"
39
case ".c", ".h", ".cpp":
40
return "c"
41
case ".rb":
42
return "rb"
43
case ".sh", ".bash":
44
return "sh"
45
case ".yml", ".yaml":
46
return "yml"
47
case ".toml":
48
return "toml"
49
case ".json":
50
return "json"
51
case ".css":
52
return "css"
53
case ".sql":
54
return "sql"
55
case ".html", ".xml":
56
return "html"
57
case ".md":
58
return "md"
59
default:
60
base := strings.ToLower(path.Base(filename))
61
if base == "dockerfile" || strings.HasSuffix(base, ".dockerfile") {
62
return "sh"
63
}
64
return ""
65
}
66
}
67
68
var keywords = map[string]map[string]bool{
69
"go": words("func package import return if else for var const type struct map range switch case default break continue go defer select chan interface nil true false"),
70
"js": words("function return if else for var const let class new this null undefined true false import export async await"),
71
"ts": words("function return if else for var const let class new this null undefined true false import export async await type interface"),
72
"py": words("def class return if else elif for while import from as none true false and or not in with lambda try except"),
73
"rs": words("fn let mut pub struct enum impl trait use mod return if else for while match loop true false self"),
74
"c": words("if else for while return struct enum typedef void int char const static"),
75
"rb": words("def class end if else elsif do module require return nil true false"),
76
"sh": words("if then else fi for while do done case esac function return"),
77
"sql": words("select from where insert update delete create table join left right on as and or not null"),
78
}
79
80
func words(s string) map[string]bool {
81
m := map[string]bool{}
82
for _, w := range strings.Fields(s) {
83
m[w] = true
84
}
85
return m
86
}
87
88
func hashComment(lang string) bool {
89
switch lang {
90
case "py", "sh", "yml", "toml", "rb":
91
return true
92
}
93
return false
94
}
95
96
func blockComment(lang string) bool {
97
switch lang {
98
case "go", "js", "ts", "rs", "c", "css", "sql":
99
return true
100
}
101
return false
102
}
103
104
func paint(lang, line string, inBlock bool) (string, bool) {
105
var b strings.Builder
106
i := 0
107
for i < len(line) {
108
rest := line[i:]
109
if inBlock {
110
end := strings.Index(rest, "*/")
111
if end < 0 {
112
b.WriteString(`<span class="hl-c">`)
113
b.WriteString(html.EscapeString(rest))
114
b.WriteString("</span>")
115
return b.String(), true
116
}
117
b.WriteString(`<span class="hl-c">`)
118
b.WriteString(html.EscapeString(rest[:end+2]))
119
b.WriteString("</span>")
120
i += end + 2
121
inBlock = false
122
continue
123
}
124
if strings.HasPrefix(rest, "//") || (hashComment(lang) && strings.HasPrefix(rest, "#")) || (lang == "sql" && strings.HasPrefix(rest, "--")) {
125
b.WriteString(`<span class="hl-c">`)
126
b.WriteString(html.EscapeString(rest))
127
b.WriteString("</span>")
128
return b.String(), false
129
}
130
if blockComment(lang) && strings.HasPrefix(rest, "/*") {
131
inBlock = true
132
continue
133
}
134
if rest[0] == '"' || rest[0] == '\'' || (rest[0] == '`' && lang == "go") {
135
q := rest[0]
136
j := 1
137
for j < len(rest) {
138
if rest[j] == '\\' && q != '`' {
139
j += 2
140
continue
141
}
142
if rest[j] == q {
143
j++
144
break
145
}
146
j++
147
}
148
if j > len(rest) {
149
j = len(rest)
150
}
151
b.WriteString(`<span class="hl-s">`)
152
b.WriteString(html.EscapeString(rest[:j]))
153
b.WriteString("</span>")
154
i += j
155
continue
156
}
157
if rest[0] >= '0' && rest[0] <= '9' {
158
j := 1
159
for j < len(rest) && ((rest[j] >= '0' && rest[j] <= '9') || rest[j] == '.') {
160
j++
161
}
162
b.WriteString(`<span class="hl-n">`)
163
b.WriteString(html.EscapeString(rest[:j]))
164
b.WriteString("</span>")
165
i += j
166
continue
167
}
168
if isIdent(rest[0]) {
169
j := 1
170
for j < len(rest) && (isIdent(rest[j]) || (rest[j] >= '0' && rest[j] <= '9')) {
171
j++
172
}
173
word := rest[:j]
174
if keywords[lang][word] {
175
b.WriteString(`<span class="hl-k">`)
176
b.WriteString(html.EscapeString(word))
177
b.WriteString("</span>")
178
} else {
179
b.WriteString(html.EscapeString(word))
180
}
181
i += j
182
continue
183
}
184
b.WriteString(html.EscapeString(rest[:1]))
185
i++
186
}
187
return b.String(), inBlock
188
}
189
190
func isIdent(c byte) bool {
191
return c == '_' || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
192
}
@@ -0,0 +1,192 @@1
// Package highlight kleurt een bronbestand per regel.2
package highlight3
4
import (5
"html"6
"path"7
"strings"8
)9
10
// Lines geeft per regel HTML. Tekst uit het bestand is geëscaped.11
func Lines(filename, src string) []string {12
lang := langOf(filename)13
inBlock := false14
raw := strings.Split(src, "\n")15
if len(raw) > 0 && raw[len(raw)-1] == "" && strings.HasSuffix(src, "\n") {16
raw = raw[:len(raw)-1]17
}18
out := make([]string, 0, len(raw))19
for _, line := range raw {20
var htmlLine string21
htmlLine, inBlock = paint(lang, line, inBlock)22
out = append(out, htmlLine)23
}24
return out25
}26
27
func langOf(filename string) string {28
switch strings.ToLower(path.Ext(filename)) {29
case ".go":30
return "go"31
case ".js", ".mjs":32
return "js"33
case ".ts":34
return "ts"35
case ".py":36
return "py"37
case ".rs":38
return "rs"39
case ".c", ".h", ".cpp":40
return "c"41
case ".rb":42
return "rb"43
case ".sh", ".bash":44
return "sh"45
case ".yml", ".yaml":46
return "yml"47
case ".toml":48
return "toml"49
case ".json":50
return "json"51
case ".css":52
return "css"53
case ".sql":54
return "sql"55
case ".html", ".xml":56
return "html"57
case ".md":58
return "md"59
default:60
base := strings.ToLower(path.Base(filename))61
if base == "dockerfile" || strings.HasSuffix(base, ".dockerfile") {62
return "sh"63
}64
return ""65
}66
}67
68
var keywords = map[string]map[string]bool{69
"go": words("func package import return if else for var const type struct map range switch case default break continue go defer select chan interface nil true false"),70
"js": words("function return if else for var const let class new this null undefined true false import export async await"),71
"ts": words("function return if else for var const let class new this null undefined true false import export async await type interface"),72
"py": words("def class return if else elif for while import from as none true false and or not in with lambda try except"),73
"rs": words("fn let mut pub struct enum impl trait use mod return if else for while match loop true false self"),74
"c": words("if else for while return struct enum typedef void int char const static"),75
"rb": words("def class end if else elsif do module require return nil true false"),76
"sh": words("if then else fi for while do done case esac function return"),77
"sql": words("select from where insert update delete create table join left right on as and or not null"),78
}79
80
func words(s string) map[string]bool {81
m := map[string]bool{}82
for _, w := range strings.Fields(s) {83
m[w] = true84
}85
return m86
}87
88
func hashComment(lang string) bool {89
switch lang {90
case "py", "sh", "yml", "toml", "rb":91
return true92
}93
return false94
}95
96
func blockComment(lang string) bool {97
switch lang {98
case "go", "js", "ts", "rs", "c", "css", "sql":99
return true100
}101
return false102
}103
104
func paint(lang, line string, inBlock bool) (string, bool) {105
var b strings.Builder106
i := 0107
for i < len(line) {108
rest := line[i:]109
if inBlock {110
end := strings.Index(rest, "*/")111
if end < 0 {112
b.WriteString(`<span class="hl-c">`)113
b.WriteString(html.EscapeString(rest))114
b.WriteString("</span>")115
return b.String(), true116
}117
b.WriteString(`<span class="hl-c">`)118
b.WriteString(html.EscapeString(rest[:end+2]))119
b.WriteString("</span>")120
i += end + 2121
inBlock = false122
continue123
}124
if strings.HasPrefix(rest, "//") || (hashComment(lang) && strings.HasPrefix(rest, "#")) || (lang == "sql" && strings.HasPrefix(rest, "--")) {125
b.WriteString(`<span class="hl-c">`)126
b.WriteString(html.EscapeString(rest))127
b.WriteString("</span>")128
return b.String(), false129
}130
if blockComment(lang) && strings.HasPrefix(rest, "/*") {131
inBlock = true132
continue133
}134
if rest[0] == '"' || rest[0] == '\'' || (rest[0] == '`' && lang == "go") {135
q := rest[0]136
j := 1137
for j < len(rest) {138
if rest[j] == '\\' && q != '`' {139
j += 2140
continue141
}142
if rest[j] == q {143
j++144
break145
}146
j++147
}148
if j > len(rest) {149
j = len(rest)150
}151
b.WriteString(`<span class="hl-s">`)152
b.WriteString(html.EscapeString(rest[:j]))153
b.WriteString("</span>")154
i += j155
continue156
}157
if rest[0] >= '0' && rest[0] <= '9' {158
j := 1159
for j < len(rest) && ((rest[j] >= '0' && rest[j] <= '9') || rest[j] == '.') {160
j++161
}162
b.WriteString(`<span class="hl-n">`)163
b.WriteString(html.EscapeString(rest[:j]))164
b.WriteString("</span>")165
i += j166
continue167
}168
if isIdent(rest[0]) {169
j := 1170
for j < len(rest) && (isIdent(rest[j]) || (rest[j] >= '0' && rest[j] <= '9')) {171
j++172
}173
word := rest[:j]174
if keywords[lang][word] {175
b.WriteString(`<span class="hl-k">`)176
b.WriteString(html.EscapeString(word))177
b.WriteString("</span>")178
} else {179
b.WriteString(html.EscapeString(word))180
}181
i += j182
continue183
}184
b.WriteString(html.EscapeString(rest[:1]))185
i++186
}187
return b.String(), inBlock188
}189
190
func isIdent(c byte) bool {191
return c == '_' || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')192
}@@ -0,0 +1,19 @@
1
package highlight
2
3
import (
4
"strings"
5
"testing"
6
)
7
8
func TestGoKeywordAndEscape(t *testing.T) {
9
got := Lines("main.go", "func main() {\n\t// <script>\n\treturn\n}\n")
10
if len(got) != 4 {
11
t.Fatalf("regels %d", len(got))
12
}
13
if !strings.Contains(got[0], `class="hl-k">func</span>`) {
14
t.Fatalf("keyword: %s", got[0])
15
}
16
if !strings.Contains(got[1], "<script>") || !strings.Contains(got[1], "hl-c") {
17
t.Fatalf("comment: %s", got[1])
18
}
19
}
@@ -0,0 +1,19 @@1
package highlight2
3
import (4
"strings"5
"testing"6
)7
8
func TestGoKeywordAndEscape(t *testing.T) {9
got := Lines("main.go", "func main() {\n\t// <script>\n\treturn\n}\n")10
if len(got) != 4 {11
t.Fatalf("regels %d", len(got))12
}13
if !strings.Contains(got[0], `class="hl-k">func</span>`) {14
t.Fatalf("keyword: %s", got[0])15
}16
if !strings.Contains(got[1], "<script>") || !strings.Contains(got[1], "hl-c") {17
t.Fatalf("comment: %s", got[1])18
}19
}@@ -0,0 +1,223 @@
1
// Package markdown zet een beperkte Markdown-tekst om naar HTML.
2
// Ruwe HTML uit het bestand wordt geëscaped.
3
package markdown
4
5
import (
6
"html"
7
"net/url"
8
"strconv"
9
"strings"
10
)
11
12
// Render maakt HTML. Relatieve links krijgen linkBase ervoor, plus rev.
13
func Render(src, linkBase, rev string) string {
14
lines := strings.Split(strings.ReplaceAll(src, "\r\n", "\n"), "\n")
15
var b strings.Builder
16
for i := 0; i < len(lines); {
17
line := lines[i]
18
trim := strings.TrimSpace(line)
19
if trim == "" {
20
i++
21
continue
22
}
23
if strings.HasPrefix(trim, "```") {
24
var body []string
25
i++
26
for i < len(lines) && !strings.HasPrefix(strings.TrimSpace(lines[i]), "```") {
27
body = append(body, lines[i])
28
i++
29
}
30
if i < len(lines) {
31
i++
32
}
33
b.WriteString("<pre><code>")
34
b.WriteString(html.EscapeString(strings.Join(body, "\n")))
35
b.WriteString("</code></pre>\n")
36
continue
37
}
38
if isTableStart(lines, i) {
39
b.WriteString(table(lines, &i, linkBase, rev))
40
continue
41
}
42
if strings.HasPrefix(trim, "#") {
43
n := 0
44
for n < len(trim) && trim[n] == '#' && n < 6 {
45
n++
46
}
47
if n > 0 && (n == len(trim) || trim[n] == ' ') {
48
h := strconv.Itoa(n)
49
b.WriteString("<h" + h + ">")
50
b.WriteString(inline(strings.TrimSpace(trim[n:]), linkBase, rev))
51
b.WriteString("</h" + h + ">\n")
52
i++
53
continue
54
}
55
}
56
if isList(trim) {
57
b.WriteString("<ul>\n")
58
for i < len(lines) && isList(strings.TrimSpace(lines[i])) {
59
item := strings.TrimSpace(lines[i])
60
item = strings.TrimPrefix(item, "- ")
61
item = strings.TrimPrefix(item, "* ")
62
b.WriteString("<li>")
63
b.WriteString(inline(item, linkBase, rev))
64
b.WriteString("</li>\n")
65
i++
66
}
67
b.WriteString("</ul>\n")
68
continue
69
}
70
var para []string
71
for i < len(lines) && strings.TrimSpace(lines[i]) != "" && !strings.HasPrefix(strings.TrimSpace(lines[i]), "```") && !strings.HasPrefix(strings.TrimSpace(lines[i]), "#") && !isList(strings.TrimSpace(lines[i])) && !isTableStart(lines, i) {
72
para = append(para, strings.TrimSpace(lines[i]))
73
i++
74
}
75
b.WriteString("<p>")
76
b.WriteString(inline(strings.Join(para, " "), linkBase, rev))
77
b.WriteString("</p>\n")
78
}
79
return b.String()
80
}
81
82
func isList(trim string) bool {
83
return strings.HasPrefix(trim, "- ") || strings.HasPrefix(trim, "* ")
84
}
85
86
func isTableStart(lines []string, i int) bool {
87
if i+1 >= len(lines) || !strings.Contains(lines[i], "|") {
88
return false
89
}
90
return isRule(lines[i+1])
91
}
92
93
func isRule(line string) bool {
94
cells := splitRow(line)
95
if len(cells) == 0 {
96
return false
97
}
98
for _, c := range cells {
99
c = strings.TrimSpace(c)
100
if c == "" {
101
return false
102
}
103
for _, r := range c {
104
if r != '-' && r != ':' && r != ' ' {
105
return false
106
}
107
}
108
if !strings.Contains(c, "-") {
109
return false
110
}
111
}
112
return true
113
}
114
115
func splitRow(line string) []string {
116
line = strings.TrimSpace(line)
117
line = strings.Trim(line, "|")
118
if strings.TrimSpace(line) == "" {
119
return nil
120
}
121
parts := strings.Split(line, "|")
122
for i := range parts {
123
parts[i] = strings.TrimSpace(parts[i])
124
}
125
return parts
126
}
127
128
func table(lines []string, i *int, linkBase, rev string) string {
129
head := splitRow(lines[*i])
130
*i += 2
131
var rows [][]string
132
for *i < len(lines) && strings.Contains(lines[*i], "|") && strings.TrimSpace(lines[*i]) != "" {
133
rows = append(rows, splitRow(lines[*i]))
134
*i++
135
}
136
var b strings.Builder
137
b.WriteString("<table class=\"md\">\n<thead><tr>")
138
for _, c := range head {
139
b.WriteString("<th>")
140
b.WriteString(inline(c, linkBase, rev))
141
b.WriteString("</th>")
142
}
143
b.WriteString("</tr></thead>\n<tbody>\n")
144
for _, row := range rows {
145
b.WriteString("<tr>")
146
for _, c := range row {
147
b.WriteString("<td>")
148
b.WriteString(inline(c, linkBase, rev))
149
b.WriteString("</td>")
150
}
151
b.WriteString("</tr>\n")
152
}
153
b.WriteString("</tbody></table>\n")
154
return b.String()
155
}
156
157
func inline(s, linkBase, rev string) string {
158
var b strings.Builder
159
for i := 0; i < len(s); {
160
if s[i] == '`' {
161
if j := strings.IndexByte(s[i+1:], '`'); j >= 0 {
162
b.WriteString("<code>")
163
b.WriteString(html.EscapeString(s[i+1 : i+1+j]))
164
b.WriteString("</code>")
165
i += j + 2
166
continue
167
}
168
}
169
if strings.HasPrefix(s[i:], "**") {
170
if j := strings.Index(s[i+2:], "**"); j >= 0 {
171
b.WriteString("<strong>")
172
b.WriteString(inline(s[i+2:i+2+j], linkBase, rev))
173
b.WriteString("</strong>")
174
i += j + 4
175
continue
176
}
177
}
178
if s[i] == '*' {
179
if j := strings.IndexByte(s[i+1:], '*'); j > 0 {
180
b.WriteString("<em>")
181
b.WriteString(inline(s[i+1:i+1+j], linkBase, rev))
182
b.WriteString("</em>")
183
i += j + 2
184
continue
185
}
186
}
187
if s[i] == '[' {
188
if mid := strings.Index(s[i:], "]("); mid > 0 {
189
if end := strings.IndexByte(s[i+mid:], ')'); end > 2 {
190
text := s[i+1 : i+mid]
191
href := s[i+mid+2 : i+mid+end]
192
b.WriteString(`<a href="`)
193
b.WriteString(html.EscapeString(resolveLink(href, linkBase, rev)))
194
b.WriteString(`">`)
195
b.WriteString(inline(text, linkBase, rev))
196
b.WriteString("</a>")
197
i += mid + end + 1
198
continue
199
}
200
}
201
}
202
b.WriteString(html.EscapeString(s[i : i+1]))
203
i++
204
}
205
return b.String()
206
}
207
208
func resolveLink(href, linkBase, rev string) string {
209
href = strings.TrimSpace(href)
210
lower := strings.ToLower(href)
211
if strings.HasPrefix(lower, "https://") || strings.HasPrefix(lower, "http://") || strings.HasPrefix(lower, "mailto:") {
212
return href
213
}
214
if strings.HasPrefix(href, "#") || strings.Contains(href, "://") || strings.HasPrefix(href, "//") {
215
return href
216
}
217
href = strings.TrimPrefix(href, "./")
218
out := linkBase + href
219
if rev != "" {
220
out += "?rev=" + url.QueryEscape(rev)
221
}
222
return out
223
}
@@ -0,0 +1,223 @@1
// Package markdown zet een beperkte Markdown-tekst om naar HTML.2
// Ruwe HTML uit het bestand wordt geëscaped.3
package markdown4
5
import (6
"html"7
"net/url"8
"strconv"9
"strings"10
)11
12
// Render maakt HTML. Relatieve links krijgen linkBase ervoor, plus rev.13
func Render(src, linkBase, rev string) string {14
lines := strings.Split(strings.ReplaceAll(src, "\r\n", "\n"), "\n")15
var b strings.Builder16
for i := 0; i < len(lines); {17
line := lines[i]18
trim := strings.TrimSpace(line)19
if trim == "" {20
i++21
continue22
}23
if strings.HasPrefix(trim, "```") {24
var body []string25
i++26
for i < len(lines) && !strings.HasPrefix(strings.TrimSpace(lines[i]), "```") {27
body = append(body, lines[i])28
i++29
}30
if i < len(lines) {31
i++32
}33
b.WriteString("<pre><code>")34
b.WriteString(html.EscapeString(strings.Join(body, "\n")))35
b.WriteString("</code></pre>\n")36
continue37
}38
if isTableStart(lines, i) {39
b.WriteString(table(lines, &i, linkBase, rev))40
continue41
}42
if strings.HasPrefix(trim, "#") {43
n := 044
for n < len(trim) && trim[n] == '#' && n < 6 {45
n++46
}47
if n > 0 && (n == len(trim) || trim[n] == ' ') {48
h := strconv.Itoa(n)49
b.WriteString("<h" + h + ">")50
b.WriteString(inline(strings.TrimSpace(trim[n:]), linkBase, rev))51
b.WriteString("</h" + h + ">\n")52
i++53
continue54
}55
}56
if isList(trim) {57
b.WriteString("<ul>\n")58
for i < len(lines) && isList(strings.TrimSpace(lines[i])) {59
item := strings.TrimSpace(lines[i])60
item = strings.TrimPrefix(item, "- ")61
item = strings.TrimPrefix(item, "* ")62
b.WriteString("<li>")63
b.WriteString(inline(item, linkBase, rev))64
b.WriteString("</li>\n")65
i++66
}67
b.WriteString("</ul>\n")68
continue69
}70
var para []string71
for i < len(lines) && strings.TrimSpace(lines[i]) != "" && !strings.HasPrefix(strings.TrimSpace(lines[i]), "```") && !strings.HasPrefix(strings.TrimSpace(lines[i]), "#") && !isList(strings.TrimSpace(lines[i])) && !isTableStart(lines, i) {72
para = append(para, strings.TrimSpace(lines[i]))73
i++74
}75
b.WriteString("<p>")76
b.WriteString(inline(strings.Join(para, " "), linkBase, rev))77
b.WriteString("</p>\n")78
}79
return b.String()80
}81
82
func isList(trim string) bool {83
return strings.HasPrefix(trim, "- ") || strings.HasPrefix(trim, "* ")84
}85
86
func isTableStart(lines []string, i int) bool {87
if i+1 >= len(lines) || !strings.Contains(lines[i], "|") {88
return false89
}90
return isRule(lines[i+1])91
}92
93
func isRule(line string) bool {94
cells := splitRow(line)95
if len(cells) == 0 {96
return false97
}98
for _, c := range cells {99
c = strings.TrimSpace(c)100
if c == "" {101
return false102
}103
for _, r := range c {104
if r != '-' && r != ':' && r != ' ' {105
return false106
}107
}108
if !strings.Contains(c, "-") {109
return false110
}111
}112
return true113
}114
115
func splitRow(line string) []string {116
line = strings.TrimSpace(line)117
line = strings.Trim(line, "|")118
if strings.TrimSpace(line) == "" {119
return nil120
}121
parts := strings.Split(line, "|")122
for i := range parts {123
parts[i] = strings.TrimSpace(parts[i])124
}125
return parts126
}127
128
func table(lines []string, i *int, linkBase, rev string) string {129
head := splitRow(lines[*i])130
*i += 2131
var rows [][]string132
for *i < len(lines) && strings.Contains(lines[*i], "|") && strings.TrimSpace(lines[*i]) != "" {133
rows = append(rows, splitRow(lines[*i]))134
*i++135
}136
var b strings.Builder137
b.WriteString("<table class=\"md\">\n<thead><tr>")138
for _, c := range head {139
b.WriteString("<th>")140
b.WriteString(inline(c, linkBase, rev))141
b.WriteString("</th>")142
}143
b.WriteString("</tr></thead>\n<tbody>\n")144
for _, row := range rows {145
b.WriteString("<tr>")146
for _, c := range row {147
b.WriteString("<td>")148
b.WriteString(inline(c, linkBase, rev))149
b.WriteString("</td>")150
}151
b.WriteString("</tr>\n")152
}153
b.WriteString("</tbody></table>\n")154
return b.String()155
}156
157
func inline(s, linkBase, rev string) string {158
var b strings.Builder159
for i := 0; i < len(s); {160
if s[i] == '`' {161
if j := strings.IndexByte(s[i+1:], '`'); j >= 0 {162
b.WriteString("<code>")163
b.WriteString(html.EscapeString(s[i+1 : i+1+j]))164
b.WriteString("</code>")165
i += j + 2166
continue167
}168
}169
if strings.HasPrefix(s[i:], "**") {170
if j := strings.Index(s[i+2:], "**"); j >= 0 {171
b.WriteString("<strong>")172
b.WriteString(inline(s[i+2:i+2+j], linkBase, rev))173
b.WriteString("</strong>")174
i += j + 4175
continue176
}177
}178
if s[i] == '*' {179
if j := strings.IndexByte(s[i+1:], '*'); j > 0 {180
b.WriteString("<em>")181
b.WriteString(inline(s[i+1:i+1+j], linkBase, rev))182
b.WriteString("</em>")183
i += j + 2184
continue185
}186
}187
if s[i] == '[' {188
if mid := strings.Index(s[i:], "]("); mid > 0 {189
if end := strings.IndexByte(s[i+mid:], ')'); end > 2 {190
text := s[i+1 : i+mid]191
href := s[i+mid+2 : i+mid+end]192
b.WriteString(`<a href="`)193
b.WriteString(html.EscapeString(resolveLink(href, linkBase, rev)))194
b.WriteString(`">`)195
b.WriteString(inline(text, linkBase, rev))196
b.WriteString("</a>")197
i += mid + end + 1198
continue199
}200
}201
}202
b.WriteString(html.EscapeString(s[i : i+1]))203
i++204
}205
return b.String()206
}207
208
func resolveLink(href, linkBase, rev string) string {209
href = strings.TrimSpace(href)210
lower := strings.ToLower(href)211
if strings.HasPrefix(lower, "https://") || strings.HasPrefix(lower, "http://") || strings.HasPrefix(lower, "mailto:") {212
return href213
}214
if strings.HasPrefix(href, "#") || strings.Contains(href, "://") || strings.HasPrefix(href, "//") {215
return href216
}217
href = strings.TrimPrefix(href, "./")218
out := linkBase + href219
if rev != "" {220
out += "?rev=" + url.QueryEscape(rev)221
}222
return out223
}@@ -0,0 +1,24 @@
1
package markdown
2
3
import (
4
"strings"
5
"testing"
6
)
7
8
func TestTableAndEscape(t *testing.T) {
9
src := "# Demo\n\nEen <script>regel</script> met **vet**.\n\n| Sleutel | Actie |\n| --- | --- |\n| A | Links |\n| D | Rechts |\n\nZie [regels](docs/regels.md).\n"
10
got := Render(src, "/tim/demo/-/blob/", "master")
11
for _, want := range []string{
12
"<h1>Demo</h1>",
13
"<strong>vet</strong>",
14
"<script>",
15
"<table class=\"md\">",
16
"<th>Sleutel</th>",
17
"<td>Links</td>",
18
`href="/tim/demo/-/blob/docs/regels.md?rev=master"`,
19
} {
20
if !strings.Contains(got, want) {
21
t.Errorf("mist %s in\n%s", want, got)
22
}
23
}
24
}
@@ -0,0 +1,24 @@1
package markdown2
3
import (4
"strings"5
"testing"6
)7
8
func TestTableAndEscape(t *testing.T) {9
src := "# Demo\n\nEen <script>regel</script> met **vet**.\n\n| Sleutel | Actie |\n| --- | --- |\n| A | Links |\n| D | Rechts |\n\nZie [regels](docs/regels.md).\n"10
got := Render(src, "/tim/demo/-/blob/", "master")11
for _, want := range []string{12
"<h1>Demo</h1>",13
"<strong>vet</strong>",14
"<script>",15
"<table class=\"md\">",16
"<th>Sleutel</th>",17
"<td>Links</td>",18
`href="/tim/demo/-/blob/docs/regels.md?rev=master"`,19
} {20
if !strings.Contains(got, want) {21
t.Errorf("mist %s in\n%s", want, got)22
}23
}24
}@@ -0,0 +1,298 @@
1
package server
2
3
import (
4
"fmt"
5
"html/template"
6
"net/http"
7
"path"
8
"sort"
9
"strings"
10
"time"
11
12
"gitlab.com/Timfa/bluegit/internal/access"
13
"gitlab.com/Timfa/bluegit/internal/gitrepo"
14
"gitlab.com/Timfa/bluegit/internal/highlight"
15
"gitlab.com/Timfa/bluegit/internal/markdown"
16
"gitlab.com/Timfa/bluegit/internal/store"
17
)
18
19
func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
20
v.Page = "overview"
21
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
22
s.branchList(r, v, dir)
23
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {
24
row := commitRow(c)
25
v.Head = &row
26
}
27
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")
28
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
29
if err == nil {
30
v.Files = fileRows(entries, "", touch)
31
}
32
readme, license := findDocs(entries)
33
v.LicensePath = license
34
if readme != "" {
35
text, binary, err := gitrepo.Blob(r.Context(), s.Git, dir, v.Rev, readme, 200_000)
36
if err == nil && !binary {
37
v.ReadmeName = readme
38
base := "/" + repo.FullPath() + "/-/blob/"
39
v.Readme = template.HTML(markdown.Render(text, base, v.Rev))
40
}
41
}
42
commits, branches, tags, _ := gitrepo.Stats(r.Context(), s.Git, dir, v.Rev)
43
v.NCommits, v.NBranches, v.NTags = commits, branches, tags
44
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {
45
v.NReleases = len(rels)
46
}
47
v.Created = dutchDate(repo.CreatedAt)
48
}
49
50
func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string, isFile bool) {
51
v.Page = "files"
52
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
53
s.branchList(r, v, dir)
54
all, _ := gitrepo.TreeAll(r.Context(), s.Git, dir, v.Rev)
55
v.Tree = treeRows(all, rel)
56
if !isFile {
57
v.TreePath = rel
58
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel)
59
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
60
if err == nil {
61
v.Files = fileRows(entries, rel, touch)
62
}
63
return
64
}
65
v.BlobPath = rel
66
v.FileName = path.Base(rel)
67
text, binary, err := gitrepo.Blob(r.Context(), s.Git, dir, v.Rev, rel, 200_000)
68
if err != nil {
69
return
70
}
71
v.Binary = binary
72
if !binary {
73
for i, line := range highlight.Lines(rel, text) {
74
v.Lines = append(v.Lines, CodeLine{N: i + 1, HTML: template.HTML(line)})
75
}
76
}
77
if n, err := gitrepo.BlobSize(r.Context(), s.Git, dir, v.Rev, rel); err == nil {
78
v.BlobSize = formatSize(n)
79
}
80
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {
81
row := commitRow(c)
82
v.Head = &row
83
}
84
}
85
86
func (s *Server) branchList(r *http.Request, v *View, dir string) {
87
patterns, _ := s.Store.ProtectedPatterns(r.Context(), v.Repo.ID)
88
v.RevProtected = access.BranchProtected(patterns, v.Rev)
89
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
90
seen := false
91
for _, name := range names {
92
if name == v.Rev {
93
seen = true
94
}
95
v.Branches = append(v.Branches, BranchRow{Name: name, Protected: access.BranchProtected(patterns, name)})
96
}
97
if v.Rev != "" && !seen {
98
v.Branches = append([]BranchRow{{Name: v.Rev, Protected: v.RevProtected}}, v.Branches...)
99
}
100
}
101
102
func (s *Server) tags(w http.ResponseWriter, r *http.Request) {
103
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)
104
if !ok {
105
return
106
}
107
v := s.repoView(w, r, repo, role, "Tags")
108
v.Wide = true
109
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
110
v.TagNames, _ = gitrepo.Tags(r.Context(), s.Git, dir)
111
s.render(w, "tags", v)
112
}
113
114
func commitRow(c gitrepo.Commit) CommitRow {
115
return CommitRow{
116
SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date,
117
Subject: c.Subject, Body: c.Body, When: ago(c.Unix),
118
}
119
}
120
121
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit) []FileRow {
122
var out []FileRow
123
for _, e := range entries {
124
p := e.Name
125
if base != "" {
126
p = base + "/" + e.Name
127
}
128
row := FileRow{Name: e.Name, Path: p, Dir: e.Type == "tree", Icon: fileIcon(e.Name, e.Type)}
129
if c, ok := touch[p]; ok {
130
row.Subject = c.Subject
131
row.When = ago(c.Unix)
132
row.SHA = c.SHA
133
}
134
out = append(out, row)
135
}
136
sort.Slice(out, func(i, j int) bool {
137
if out[i].Dir != out[j].Dir {
138
return out[i].Dir
139
}
140
return strings.ToLower(out[i].Name) < strings.ToLower(out[j].Name)
141
})
142
return out
143
}
144
145
func treeRows(entries []gitrepo.Entry, current string) []FileRow {
146
var out []FileRow
147
for _, e := range entries {
148
base := e.Name
149
if i := strings.LastIndex(e.Name, "/"); i >= 0 {
150
base = e.Name[i+1:]
151
}
152
depth := strings.Count(e.Name, "/")
153
if depth > 8 {
154
depth = 8
155
}
156
active := e.Name == current
157
if e.Type == "tree" && (current == e.Name || strings.HasPrefix(current, e.Name+"/")) {
158
active = true
159
}
160
out = append(out, FileRow{
161
Name: base, Path: e.Name, Dir: e.Type == "tree", Icon: fileIcon(base, e.Type),
162
Depth: depth, Active: active,
163
})
164
}
165
return out
166
}
167
168
func findDocs(entries []gitrepo.Entry) (readme, license string) {
169
readmeRank := 9
170
for _, e := range entries {
171
if e.Type != "blob" {
172
continue
173
}
174
low := strings.ToLower(e.Name)
175
rank := 9
176
switch low {
177
case "readme.md":
178
rank = 0
179
case "readme.markdown":
180
rank = 1
181
case "readme":
182
rank = 2
183
}
184
if rank < readmeRank {
185
readmeRank = rank
186
readme = e.Name
187
}
188
switch low {
189
case "license", "license.md", "license.txt", "licence", "copying":
190
if license == "" || low == "license" {
191
license = e.Name
192
}
193
}
194
}
195
return readme, license
196
}
197
198
func fileIcon(name, typ string) string {
199
if typ == "tree" {
200
return "dir"
201
}
202
switch strings.ToLower(path.Ext(name)) {
203
case ".md", ".markdown":
204
return "md"
205
case ".png", ".jpg", ".jpeg", ".gif", ".svg", ".webp":
206
return "img"
207
case ".go", ".js", ".ts", ".py", ".rs", ".c", ".h", ".rb", ".sh":
208
return "code"
209
case ".yml", ".yaml", ".toml", ".json", ".lock":
210
return "cfg"
211
}
212
base := strings.ToLower(name)
213
if base == "license" || base == "licence" || base == "copying" || strings.HasPrefix(base, "license.") {
214
return "lic"
215
}
216
if strings.HasPrefix(base, "readme") {
217
return "md"
218
}
219
return "file"
220
}
221
222
func ago(unix int64) string {
223
if unix <= 0 {
224
return ""
225
}
226
d := time.Since(time.Unix(unix, 0))
227
if d < time.Minute {
228
return "zojuist"
229
}
230
if d < time.Hour {
231
n := int(d.Minutes())
232
if n < 1 {
233
n = 1
234
}
235
if n == 1 {
236
return "1 minuut geleden"
237
}
238
return fmt.Sprintf("%d minuten geleden", n)
239
}
240
if d < 24*time.Hour {
241
n := int(d.Hours())
242
if n == 1 {
243
return "1 uur geleden"
244
}
245
return fmt.Sprintf("%d uur geleden", n)
246
}
247
days := int(d.Hours() / 24)
248
if days < 1 {
249
days = 1
250
}
251
if days == 1 {
252
return "1 dag geleden"
253
}
254
if days < 14 {
255
return fmt.Sprintf("%d dagen geleden", days)
256
}
257
if days < 60 {
258
n := days / 7
259
if n == 1 {
260
return "1 week geleden"
261
}
262
return fmt.Sprintf("%d weken geleden", n)
263
}
264
if days < 365 {
265
n := days / 30
266
if n < 1 {
267
n = 1
268
}
269
if n == 1 {
270
return "1 maand geleden"
271
}
272
return fmt.Sprintf("%d maanden geleden", n)
273
}
274
n := days / 365
275
if n == 1 {
276
return "1 jaar geleden"
277
}
278
return fmt.Sprintf("%d jaar geleden", n)
279
}
280
281
func dutchDate(t time.Time) string {
282
if t.IsZero() {
283
return ""
284
}
285
months := []string{"", "januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"}
286
t = t.Local()
287
return fmt.Sprintf("%d %s %d", t.Day(), months[t.Month()], t.Year())
288
}
289
290
func formatSize(n int64) string {
291
if n < 1024 {
292
return fmt.Sprintf("%d B", n)
293
}
294
if n < 1024*1024 {
295
return fmt.Sprintf("%.1f KiB", float64(n)/1024)
296
}
297
return fmt.Sprintf("%.1f MiB", float64(n)/(1024*1024))
298
}
@@ -0,0 +1,298 @@1
package server2
3
import (4
"fmt"5
"html/template"6
"net/http"7
"path"8
"sort"9
"strings"10
"time"11
12
"gitlab.com/Timfa/bluegit/internal/access"13
"gitlab.com/Timfa/bluegit/internal/gitrepo"14
"gitlab.com/Timfa/bluegit/internal/highlight"15
"gitlab.com/Timfa/bluegit/internal/markdown"16
"gitlab.com/Timfa/bluegit/internal/store"17
)18
19
func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {20
v.Page = "overview"21
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)22
s.branchList(r, v, dir)23
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {24
row := commitRow(c)25
v.Head = &row26
}27
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")28
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)29
if err == nil {30
v.Files = fileRows(entries, "", touch)31
}32
readme, license := findDocs(entries)33
v.LicensePath = license34
if readme != "" {35
text, binary, err := gitrepo.Blob(r.Context(), s.Git, dir, v.Rev, readme, 200_000)36
if err == nil && !binary {37
v.ReadmeName = readme38
base := "/" + repo.FullPath() + "/-/blob/"39
v.Readme = template.HTML(markdown.Render(text, base, v.Rev))40
}41
}42
commits, branches, tags, _ := gitrepo.Stats(r.Context(), s.Git, dir, v.Rev)43
v.NCommits, v.NBranches, v.NTags = commits, branches, tags44
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {45
v.NReleases = len(rels)46
}47
v.Created = dutchDate(repo.CreatedAt)48
}49
50
func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string, isFile bool) {51
v.Page = "files"52
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)53
s.branchList(r, v, dir)54
all, _ := gitrepo.TreeAll(r.Context(), s.Git, dir, v.Rev)55
v.Tree = treeRows(all, rel)56
if !isFile {57
v.TreePath = rel58
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel)59
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)60
if err == nil {61
v.Files = fileRows(entries, rel, touch)62
}63
return64
}65
v.BlobPath = rel66
v.FileName = path.Base(rel)67
text, binary, err := gitrepo.Blob(r.Context(), s.Git, dir, v.Rev, rel, 200_000)68
if err != nil {69
return70
}71
v.Binary = binary72
if !binary {73
for i, line := range highlight.Lines(rel, text) {74
v.Lines = append(v.Lines, CodeLine{N: i + 1, HTML: template.HTML(line)})75
}76
}77
if n, err := gitrepo.BlobSize(r.Context(), s.Git, dir, v.Rev, rel); err == nil {78
v.BlobSize = formatSize(n)79
}80
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {81
row := commitRow(c)82
v.Head = &row83
}84
}85
86
func (s *Server) branchList(r *http.Request, v *View, dir string) {87
patterns, _ := s.Store.ProtectedPatterns(r.Context(), v.Repo.ID)88
v.RevProtected = access.BranchProtected(patterns, v.Rev)89
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)90
seen := false91
for _, name := range names {92
if name == v.Rev {93
seen = true94
}95
v.Branches = append(v.Branches, BranchRow{Name: name, Protected: access.BranchProtected(patterns, name)})96
}97
if v.Rev != "" && !seen {98
v.Branches = append([]BranchRow{{Name: v.Rev, Protected: v.RevProtected}}, v.Branches...)99
}100
}101
102
func (s *Server) tags(w http.ResponseWriter, r *http.Request) {103
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)104
if !ok {105
return106
}107
v := s.repoView(w, r, repo, role, "Tags")108
v.Wide = true109
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)110
v.TagNames, _ = gitrepo.Tags(r.Context(), s.Git, dir)111
s.render(w, "tags", v)112
}113
114
func commitRow(c gitrepo.Commit) CommitRow {115
return CommitRow{116
SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date,117
Subject: c.Subject, Body: c.Body, When: ago(c.Unix),118
}119
}120
121
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit) []FileRow {122
var out []FileRow123
for _, e := range entries {124
p := e.Name125
if base != "" {126
p = base + "/" + e.Name127
}128
row := FileRow{Name: e.Name, Path: p, Dir: e.Type == "tree", Icon: fileIcon(e.Name, e.Type)}129
if c, ok := touch[p]; ok {130
row.Subject = c.Subject131
row.When = ago(c.Unix)132
row.SHA = c.SHA133
}134
out = append(out, row)135
}136
sort.Slice(out, func(i, j int) bool {137
if out[i].Dir != out[j].Dir {138
return out[i].Dir139
}140
return strings.ToLower(out[i].Name) < strings.ToLower(out[j].Name)141
})142
return out143
}144
145
func treeRows(entries []gitrepo.Entry, current string) []FileRow {146
var out []FileRow147
for _, e := range entries {148
base := e.Name149
if i := strings.LastIndex(e.Name, "/"); i >= 0 {150
base = e.Name[i+1:]151
}152
depth := strings.Count(e.Name, "/")153
if depth > 8 {154
depth = 8155
}156
active := e.Name == current157
if e.Type == "tree" && (current == e.Name || strings.HasPrefix(current, e.Name+"/")) {158
active = true159
}160
out = append(out, FileRow{161
Name: base, Path: e.Name, Dir: e.Type == "tree", Icon: fileIcon(base, e.Type),162
Depth: depth, Active: active,163
})164
}165
return out166
}167
168
func findDocs(entries []gitrepo.Entry) (readme, license string) {169
readmeRank := 9170
for _, e := range entries {171
if e.Type != "blob" {172
continue173
}174
low := strings.ToLower(e.Name)175
rank := 9176
switch low {177
case "readme.md":178
rank = 0179
case "readme.markdown":180
rank = 1181
case "readme":182
rank = 2183
}184
if rank < readmeRank {185
readmeRank = rank186
readme = e.Name187
}188
switch low {189
case "license", "license.md", "license.txt", "licence", "copying":190
if license == "" || low == "license" {191
license = e.Name192
}193
}194
}195
return readme, license196
}197
198
func fileIcon(name, typ string) string {199
if typ == "tree" {200
return "dir"201
}202
switch strings.ToLower(path.Ext(name)) {203
case ".md", ".markdown":204
return "md"205
case ".png", ".jpg", ".jpeg", ".gif", ".svg", ".webp":206
return "img"207
case ".go", ".js", ".ts", ".py", ".rs", ".c", ".h", ".rb", ".sh":208
return "code"209
case ".yml", ".yaml", ".toml", ".json", ".lock":210
return "cfg"211
}212
base := strings.ToLower(name)213
if base == "license" || base == "licence" || base == "copying" || strings.HasPrefix(base, "license.") {214
return "lic"215
}216
if strings.HasPrefix(base, "readme") {217
return "md"218
}219
return "file"220
}221
222
func ago(unix int64) string {223
if unix <= 0 {224
return ""225
}226
d := time.Since(time.Unix(unix, 0))227
if d < time.Minute {228
return "zojuist"229
}230
if d < time.Hour {231
n := int(d.Minutes())232
if n < 1 {233
n = 1234
}235
if n == 1 {236
return "1 minuut geleden"237
}238
return fmt.Sprintf("%d minuten geleden", n)239
}240
if d < 24*time.Hour {241
n := int(d.Hours())242
if n == 1 {243
return "1 uur geleden"244
}245
return fmt.Sprintf("%d uur geleden", n)246
}247
days := int(d.Hours() / 24)248
if days < 1 {249
days = 1250
}251
if days == 1 {252
return "1 dag geleden"253
}254
if days < 14 {255
return fmt.Sprintf("%d dagen geleden", days)256
}257
if days < 60 {258
n := days / 7259
if n == 1 {260
return "1 week geleden"261
}262
return fmt.Sprintf("%d weken geleden", n)263
}264
if days < 365 {265
n := days / 30266
if n < 1 {267
n = 1268
}269
if n == 1 {270
return "1 maand geleden"271
}272
return fmt.Sprintf("%d maanden geleden", n)273
}274
n := days / 365275
if n == 1 {276
return "1 jaar geleden"277
}278
return fmt.Sprintf("%d jaar geleden", n)279
}280
281
func dutchDate(t time.Time) string {282
if t.IsZero() {283
return ""284
}285
months := []string{"", "januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"}286
t = t.Local()287
return fmt.Sprintf("%d %s %d", t.Day(), months[t.Month()], t.Year())288
}289
290
func formatSize(n int64) string {291
if n < 1024 {292
return fmt.Sprintf("%d B", n)293
}294
if n < 1024*1024 {295
return fmt.Sprintf("%.1f KiB", float64(n)/1024)296
}297
return fmt.Sprintf("%.1f MiB", float64(n)/(1024*1024))298
}@@ -61,17 +61,17 @@ func (s *Server) repoHome(w http.ResponseWriter, r *http.Request) {
61
61
if !ok {
62
62
return
63
63
}
64
v := s.repoView(w, r, repo, role, repo.FullPath())
65
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
66
commits, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 8)
67
v.Commits = toCommits(commits)
68
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")
69
if err == nil {
70
v.Entries = toEntries("", entries)
71
}
64
v := s.repoView(w, r, repo, role, repo.Name)
65
v.Wide = true
66
s.fillOverview(r, &v, repo)
72
67
s.render(w, "repo", v)
73
68
}
74
69
70
func (s *Server) treeRoot(w http.ResponseWriter, r *http.Request) {
71
r.SetPathValue("path", "")
72
s.tree(w, r)
73
}
74
75
75
func (s *Server) tree(w http.ResponseWriter, r *http.Request) {
76
76
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)
77
77
if !ok {
@@ -83,15 +83,14 @@ func (s *Server) tree(w http.ResponseWriter, r *http.Request) {
83
83
return
84
84
}
85
85
v := s.repoView(w, r, repo, role, rel)
86
v.Wide = true
86
87
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
87
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel)
88
if err != nil {
88
if _, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel); err != nil && rel != "" {
89
89
http.NotFound(w, r)
90
90
return
91
91
}
92
v.TreePath = rel
93
v.Entries = toEntries(rel, entries)
94
s.render(w, "tree", v)
92
s.fillFiles(r, &v, repo, rel, false)
93
s.render(w, "files", v)
95
94
}
96
95
97
96
func (s *Server) blob(w http.ResponseWriter, r *http.Request) {
@@ -105,16 +104,14 @@ func (s *Server) blob(w http.ResponseWriter, r *http.Request) {
105
104
return
106
105
}
107
106
v := s.repoView(w, r, repo, role, rel)
107
v.Wide = true
108
108
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
109
text, binary, err := gitrepo.Blob(r.Context(), s.Git, dir, v.Rev, rel, 200_000)
110
if err != nil {
109
if _, _, err := gitrepo.Blob(r.Context(), s.Git, dir, v.Rev, rel, 1); err != nil {
111
110
http.NotFound(w, r)
112
111
return
113
112
}
114
v.BlobPath = rel
115
v.Blob = text
116
v.Binary = binary
117
s.render(w, "blob", v)
113
s.fillFiles(r, &v, repo, rel, true)
114
s.render(w, "files", v)
118
115
}
119
116
120
117
func (s *Server) commits(w http.ResponseWriter, r *http.Request) {
@@ -123,6 +120,7 @@ func (s *Server) commits(w http.ResponseWriter, r *http.Request) {
123
120
return
124
121
}
125
122
v := s.repoView(w, r, repo, role, "Commits")
123
v.Page = "commits"
126
124
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
127
125
list, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 50)
128
126
v.Commits = toCommits(list)
@@ -157,6 +155,7 @@ func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
157
155
return
158
156
}
159
157
v := s.repoView(w, r, repo, role, "Branches")
158
v.Page = "branches"
160
159
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
161
160
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
162
161
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
@@ -172,6 +171,7 @@ func (s *Server) mergeRequests(w http.ResponseWriter, r *http.Request) {
172
171
return
173
172
}
174
173
v := s.repoView(w, r, repo, role, "Merge requests")
174
v.Page = "mrs"
175
175
v.MRs, _ = s.Store.ListMergeRequests(r.Context(), repo.ID)
176
176
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
177
177
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
@@ -61,17 +61,17 @@ func (s *Server) repoHome(w http.ResponseWriter, r *http.Request) {61
if !ok {61
if !ok {62
return62
return63
}63
}64
v := s.repoView(w, r, repo, role, repo.FullPath())64
v := s.repoView(w, r, repo, role, repo.Name)65
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)65
v.Wide = true66
commits, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 8)66
s.fillOverview(r, &v, repo)67
v.Commits = toCommits(commits)68
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")69
if err == nil {70
v.Entries = toEntries("", entries)71
}72
s.render(w, "repo", v)67
s.render(w, "repo", v)73
}68
}74
69
70
func (s *Server) treeRoot(w http.ResponseWriter, r *http.Request) {71
r.SetPathValue("path", "")72
s.tree(w, r)73
}74
75
func (s *Server) tree(w http.ResponseWriter, r *http.Request) {75
func (s *Server) tree(w http.ResponseWriter, r *http.Request) {76
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)76
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)77
if !ok {77
if !ok {@@ -83,15 +83,14 @@ func (s *Server) tree(w http.ResponseWriter, r *http.Request) {83
return83
return84
}84
}85
v := s.repoView(w, r, repo, role, rel)85
v := s.repoView(w, r, repo, role, rel)86
v.Wide = true86
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)87
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)87
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel)88
if _, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel); err != nil && rel != "" {88
if err != nil {89
http.NotFound(w, r)89
http.NotFound(w, r)90
return90
return91
}91
}92
v.TreePath = rel92
s.fillFiles(r, &v, repo, rel, false)93
v.Entries = toEntries(rel, entries)93
s.render(w, "files", v)94
s.render(w, "tree", v)95
}94
}96
95
97
func (s *Server) blob(w http.ResponseWriter, r *http.Request) {96
func (s *Server) blob(w http.ResponseWriter, r *http.Request) {@@ -105,16 +104,14 @@ func (s *Server) blob(w http.ResponseWriter, r *http.Request) {105
return104
return106
}105
}107
v := s.repoView(w, r, repo, role, rel)106
v := s.repoView(w, r, repo, role, rel)107
v.Wide = true108
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)108
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)109
text, binary, err := gitrepo.Blob(r.Context(), s.Git, dir, v.Rev, rel, 200_000)109
if _, _, err := gitrepo.Blob(r.Context(), s.Git, dir, v.Rev, rel, 1); err != nil {110
if err != nil {111
http.NotFound(w, r)110
http.NotFound(w, r)112
return111
return113
}112
}114
v.BlobPath = rel113
s.fillFiles(r, &v, repo, rel, true)115
v.Blob = text114
s.render(w, "files", v)116
v.Binary = binary117
s.render(w, "blob", v)118
}115
}119
116
120
func (s *Server) commits(w http.ResponseWriter, r *http.Request) {117
func (s *Server) commits(w http.ResponseWriter, r *http.Request) {@@ -123,6 +120,7 @@ func (s *Server) commits(w http.ResponseWriter, r *http.Request) {123
return120
return124
}121
}125
v := s.repoView(w, r, repo, role, "Commits")122
v := s.repoView(w, r, repo, role, "Commits")123
v.Page = "commits"126
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)124
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)127
list, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 50)125
list, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 50)128
v.Commits = toCommits(list)126
v.Commits = toCommits(list)@@ -157,6 +155,7 @@ func (s *Server) branches(w http.ResponseWriter, r *http.Request) {157
return155
return158
}156
}159
v := s.repoView(w, r, repo, role, "Branches")157
v := s.repoView(w, r, repo, role, "Branches")158
v.Page = "branches"160
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)159
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)161
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)160
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)162
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)161
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)@@ -172,6 +171,7 @@ func (s *Server) mergeRequests(w http.ResponseWriter, r *http.Request) {172
return171
return173
}172
}174
v := s.repoView(w, r, repo, role, "Merge requests")173
v := s.repoView(w, r, repo, role, "Merge requests")174
v.Page = "mrs"175
v.MRs, _ = s.Store.ListMergeRequests(r.Context(), repo.ID)175
v.MRs, _ = s.Store.ListMergeRequests(r.Context(), repo.ID)176
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)176
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)177
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)177
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)@@ -13,6 +13,7 @@ import (
13
13
"strings"
14
14
"sync"
15
15
"time"
16
"unicode/utf8"
16
17
17
18
"gitlab.com/Timfa/bluegit/internal/access"
18
19
"gitlab.com/Timfa/bluegit/internal/auth"
@@ -93,9 +94,11 @@ func (s *Server) Handler() http.Handler {
93
94
mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/releases", s.createRelease)
94
95
95
96
mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)
97
mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)
96
98
mux.HandleFunc("GET /{owner}/{repo}/-/tree/{path...}", s.tree)
97
99
mux.HandleFunc("GET /{owner}/{repo}/-/blob/{path...}", s.blob)
98
100
mux.HandleFunc("GET /{owner}/{repo}/-/commits", s.commits)
101
mux.HandleFunc("GET /{owner}/{repo}/-/tags", s.tags)
99
102
mux.HandleFunc("GET /{owner}/{repo}/-/commit/{sha}", s.commit)
100
103
mux.HandleFunc("GET /{owner}/{repo}/-/branches", s.branches)
101
104
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)
@@ -142,6 +145,21 @@ func (s *Server) mustTemplates() {
142
145
return v
143
146
},
144
147
"join": strings.Join,
148
"initial": func(s string) string {
149
s = strings.TrimSpace(s)
150
if s == "" {
151
return "?"
152
}
153
r, _ := utf8.DecodeRuneInString(s)
154
return strings.ToUpper(string(r))
155
},
156
"splitPath": func(p string) []string {
157
if p == "" {
158
return nil
159
}
160
return strings.Split(p, "/")
161
},
162
"iconOf": func(name string) string { return fileIcon(name, "blob") },
145
163
}).ParseFS(webFS, "templates/*.html"))
146
164
}
147
165
@@ -342,11 +360,43 @@ type View struct {
342
360
StorageFree string
343
361
StorageTotal string
344
362
MinFree string
363
Wide bool
364
Page string
365
Head *CommitRow
366
Files []FileRow
367
Tree []FileRow
368
Readme template.HTML
369
ReadmeName string
370
LicensePath string
371
NCommits int
372
NBranches int
373
NTags int
374
NReleases int
375
Created string
376
Lines []CodeLine
377
BlobSize string
378
FileName string
379
RevProtected bool
380
TagNames []string
381
}
382
383
// FileRow is een rij in de bestandstabel of de boom.
384
type FileRow struct {
385
Name, Path, Icon, Subject, When, SHA string
386
Dir bool
387
Depth int
388
Active bool
389
}
390
391
// CodeLine is één regel broncode.
392
type CodeLine struct {
393
N int
394
HTML template.HTML
345
395
}
346
396
347
397
// CommitRow is een commit in de interface.
348
398
type CommitRow struct {
349
SHA, Short, Author, Date, Subject, Body string
399
SHA, Short, Author, Date, Subject, Body, When string
350
400
}
351
401
352
402
// EntryRow is een bestand of map.
@@ -13,6 +13,7 @@ import (13
"strings"13
"strings"14
"sync"14
"sync"15
"time"15
"time"16
"unicode/utf8"16
17
17
"gitlab.com/Timfa/bluegit/internal/access"18
"gitlab.com/Timfa/bluegit/internal/access"18
"gitlab.com/Timfa/bluegit/internal/auth"19
"gitlab.com/Timfa/bluegit/internal/auth"@@ -93,9 +94,11 @@ func (s *Server) Handler() http.Handler {93
mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/releases", s.createRelease)94
mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/releases", s.createRelease)94
95
95
mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)96
mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)97
mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)96
mux.HandleFunc("GET /{owner}/{repo}/-/tree/{path...}", s.tree)98
mux.HandleFunc("GET /{owner}/{repo}/-/tree/{path...}", s.tree)97
mux.HandleFunc("GET /{owner}/{repo}/-/blob/{path...}", s.blob)99
mux.HandleFunc("GET /{owner}/{repo}/-/blob/{path...}", s.blob)98
mux.HandleFunc("GET /{owner}/{repo}/-/commits", s.commits)100
mux.HandleFunc("GET /{owner}/{repo}/-/commits", s.commits)101
mux.HandleFunc("GET /{owner}/{repo}/-/tags", s.tags)99
mux.HandleFunc("GET /{owner}/{repo}/-/commit/{sha}", s.commit)102
mux.HandleFunc("GET /{owner}/{repo}/-/commit/{sha}", s.commit)100
mux.HandleFunc("GET /{owner}/{repo}/-/branches", s.branches)103
mux.HandleFunc("GET /{owner}/{repo}/-/branches", s.branches)101
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)104
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)@@ -142,6 +145,21 @@ func (s *Server) mustTemplates() {142
return v145
return v143
},146
},144
"join": strings.Join,147
"join": strings.Join,148
"initial": func(s string) string {149
s = strings.TrimSpace(s)150
if s == "" {151
return "?"152
}153
r, _ := utf8.DecodeRuneInString(s)154
return strings.ToUpper(string(r))155
},156
"splitPath": func(p string) []string {157
if p == "" {158
return nil159
}160
return strings.Split(p, "/")161
},162
"iconOf": func(name string) string { return fileIcon(name, "blob") },145
}).ParseFS(webFS, "templates/*.html"))163
}).ParseFS(webFS, "templates/*.html"))146
}164
}147
165
@@ -342,11 +360,43 @@ type View struct {342
StorageFree string360
StorageFree string343
StorageTotal string361
StorageTotal string344
MinFree string362
MinFree string363
Wide bool364
Page string365
Head *CommitRow366
Files []FileRow367
Tree []FileRow368
Readme template.HTML369
ReadmeName string370
LicensePath string371
NCommits int372
NBranches int373
NTags int374
NReleases int375
Created string376
Lines []CodeLine377
BlobSize string378
FileName string379
RevProtected bool380
TagNames []string381
}382
383
// FileRow is een rij in de bestandstabel of de boom.384
type FileRow struct {385
Name, Path, Icon, Subject, When, SHA string386
Dir bool387
Depth int388
Active bool389
}390
391
// CodeLine is één regel broncode.392
type CodeLine struct {393
N int394
HTML template.HTML345
}395
}346
396
347
// CommitRow is een commit in de interface.397
// CommitRow is een commit in de interface.348
type CommitRow struct {398
type CommitRow struct {349
SHA, Short, Author, Date, Subject, Body string399
SHA, Short, Author, Date, Subject, Body, When string350
}400
}351
401
352
// EntryRow is een bestand of map.402
// EntryRow is een bestand of map.@@ -407,6 +407,218 @@ func TestNameBecomesSlug(t *testing.T) {
407
407
}
408
408
}
409
409
410
func TestProjectOverviewAndFiles(t *testing.T) {
411
if _, err := exec.LookPath("git"); err != nil {
412
t.Skip("git ontbreekt")
413
}
414
hook := filepath.Join(t.TempDir(), "bluegit")
415
build := exec.Command("go", "build", "-o", hook, "gitlab.com/Timfa/bluegit/cmd/bluegit")
416
build.Env = append(os.Environ(), "CGO_ENABLED=0")
417
if out, err := build.CombinedOutput(); err != nil {
418
t.Fatalf("hook bouwen: %v\n%s", err, out)
419
}
420
421
storage := t.TempDir()
422
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
423
if err != nil {
424
t.Fatal(err)
425
}
426
t.Cleanup(func() { _ = st.Close() })
427
cfg := config.Config{
428
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
429
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
430
Git: config.Git{Binary: "git", DefaultBranch: "master"},
431
SSH: config.SSH{Enabled: true, Listen: "0.0.0.0:2222", PublicHost: "git.timfalken.com", PublicPort: 22},
432
}
433
cfg.Auth.BaseURL = "https://auth.timfalken.com"
434
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: hook}
435
ts := httptest.NewServer(srv.Handler())
436
t.Cleanup(ts.Close)
437
438
jar, _ := cookiejar.New(nil)
439
client := &http.Client{Jar: jar}
440
res, err := client.Get(ts.URL + "/login")
441
if err != nil {
442
t.Fatal(err)
443
}
444
csrf := csrfOf(t, read(t, res))
445
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
446
"csrf": {csrf}, "name": {"legacy cycles"}, "description": {"Simulatie"}, "visibility": {"public"},
447
})
448
if err != nil {
449
t.Fatal(err)
450
}
451
created := read(t, res)
452
if !strings.Contains(created, "tim/legacy-cycles") || !strings.Contains(created, "Nog geen commits") {
453
t.Fatalf("lege repo:\n%s", created)
454
}
455
ctx := context.Background()
456
repo, err := st.RepoByPath(ctx, "tim", "legacy-cycles")
457
if err != nil {
458
t.Fatal(err)
459
}
460
pats, err := st.ProtectedPatterns(ctx, repo.ID)
461
if err != nil || len(pats) != 1 || pats[0] != "master" {
462
t.Fatalf("master hoort beschermd te zijn: %v %v", pats, err)
463
}
464
465
res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, created)}, "name": {"laptop"}})
466
if err != nil {
467
t.Fatal(err)
468
}
469
token := between(read(t, res), `<p class="code">`, "</p>")
470
work := t.TempDir()
471
git(t, work, "init", "-b", "master")
472
git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
473
git(t, work, "config", "user.name", "tim")
474
readme := "# Legacy Cycles\n\nEen kleine simulatie.\n\n| Sleutel | Waarde |\n| --- | --- |\n| Taal | Rust |\n| Netwerk | UDP |\n\nZie [regels](docs/regels.md).\n"
475
writeFile(t, filepath.Join(work, "README.md"), readme)
476
writeFile(t, filepath.Join(work, "LICENSE"), "MIT\n")
477
writeFile(t, filepath.Join(work, "Cargo.toml"), "[package]\nname = \"legacy-cycles\"\nversion = \"0.1.0\"\n\n# debug\n[profile.dev]\nopt-level = 1\n")
478
writeFile(t, filepath.Join(work, "src", "main.go"), "package main\n\nimport \"fmt\"\n\nfunc main() {\n\tfmt.Println(\"hallo\")\n}\n")
479
writeFile(t, filepath.Join(work, "crates", "sim", "lib.rs"), "pub fn tick() {}\n")
480
git(t, work, "add", ".")
481
git(t, work, "commit", "-m", "eerste commit")
482
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/legacy-cycles.git"
483
git(t, work, "remote", "add", "origin", remote)
484
git(t, work, "push", "-u", "origin", "master")
485
486
res, err = client.Get(ts.URL + "/tim/legacy-cycles")
487
if err != nil {
488
t.Fatal(err)
489
}
490
body := read(t, res)
491
for _, want := range []string{
492
`class="on">Overzicht`,
493
`/-/tree?rev=master">Bestanden`,
494
"Projectinformatie",
495
"Laatste commit",
496
"Laatste wijziging",
497
"eerste commit",
498
"Bestand zoeken",
499
`aria-label="Beschermd"`,
500
"Aangemaakt op",
501
"1 commit",
502
"<table class=\"md\">",
503
"<th>Sleutel</th>",
504
"<td>Rust</td>",
505
"/tim/legacy-cycles/-/blob/docs/regels.md?rev=master",
506
"/-/blob/README.md?rev=master\">README",
507
"/-/blob/LICENSE?rev=master\">LICENSE",
508
"/-/tree/crates?rev=master",
509
"/-/tree/src?rev=master",
510
"Simulatie",
511
"ssh://git@git.timfalken.com:22/tim/legacy-cycles.git",
512
} {
513
if !strings.Contains(body, want) {
514
t.Fatalf("overzicht mist %q\n%s", want, body)
515
}
516
}
517
crates := strings.Index(body, "/-/tree/crates")
518
cargo := strings.Index(body, "Cargo.toml")
519
if crates < 0 || cargo < 0 || crates > cargo {
520
t.Fatal("mappen horen voor bestanden")
521
}
522
523
res, err = client.Get(ts.URL + "/tim/legacy-cycles/-/tree")
524
if err != nil {
525
t.Fatal(err)
526
}
527
tree := read(t, res)
528
for _, want := range []string{
529
`class="on">Bestanden`,
530
`data-tree-filter`,
531
`data-path="src/main.go"`,
532
`data-path="crates/sim"`,
533
"Deze map is leeg",
534
} {
535
if want == "Deze map is leeg" {
536
if strings.Contains(tree, want) {
537
t.Fatalf("root is niet leeg:\n%s", tree)
538
}
539
continue
540
}
541
if !strings.Contains(tree, want) {
542
t.Fatalf("bestanden mist %q\n%s", want, tree)
543
}
544
}
545
546
res, err = client.Get(ts.URL + "/tim/legacy-cycles/-/blob/src/main.go")
547
if err != nil {
548
t.Fatal(err)
549
}
550
blob := read(t, res)
551
for _, want := range []string{
552
`class="on">Bestanden`,
553
`class="depth-1 active"`,
554
`data-path="src"`,
555
`<span class="hl-k">func</span>`,
556
`<span class="hl-s">"fmt"</span>`,
557
`class="ln">1`,
558
`<span>src</span>`,
559
`<span>main.go</span>`,
560
`main.go <span class="muted">`,
561
"Kopieer",
562
} {
563
if !strings.Contains(blob, want) {
564
t.Fatalf("blob mist %q\n%s", want, blob)
565
}
566
}
567
568
res, err = client.Get(ts.URL + "/tim/legacy-cycles/-/blob/Cargo.toml")
569
if err != nil {
570
t.Fatal(err)
571
}
572
toml := read(t, res)
573
if !strings.Contains(toml, `class="hl-s">"legacy-cycles"`) || !strings.Contains(toml, `class="hl-c"># debug`) || !strings.Contains(toml, `class="hl-n">1`) {
574
t.Fatalf("toml-kleuring:\n%s", toml)
575
}
576
577
ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
578
if err != nil {
579
t.Fatal(err)
580
}
581
if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
582
t.Fatal(err)
583
}
584
adaToken, err := st.CreateToken(ctx, ada.ID, "ada")
585
if err != nil {
586
t.Fatal(err)
587
}
588
adaWork := t.TempDir()
589
adaRemote := strings.Replace(ts.URL, "http://", "http://ada:"+adaToken+"@", 1) + "/tim/legacy-cycles.git"
590
git(t, adaWork, "clone", adaRemote, ".")
591
git(t, adaWork, "config", "user.email", "ada@users.git.timfalken.com")
592
git(t, adaWork, "config", "user.name", "ada")
593
writeFile(t, filepath.Join(adaWork, "README.md"), readme+"\nextra\n")
594
git(t, adaWork, "add", "README.md")
595
git(t, adaWork, "commit", "-m", "ada op master")
596
if out, err := gitOut(adaWork, "push", "origin", "master"); err == nil {
597
t.Fatalf("ontwikkelaar pushte master:\n%s", out)
598
} else if !strings.Contains(out, "beschermd") {
599
t.Fatalf("weigering zonder beschermd: %v\n%s", err, out)
600
}
601
git(t, adaWork, "checkout", "-b", "feature")
602
git(t, adaWork, "push", "-u", "origin", "feature")
603
}
604
605
func writeFile(t *testing.T, path, body string) {
606
t.Helper()
607
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
608
t.Fatal(err)
609
}
610
if err := os.WriteFile(path, []byte(body), 0o644); err != nil {
611
t.Fatal(err)
612
}
613
}
614
615
func gitOut(dir string, args ...string) (string, error) {
616
cmd := exec.Command("git", args...)
617
cmd.Dir = dir
618
out, err := cmd.CombinedOutput()
619
return string(out), err
620
}
621
410
622
func csrfOf(t *testing.T, body string) string {
411
623
t.Helper()
412
624
const needle = `name="csrf" value="`
@@ -407,6 +407,218 @@ func TestNameBecomesSlug(t *testing.T) {407
}407
}408
}408
}409
409
410
func TestProjectOverviewAndFiles(t *testing.T) {411
if _, err := exec.LookPath("git"); err != nil {412
t.Skip("git ontbreekt")413
}414
hook := filepath.Join(t.TempDir(), "bluegit")415
build := exec.Command("go", "build", "-o", hook, "gitlab.com/Timfa/bluegit/cmd/bluegit")416
build.Env = append(os.Environ(), "CGO_ENABLED=0")417
if out, err := build.CombinedOutput(); err != nil {418
t.Fatalf("hook bouwen: %v\n%s", err, out)419
}420
421
storage := t.TempDir()422
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())423
if err != nil {424
t.Fatal(err)425
}426
t.Cleanup(func() { _ = st.Close() })427
cfg := config.Config{428
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,429
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},430
Git: config.Git{Binary: "git", DefaultBranch: "master"},431
SSH: config.SSH{Enabled: true, Listen: "0.0.0.0:2222", PublicHost: "git.timfalken.com", PublicPort: 22},432
}433
cfg.Auth.BaseURL = "https://auth.timfalken.com"434
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: hook}435
ts := httptest.NewServer(srv.Handler())436
t.Cleanup(ts.Close)437
438
jar, _ := cookiejar.New(nil)439
client := &http.Client{Jar: jar}440
res, err := client.Get(ts.URL + "/login")441
if err != nil {442
t.Fatal(err)443
}444
csrf := csrfOf(t, read(t, res))445
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{446
"csrf": {csrf}, "name": {"legacy cycles"}, "description": {"Simulatie"}, "visibility": {"public"},447
})448
if err != nil {449
t.Fatal(err)450
}451
created := read(t, res)452
if !strings.Contains(created, "tim/legacy-cycles") || !strings.Contains(created, "Nog geen commits") {453
t.Fatalf("lege repo:\n%s", created)454
}455
ctx := context.Background()456
repo, err := st.RepoByPath(ctx, "tim", "legacy-cycles")457
if err != nil {458
t.Fatal(err)459
}460
pats, err := st.ProtectedPatterns(ctx, repo.ID)461
if err != nil || len(pats) != 1 || pats[0] != "master" {462
t.Fatalf("master hoort beschermd te zijn: %v %v", pats, err)463
}464
465
res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, created)}, "name": {"laptop"}})466
if err != nil {467
t.Fatal(err)468
}469
token := between(read(t, res), `<p class="code">`, "</p>")470
work := t.TempDir()471
git(t, work, "init", "-b", "master")472
git(t, work, "config", "user.email", "tim@users.git.timfalken.com")473
git(t, work, "config", "user.name", "tim")474
readme := "# Legacy Cycles\n\nEen kleine simulatie.\n\n| Sleutel | Waarde |\n| --- | --- |\n| Taal | Rust |\n| Netwerk | UDP |\n\nZie [regels](docs/regels.md).\n"475
writeFile(t, filepath.Join(work, "README.md"), readme)476
writeFile(t, filepath.Join(work, "LICENSE"), "MIT\n")477
writeFile(t, filepath.Join(work, "Cargo.toml"), "[package]\nname = \"legacy-cycles\"\nversion = \"0.1.0\"\n\n# debug\n[profile.dev]\nopt-level = 1\n")478
writeFile(t, filepath.Join(work, "src", "main.go"), "package main\n\nimport \"fmt\"\n\nfunc main() {\n\tfmt.Println(\"hallo\")\n}\n")479
writeFile(t, filepath.Join(work, "crates", "sim", "lib.rs"), "pub fn tick() {}\n")480
git(t, work, "add", ".")481
git(t, work, "commit", "-m", "eerste commit")482
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/legacy-cycles.git"483
git(t, work, "remote", "add", "origin", remote)484
git(t, work, "push", "-u", "origin", "master")485
486
res, err = client.Get(ts.URL + "/tim/legacy-cycles")487
if err != nil {488
t.Fatal(err)489
}490
body := read(t, res)491
for _, want := range []string{492
`class="on">Overzicht`,493
`/-/tree?rev=master">Bestanden`,494
"Projectinformatie",495
"Laatste commit",496
"Laatste wijziging",497
"eerste commit",498
"Bestand zoeken",499
`aria-label="Beschermd"`,500
"Aangemaakt op",501
"1 commit",502
"<table class=\"md\">",503
"<th>Sleutel</th>",504
"<td>Rust</td>",505
"/tim/legacy-cycles/-/blob/docs/regels.md?rev=master",506
"/-/blob/README.md?rev=master\">README",507
"/-/blob/LICENSE?rev=master\">LICENSE",508
"/-/tree/crates?rev=master",509
"/-/tree/src?rev=master",510
"Simulatie",511
"ssh://git@git.timfalken.com:22/tim/legacy-cycles.git",512
} {513
if !strings.Contains(body, want) {514
t.Fatalf("overzicht mist %q\n%s", want, body)515
}516
}517
crates := strings.Index(body, "/-/tree/crates")518
cargo := strings.Index(body, "Cargo.toml")519
if crates < 0 || cargo < 0 || crates > cargo {520
t.Fatal("mappen horen voor bestanden")521
}522
523
res, err = client.Get(ts.URL + "/tim/legacy-cycles/-/tree")524
if err != nil {525
t.Fatal(err)526
}527
tree := read(t, res)528
for _, want := range []string{529
`class="on">Bestanden`,530
`data-tree-filter`,531
`data-path="src/main.go"`,532
`data-path="crates/sim"`,533
"Deze map is leeg",534
} {535
if want == "Deze map is leeg" {536
if strings.Contains(tree, want) {537
t.Fatalf("root is niet leeg:\n%s", tree)538
}539
continue540
}541
if !strings.Contains(tree, want) {542
t.Fatalf("bestanden mist %q\n%s", want, tree)543
}544
}545
546
res, err = client.Get(ts.URL + "/tim/legacy-cycles/-/blob/src/main.go")547
if err != nil {548
t.Fatal(err)549
}550
blob := read(t, res)551
for _, want := range []string{552
`class="on">Bestanden`,553
`class="depth-1 active"`,554
`data-path="src"`,555
`<span class="hl-k">func</span>`,556
`<span class="hl-s">"fmt"</span>`,557
`class="ln">1`,558
`<span>src</span>`,559
`<span>main.go</span>`,560
`main.go <span class="muted">`,561
"Kopieer",562
} {563
if !strings.Contains(blob, want) {564
t.Fatalf("blob mist %q\n%s", want, blob)565
}566
}567
568
res, err = client.Get(ts.URL + "/tim/legacy-cycles/-/blob/Cargo.toml")569
if err != nil {570
t.Fatal(err)571
}572
toml := read(t, res)573
if !strings.Contains(toml, `class="hl-s">"legacy-cycles"`) || !strings.Contains(toml, `class="hl-c"># debug`) || !strings.Contains(toml, `class="hl-n">1`) {574
t.Fatalf("toml-kleuring:\n%s", toml)575
}576
577
ada, err := st.UpsertUser(ctx, 2, "ada", "", false)578
if err != nil {579
t.Fatal(err)580
}581
if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {582
t.Fatal(err)583
}584
adaToken, err := st.CreateToken(ctx, ada.ID, "ada")585
if err != nil {586
t.Fatal(err)587
}588
adaWork := t.TempDir()589
adaRemote := strings.Replace(ts.URL, "http://", "http://ada:"+adaToken+"@", 1) + "/tim/legacy-cycles.git"590
git(t, adaWork, "clone", adaRemote, ".")591
git(t, adaWork, "config", "user.email", "ada@users.git.timfalken.com")592
git(t, adaWork, "config", "user.name", "ada")593
writeFile(t, filepath.Join(adaWork, "README.md"), readme+"\nextra\n")594
git(t, adaWork, "add", "README.md")595
git(t, adaWork, "commit", "-m", "ada op master")596
if out, err := gitOut(adaWork, "push", "origin", "master"); err == nil {597
t.Fatalf("ontwikkelaar pushte master:\n%s", out)598
} else if !strings.Contains(out, "beschermd") {599
t.Fatalf("weigering zonder beschermd: %v\n%s", err, out)600
}601
git(t, adaWork, "checkout", "-b", "feature")602
git(t, adaWork, "push", "-u", "origin", "feature")603
}604
605
func writeFile(t *testing.T, path, body string) {606
t.Helper()607
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {608
t.Fatal(err)609
}610
if err := os.WriteFile(path, []byte(body), 0o644); err != nil {611
t.Fatal(err)612
}613
}614
615
func gitOut(dir string, args ...string) (string, error) {616
cmd := exec.Command("git", args...)617
cmd.Dir = dir618
out, err := cmd.CombinedOutput()619
return string(out), err620
}621
410
func csrfOf(t *testing.T, body string) string {622
func csrfOf(t *testing.T, body string) string {411
t.Helper()623
t.Helper()412
const needle = `name="csrf" value="`624
const needle = `name="csrf" value="`@@ -0,0 +1,84 @@
1
(function () {
2
function copyNow(value) {
3
var area = document.createElement("textarea");
4
area.value = value;
5
area.setAttribute("readonly", "");
6
area.style.position = "fixed";
7
area.style.top = "0";
8
area.style.left = "0";
9
area.style.opacity = "0";
10
document.body.appendChild(area);
11
area.focus();
12
area.select();
13
var ok = false;
14
try {
15
ok = document.execCommand("copy");
16
} catch (e) {
17
ok = false;
18
}
19
document.body.removeChild(area);
20
return ok;
21
}
22
document.querySelectorAll("[data-copy]").forEach(function (btn) {
23
btn.addEventListener("click", function () {
24
var value = btn.getAttribute("data-copy") || "";
25
var shown = false;
26
function mark() {
27
if (shown) {
28
return;
29
}
30
shown = true;
31
var old = btn.textContent;
32
btn.textContent = "Gekopieerd";
33
setTimeout(function () { btn.textContent = old; }, 1200);
34
}
35
if (copyNow(value)) {
36
mark();
37
}
38
if (navigator.clipboard && window.isSecureContext) {
39
navigator.clipboard.writeText(value).then(mark).catch(function () {});
40
}
41
});
42
});
43
document.querySelectorAll("select[data-rev]").forEach(function (sel) {
44
sel.addEventListener("change", function () {
45
var url = new URL(window.location.href);
46
url.searchParams.set("rev", sel.value);
47
window.location = url.toString();
48
});
49
});
50
var filter = document.querySelector("[data-tree-filter]");
51
if (filter) {
52
var items = document.querySelectorAll(".treelist li");
53
filter.addEventListener("input", function () {
54
var q = filter.value.trim().toLowerCase();
55
var paths = [];
56
items.forEach(function (li) {
57
paths.push((li.getAttribute("data-path") || "").toLowerCase());
58
});
59
items.forEach(function (li, i) {
60
if (q === "") {
61
li.hidden = false;
62
return;
63
}
64
var path = paths[i];
65
if (path.indexOf(q) !== -1) {
66
li.hidden = false;
67
return;
68
}
69
var prefix = path + "/";
70
var child = false;
71
for (var j = 0; j < paths.length; j++) {
72
if (paths[j].indexOf(prefix) === 0 && paths[j].indexOf(q) !== -1) {
73
child = true;
74
break;
75
}
76
}
77
li.hidden = !child;
78
});
79
});
80
if (new URLSearchParams(window.location.search).get("focus") === "1") {
81
filter.focus();
82
}
83
}
84
})();
@@ -0,0 +1,84 @@1
(function () {2
function copyNow(value) {3
var area = document.createElement("textarea");4
area.value = value;5
area.setAttribute("readonly", "");6
area.style.position = "fixed";7
area.style.top = "0";8
area.style.left = "0";9
area.style.opacity = "0";10
document.body.appendChild(area);11
area.focus();12
area.select();13
var ok = false;14
try {15
ok = document.execCommand("copy");16
} catch (e) {17
ok = false;18
}19
document.body.removeChild(area);20
return ok;21
}22
document.querySelectorAll("[data-copy]").forEach(function (btn) {23
btn.addEventListener("click", function () {24
var value = btn.getAttribute("data-copy") || "";25
var shown = false;26
function mark() {27
if (shown) {28
return;29
}30
shown = true;31
var old = btn.textContent;32
btn.textContent = "Gekopieerd";33
setTimeout(function () { btn.textContent = old; }, 1200);34
}35
if (copyNow(value)) {36
mark();37
}38
if (navigator.clipboard && window.isSecureContext) {39
navigator.clipboard.writeText(value).then(mark).catch(function () {});40
}41
});42
});43
document.querySelectorAll("select[data-rev]").forEach(function (sel) {44
sel.addEventListener("change", function () {45
var url = new URL(window.location.href);46
url.searchParams.set("rev", sel.value);47
window.location = url.toString();48
});49
});50
var filter = document.querySelector("[data-tree-filter]");51
if (filter) {52
var items = document.querySelectorAll(".treelist li");53
filter.addEventListener("input", function () {54
var q = filter.value.trim().toLowerCase();55
var paths = [];56
items.forEach(function (li) {57
paths.push((li.getAttribute("data-path") || "").toLowerCase());58
});59
items.forEach(function (li, i) {60
if (q === "") {61
li.hidden = false;62
return;63
}64
var path = paths[i];65
if (path.indexOf(q) !== -1) {66
li.hidden = false;67
return;68
}69
var prefix = path + "/";70
var child = false;71
for (var j = 0; j < paths.length; j++) {72
if (paths[j].indexOf(prefix) === 0 && paths[j].indexOf(q) !== -1) {73
child = true;74
break;75
}76
}77
li.hidden = !child;78
});79
});80
if (new URLSearchParams(window.location.search).get("focus") === "1") {81
filter.focus();82
}83
}84
})();@@ -65,3 +65,88 @@ td, th { text-align: left; padding: 0.4rem 0.3rem; border-bottom: 1px solid var(
65
65
.hero, .grid-2 { grid-template-columns: 1fr; }
66
66
main { padding: 0.8rem; }
67
67
}
68
main.wide { max-width: 1180px; }
69
.sub a.on { border-bottom: 2px solid var(--blue); color: var(--ink); }
70
.crumbs { color: var(--muted); margin: 0 0 0.4rem; }
71
.crumbs a { color: var(--muted); text-decoration: none; }
72
.projhead { display: flex; align-items: center; gap: 0.7rem; }
73
.projhead h1 { margin: 0; font-size: 1.6rem; }
74
.tile {
75
width: 42px; height: 42px; border-radius: 8px; display: grid; place-items: center;
76
background: #e56a93; color: white; font-weight: 700; font-size: 1.2rem;
77
}
78
.vis { width: 18px; height: 18px; color: var(--muted); }
79
.ficon { width: 16px; height: 16px; vertical-align: -2px; margin-right: 0.25rem; }
80
.proj { display: grid; grid-template-columns: minmax(0, 1fr) 260px; gap: 1.2rem; align-items: start; }
81
.toolbar { display: flex; justify-content: space-between; gap: 0.8rem; align-items: center; margin: 0.9rem 0; flex-wrap: wrap; }
82
.toolbar .left, .toolbar .right { display: flex; gap: 0.45rem; align-items: center; flex-wrap: wrap; }
83
.branch select { width: auto; border-radius: 8px; padding: 0.35rem 0.5rem; background: #f6f8fa; }
84
.pathnow { color: var(--ink); }
85
.pathnow a { color: inherit; text-decoration: none; }
86
.menu { position: relative; }
87
.menu summary { list-style: none; cursor: pointer; }
88
.menu summary::-webkit-details-marker { display: none; }
89
.menu-panel {
90
position: absolute; right: 0; top: 2.3rem; z-index: 4; width: min(420px, 80vw);
91
background: white; border: 1px solid var(--line); border-radius: 12px; padding: 0.8rem;
92
box-shadow: var(--shadow);
93
}
94
.copyline { display: flex; gap: 0.4rem; }
95
.copyline input { font-family: ui-monospace, monospace; font-size: 0.85rem; }
96
.commitbar {
97
display: flex; gap: 0.7rem; align-items: center; background: #f6f8fa;
98
border: 1px solid var(--line); border-radius: 10px; padding: 0.55rem 0.75rem; margin: 0.4rem 0 0.8rem;
99
}
100
.commitbar .grow { flex: 1; min-width: 0; }
101
.commitbar .grow a { display: block; font-weight: 650; color: inherit; text-decoration: none; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
102
.avatar {
103
width: 32px; height: 32px; border-radius: 50%; background: #d5e0ee; color: var(--ink);
104
display: grid; place-items: center; font-size: 0.85rem; font-weight: 700; flex: none;
105
}
106
.sha { background: white; border: 1px solid var(--line); border-radius: 6px; padding: 0.15rem 0.4rem; }
107
.iconbtn, .copyline button {
108
background: white; color: var(--ink); border: 1px solid var(--line); border-radius: 8px;
109
padding: 0.3rem 0.55rem; cursor: pointer; font: inherit;
110
}
111
table.files { background: white; border: 1px solid var(--line); border-radius: 10px; overflow: hidden; }
112
table.files th { color: var(--muted); font-weight: 600; font-size: 0.92rem; }
113
table.files td.msg { max-width: 280px; }
114
table.files td.msg a { display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: inherit; text-decoration: none; }
115
.readme, .codebox, .side {
116
background: white; border: 1px solid var(--line); border-radius: 12px; margin-top: 1rem;
117
}
118
.readme header, .codebox header { padding: 0.7rem 1rem; border-bottom: 1px solid var(--line); font-weight: 600; }
119
.mdbody { padding: 0.2rem 1.1rem 1rem; }
120
.mdbody h1, .mdbody h2, .mdbody h3 { margin: 1rem 0 0.4rem; }
121
table.md { margin: 0.6rem 0 1rem; }
122
table.md th, table.md td { border: 1px solid var(--line); padding: 0.4rem 0.6rem; }
123
.side { margin-top: 0.2rem; padding: 0.9rem 1rem; }
124
.side h2 { margin: 0 0 0.5rem; font-size: 1rem; }
125
.counts { list-style: none; padding: 0; margin: 0.6rem 0; }
126
.counts li { padding: 0.28rem 0; }
127
.counts a { text-decoration: none; }
128
.fileview { display: grid; grid-template-columns: 240px minmax(0, 1fr); gap: 1rem; align-items: start; }
129
.treebox h2 { margin: 0 0 0.5rem; font-size: 1.15rem; }
130
.treelist { list-style: none; padding: 0; margin: 0.5rem 0 0; }
131
.treelist li { padding: 0.18rem 0.3rem; border-radius: 6px; white-space: nowrap; }
132
.treelist li a { color: inherit; text-decoration: none; }
133
.treelist li.active { background: #ddf4ff; }
134
.treelist li.depth-1 { padding-left: 0.9rem; }
135
.treelist li.depth-2 { padding-left: 1.6rem; }
136
.treelist li.depth-3 { padding-left: 2.3rem; }
137
.treelist li.depth-4 { padding-left: 3rem; }
138
.treelist li.depth-5 { padding-left: 3.7rem; }
139
.treelist li.depth-6, .treelist li.depth-7, .treelist li.depth-8 { padding-left: 4.4rem; }
140
.filename { display: flex; align-items: center; gap: 0.35rem; margin: 0.2rem 0 0.6rem; }
141
.codebox { margin-top: 0.8rem; overflow: auto; }
142
table.code { border-collapse: collapse; width: 100%; }
143
table.code td { border: 0; padding: 0 0.7rem; vertical-align: top; font-family: ui-monospace, monospace; font-size: 0.86rem; line-height: 1.45; }
144
table.code td.ln { color: #8c959f; text-align: right; width: 1%; user-select: none; background: #f6f8fa; }
145
table.code td.src { white-space: pre; }
146
.hl-k { color: #8250df; }
147
.hl-s { color: #cf222e; }
148
.hl-c { color: #6e7781; }
149
.hl-n { color: #0550ae; }
150
@media (max-width: 800px) {
151
.proj, .fileview { grid-template-columns: 1fr; }
152
}
@@ -65,3 +65,88 @@ td, th { text-align: left; padding: 0.4rem 0.3rem; border-bottom: 1px solid var(65
.hero, .grid-2 { grid-template-columns: 1fr; }65
.hero, .grid-2 { grid-template-columns: 1fr; }66
main { padding: 0.8rem; }66
main { padding: 0.8rem; }67
}67
}68
main.wide { max-width: 1180px; }69
.sub a.on { border-bottom: 2px solid var(--blue); color: var(--ink); }70
.crumbs { color: var(--muted); margin: 0 0 0.4rem; }71
.crumbs a { color: var(--muted); text-decoration: none; }72
.projhead { display: flex; align-items: center; gap: 0.7rem; }73
.projhead h1 { margin: 0; font-size: 1.6rem; }74
.tile {75
width: 42px; height: 42px; border-radius: 8px; display: grid; place-items: center;76
background: #e56a93; color: white; font-weight: 700; font-size: 1.2rem;77
}78
.vis { width: 18px; height: 18px; color: var(--muted); }79
.ficon { width: 16px; height: 16px; vertical-align: -2px; margin-right: 0.25rem; }80
.proj { display: grid; grid-template-columns: minmax(0, 1fr) 260px; gap: 1.2rem; align-items: start; }81
.toolbar { display: flex; justify-content: space-between; gap: 0.8rem; align-items: center; margin: 0.9rem 0; flex-wrap: wrap; }82
.toolbar .left, .toolbar .right { display: flex; gap: 0.45rem; align-items: center; flex-wrap: wrap; }83
.branch select { width: auto; border-radius: 8px; padding: 0.35rem 0.5rem; background: #f6f8fa; }84
.pathnow { color: var(--ink); }85
.pathnow a { color: inherit; text-decoration: none; }86
.menu { position: relative; }87
.menu summary { list-style: none; cursor: pointer; }88
.menu summary::-webkit-details-marker { display: none; }89
.menu-panel {90
position: absolute; right: 0; top: 2.3rem; z-index: 4; width: min(420px, 80vw);91
background: white; border: 1px solid var(--line); border-radius: 12px; padding: 0.8rem;92
box-shadow: var(--shadow);93
}94
.copyline { display: flex; gap: 0.4rem; }95
.copyline input { font-family: ui-monospace, monospace; font-size: 0.85rem; }96
.commitbar {97
display: flex; gap: 0.7rem; align-items: center; background: #f6f8fa;98
border: 1px solid var(--line); border-radius: 10px; padding: 0.55rem 0.75rem; margin: 0.4rem 0 0.8rem;99
}100
.commitbar .grow { flex: 1; min-width: 0; }101
.commitbar .grow a { display: block; font-weight: 650; color: inherit; text-decoration: none; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }102
.avatar {103
width: 32px; height: 32px; border-radius: 50%; background: #d5e0ee; color: var(--ink);104
display: grid; place-items: center; font-size: 0.85rem; font-weight: 700; flex: none;105
}106
.sha { background: white; border: 1px solid var(--line); border-radius: 6px; padding: 0.15rem 0.4rem; }107
.iconbtn, .copyline button {108
background: white; color: var(--ink); border: 1px solid var(--line); border-radius: 8px;109
padding: 0.3rem 0.55rem; cursor: pointer; font: inherit;110
}111
table.files { background: white; border: 1px solid var(--line); border-radius: 10px; overflow: hidden; }112
table.files th { color: var(--muted); font-weight: 600; font-size: 0.92rem; }113
table.files td.msg { max-width: 280px; }114
table.files td.msg a { display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: inherit; text-decoration: none; }115
.readme, .codebox, .side {116
background: white; border: 1px solid var(--line); border-radius: 12px; margin-top: 1rem;117
}118
.readme header, .codebox header { padding: 0.7rem 1rem; border-bottom: 1px solid var(--line); font-weight: 600; }119
.mdbody { padding: 0.2rem 1.1rem 1rem; }120
.mdbody h1, .mdbody h2, .mdbody h3 { margin: 1rem 0 0.4rem; }121
table.md { margin: 0.6rem 0 1rem; }122
table.md th, table.md td { border: 1px solid var(--line); padding: 0.4rem 0.6rem; }123
.side { margin-top: 0.2rem; padding: 0.9rem 1rem; }124
.side h2 { margin: 0 0 0.5rem; font-size: 1rem; }125
.counts { list-style: none; padding: 0; margin: 0.6rem 0; }126
.counts li { padding: 0.28rem 0; }127
.counts a { text-decoration: none; }128
.fileview { display: grid; grid-template-columns: 240px minmax(0, 1fr); gap: 1rem; align-items: start; }129
.treebox h2 { margin: 0 0 0.5rem; font-size: 1.15rem; }130
.treelist { list-style: none; padding: 0; margin: 0.5rem 0 0; }131
.treelist li { padding: 0.18rem 0.3rem; border-radius: 6px; white-space: nowrap; }132
.treelist li a { color: inherit; text-decoration: none; }133
.treelist li.active { background: #ddf4ff; }134
.treelist li.depth-1 { padding-left: 0.9rem; }135
.treelist li.depth-2 { padding-left: 1.6rem; }136
.treelist li.depth-3 { padding-left: 2.3rem; }137
.treelist li.depth-4 { padding-left: 3rem; }138
.treelist li.depth-5 { padding-left: 3.7rem; }139
.treelist li.depth-6, .treelist li.depth-7, .treelist li.depth-8 { padding-left: 4.4rem; }140
.filename { display: flex; align-items: center; gap: 0.35rem; margin: 0.2rem 0 0.6rem; }141
.codebox { margin-top: 0.8rem; overflow: auto; }142
table.code { border-collapse: collapse; width: 100%; }143
table.code td { border: 0; padding: 0 0.7rem; vertical-align: top; font-family: ui-monospace, monospace; font-size: 0.86rem; line-height: 1.45; }144
table.code td.ln { color: #8c959f; text-align: right; width: 1%; user-select: none; background: #f6f8fa; }145
table.code td.src { white-space: pre; }146
.hl-k { color: #8250df; }147
.hl-s { color: #cf222e; }148
.hl-c { color: #6e7781; }149
.hl-n { color: #0550ae; }150
@media (max-width: 800px) {151
.proj, .fileview { grid-template-columns: 1fr; }152
}@@ -23,7 +23,7 @@
23
23
{{end}}
24
24
</nav>
25
25
</header>
26
<main>
26
<main{{if .Wide}} class="wide"{{end}}>
27
27
{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
28
28
{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
29
29
{{end}}
@@ -36,8 +36,9 @@
36
36
37
37
{{define "repotabs"}}
38
38
<p class="sub">
39
<a href="/{{.Repo.FullPath}}">Bestanden</a>
40
<a href="/{{.Repo.FullPath}}/-/commits">Commits</a>
39
<a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "overview"}} class="on"{{end}}>Overzicht</a>
40
<a href="/{{.Repo.FullPath}}/-/tree{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "files"}} class="on"{{end}}>Bestanden</a>
41
<a href="/{{.Repo.FullPath}}/-/commits{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "commits"}} class="on"{{end}}>Commits</a>
41
42
<a href="/{{.Repo.FullPath}}/-/branches">Branches</a>
42
43
<a href="/{{.Repo.FullPath}}/-/merge-requests">Merge requests</a>
43
44
<a href="/{{.Repo.FullPath}}/-/pipelines">Pipelines</a>
@@ -23,7 +23,7 @@23
{{end}}23
{{end}}24
</nav>24
</nav>25
</header>25
</header>26
<main>26
<main{{if .Wide}} class="wide"{{end}}>27
{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}27
{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}28
{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}28
{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}29
{{end}}29
{{end}}@@ -36,8 +36,9 @@36
36
37
{{define "repotabs"}}37
{{define "repotabs"}}38
<p class="sub">38
<p class="sub">39
<a href="/{{.Repo.FullPath}}">Bestanden</a>39
<a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "overview"}} class="on"{{end}}>Overzicht</a>40
<a href="/{{.Repo.FullPath}}/-/commits">Commits</a>40
<a href="/{{.Repo.FullPath}}/-/tree{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "files"}} class="on"{{end}}>Bestanden</a>41
<a href="/{{.Repo.FullPath}}/-/commits{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "commits"}} class="on"{{end}}>Commits</a>41
<a href="/{{.Repo.FullPath}}/-/branches">Branches</a>42
<a href="/{{.Repo.FullPath}}/-/branches">Branches</a>42
<a href="/{{.Repo.FullPath}}/-/merge-requests">Merge requests</a>43
<a href="/{{.Repo.FullPath}}/-/merge-requests">Merge requests</a>43
<a href="/{{.Repo.FullPath}}/-/pipelines">Pipelines</a>44
<a href="/{{.Repo.FullPath}}/-/pipelines">Pipelines</a>@@ -138,41 +138,179 @@
138
138
{{template "layout-end" .}}
139
139
{{end}}
140
140
141
{{define "ficon"}}
142
{{if eq . "dir"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#8aa0b8" d="M1.5 3.5A1.5 1.5 0 0 1 3 2h3l1.2 1.5H13A1.5 1.5 0 0 1 14.5 5v7.2a1.3 1.3 0 0 1-1.3 1.3H2.8A1.3 1.3 0 0 1 1.5 12.2z"/></svg>
143
{{else if eq . "md"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#1f6feb" d="M2 3h12v10H2z"/><path fill="#fff" d="M4 10V6h1.2l1.3 2 1.3-2H9v4H7.8V8L6.5 10 5.2 8v2zm6.2 0V8.2H9l1.8-2.2h1.4L10.6 8.2H12V10z"/></svg>
144
{{else if eq . "code"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#cf222e" d="M6.2 4.2 2.4 8l3.8 3.8-1.1 1.1L.2 8l4.9-4.9zm3.6 0 1.1-1.1L15.8 8l-4.9 4.9-1.1-1.1L13.6 8z"/></svg>
145
{{else if eq . "cfg"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#9a6700" d="M8 1.5 14 5v6l-6 3.5L2 11V5z"/></svg>
146
{{else if eq . "lic"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#8250df" d="M4 1.5h8v13l-4-2.2-4 2.2z"/></svg>
147
{{else if eq . "img"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#1a7f37" d="M2 3h12v10H2z"/><circle cx="6" cy="6.5" r="1.2" fill="#fff"/><path fill="#fff" d="m3.5 11 3-3 2 2 1.5-1.5 2.5 2.5z"/></svg>
148
{{else}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#6e7781" d="M4 1.5h5l3 3V14H4z"/><path fill="#fff" d="M9 1.5v3h3"/></svg>
149
{{end}}
150
{{end}}
151
152
{{define "visicon"}}
153
{{if eq .Repo.Visibility "public"}}<svg class="vis" viewBox="0 0 16 16" aria-label="Openbaar"><circle cx="8" cy="8" r="6" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.2" d="M2 8h12M8 2c1.8 1.8 1.8 10.2 0 12M8 2c-1.8 1.8-1.8 10.2 0 12"/></svg>
154
{{else}}<svg class="vis" viewBox="0 0 16 16" aria-label="Privé"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>
155
{{end}}
156
{{end}}
157
158
{{define "branchpick"}}
159
<label class="branch">
160
<select data-rev>
161
{{range .Branches}}<option value="{{.Name}}" {{if eq .Name $.Rev}}selected{{end}}>{{.Name}}</option>{{end}}
162
</select>
163
</label>
164
{{if .RevProtected}}<svg class="vis" viewBox="0 0 16 16" aria-label="Beschermd"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>{{end}}
165
{{end}}
166
167
{{define "commitbar"}}
168
{{if .Head}}
169
<div class="commitbar">
170
<span class="avatar">{{initial .Head.Author}}</span>
171
<div class="grow">
172
<a href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>
173
<div class="muted">{{.Head.Author}} · {{.Head.When}}</div>
174
</div>
175
<code class="sha">{{slice .Head.SHA 0 8}}</code>
176
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="Kopieer">Kopieer</button>
177
<a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">Geschiedenis</a>
178
</div>
179
{{end}}
180
{{end}}
181
182
{{define "codemenu"}}
183
<details class="menu">
184
<summary class="btn ghost">Code</summary>
185
<div class="menu-panel">
186
{{if .CloneSSH}}
187
<p class="muted">SSH</p>
188
<div class="copyline"><input readonly value="{{.CloneSSH}}"><button type="button" data-copy="{{.CloneSSH}}">Kopieer</button></div>
189
{{end}}
190
<p class="muted">HTTPS</p>
191
<div class="copyline"><input readonly value="{{.CloneHTTP}}"><button type="button" data-copy="{{.CloneHTTP}}">Kopieer</button></div>
192
<p class="muted">Gebruikersnaam en een token als wachtwoord.</p>
193
</div>
194
</details>
195
{{end}}
196
197
{{define "filetable"}}
198
{{if .Files}}
199
<table class="files">
200
<thead><tr><th>Naam</th><th>Laatste commit</th><th>Laatste wijziging</th></tr></thead>
201
<tbody>
202
{{range .Files}}
203
<tr>
204
<td>{{template "ficon" .Icon}} {{if .Dir}}<a href="/{{$.Repo.FullPath}}/-/tree/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{else}}<a href="/{{$.Repo.FullPath}}/-/blob/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{end}}</td>
205
<td class="msg">{{if .SHA}}<a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a>{{end}}</td>
206
<td class="muted">{{.When}}</td>
207
</tr>
208
{{end}}
209
</tbody>
210
</table>
211
{{else if eq .Page "files"}}<p class="muted">Deze map is leeg.</p>{{else if not .Head}}<p class="panel">Nog geen commits.</p>{{end}}
212
{{end}}
213
141
214
{{define "repo"}}
142
215
{{template "layout-start" .}}
143
<h1>{{.Repo.FullPath}}</h1>
216
<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<span>{{.Repo.OwnerPath}}</span>{{end}} / <span>{{.Repo.Name}}</span></p>
144
217
{{template "repotabs" .}}
145
<p>{{.Repo.Description}}</p>
146
<p class="code">git clone {{.CloneHTTP}}{{if .CloneSSH}}
147
git clone {{.CloneSSH}}{{end}}</p>
148
<p class="muted">HTTPS: gebruik je gebruikersnaam en een toegangstoken als wachtwoord. Branch {{.Rev}}.</p>
149
{{if not .Commits}}<p class="panel">Nog geen commits.</p>{{end}}
150
<ul class="clean">
151
{{range .Entries}}<li>{{if eq .Type "tree"}}<a href="/{{$.Repo.FullPath}}/-/tree/{{.Path}}?rev={{$.Rev}}">{{.Name}}/</a>{{else}}<a href="/{{$.Repo.FullPath}}/-/blob/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{end}}</li>{{end}}
152
</ul>
153
<h2>Recente commits</h2>
154
<ul class="clean">
155
{{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Short}}</a> {{.Subject}} <span class="muted">{{.Author}} · {{.Date}}</span></li>{{end}}
156
</ul>
218
<div class="projhead">
219
<span class="tile">{{initial .Repo.Name}}</span>
220
<h1>{{.Repo.Name}}</h1>
221
{{template "visicon" .}}
222
</div>
223
<div class="proj">
224
<div>
225
<div class="toolbar">
226
<div class="left">{{template "branchpick" .}} <span class="pathnow">{{.Repo.Name}}</span></div>
227
<div class="right">
228
<a class="btn ghost" href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}&focus=1">Bestand zoeken</a>
229
{{template "codemenu" .}}
230
</div>
231
</div>
232
{{template "commitbar" .}}
233
{{template "filetable" .}}
234
{{if .ReadmeName}}
235
<article class="readme">
236
<header>{{template "ficon" "md"}} {{.ReadmeName}}</header>
237
<div class="mdbody">{{.Readme}}</div>
238
</article>
239
{{end}}
240
</div>
241
<aside class="side">
242
<h2>Projectinformatie</h2>
243
{{if .Repo.Description}}<p>{{.Repo.Description}}</p>{{end}}
244
<ul class="counts">
245
<li><a href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{.NCommits}} {{if eq .NCommits 1}}commit{{else}}commits{{end}}</a></li>
246
<li><a href="/{{.Repo.FullPath}}/-/branches">{{.NBranches}} {{if eq .NBranches 1}}branch{{else}}branches{{end}}</a></li>
247
<li><a href="/{{.Repo.FullPath}}/-/tags">{{.NTags}} {{if eq .NTags 1}}tag{{else}}tags{{end}}</a></li>
248
<li><a href="/{{.Repo.FullPath}}/-/releases">{{.NReleases}} {{if eq .NReleases 1}}release{{else}}releases{{end}}</a></li>
249
</ul>
250
{{if .ReadmeName}}<p><a href="/{{.Repo.FullPath}}/-/blob/{{.ReadmeName}}?rev={{.Rev}}">README</a></p>{{end}}
251
{{if .LicensePath}}<p><a href="/{{.Repo.FullPath}}/-/blob/{{.LicensePath}}?rev={{.Rev}}">LICENSE</a></p>{{end}}
252
{{if .Created}}<p class="muted">Aangemaakt op {{.Created}}</p>{{end}}
253
</aside>
254
</div>
255
<script src="/assets/repo.js"></script>
157
256
{{template "layout-end" .}}
158
257
{{end}}
159
258
160
{{define "tree"}}
259
{{define "files"}}
161
260
{{template "layout-start" .}}
162
<h1>{{.Repo.Name}}</h1>
261
<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<span>{{.Repo.OwnerPath}}</span>{{end}} / <a href="/{{.Repo.FullPath}}?rev={{.Rev}}">{{.Repo.Name}}</a></p>
163
262
{{template "repotabs" .}}
164
<p class="muted">{{.TreePath}}</p>
165
<ul class="clean">
166
{{range .Entries}}<li>{{if eq .Type "tree"}}<a href="/{{$.Repo.FullPath}}/-/tree/{{.Path}}?rev={{$.Rev}}">{{.Name}}/</a>{{else}}<a href="/{{$.Repo.FullPath}}/-/blob/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{end}}</li>{{end}}
167
</ul>
263
<div class="fileview">
264
<aside class="treebox">
265
<h2>Bestanden</h2>
266
<input type="search" placeholder="Zoeken" data-tree-filter>
267
<ul class="treelist">
268
{{range .Tree}}
269
<li class="depth-{{.Depth}}{{if .Active}} active{{end}}" data-path="{{.Path}}">
270
{{template "ficon" .Icon}}
271
{{if .Dir}}<a href="/{{$.Repo.FullPath}}/-/tree/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{else}}<a href="/{{$.Repo.FullPath}}/-/blob/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{end}}
272
</li>
273
{{end}}
274
</ul>
275
</aside>
276
<div>
277
<div class="toolbar">
278
<div class="left">
279
{{template "branchpick" .}}
280
<span class="pathnow">
281
<a href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}">{{.Repo.Name}}</a>
282
{{if .BlobPath}}{{range splitPath .BlobPath}} / <span>{{.}}</span>{{end}}{{else if .TreePath}}{{range splitPath .TreePath}} / <span>{{.}}</span>{{end}}{{end}}
283
</span>
284
{{if or .BlobPath .TreePath}}<button type="button" class="iconbtn" data-copy="{{if .BlobPath}}{{.BlobPath}}{{else}}{{.TreePath}}{{end}}" aria-label="Kopieer">Kopieer</button>{{end}}
285
</div>
286
</div>
287
{{if .BlobPath}}
288
<h1 class="filename">{{template "ficon" (iconOf .FileName)}} {{.FileName}}</h1>
289
{{template "commitbar" .}}
290
<article class="codebox">
291
<header>{{template "ficon" (iconOf .FileName)}} {{.FileName}} <span class="muted">{{.BlobSize}}</span></header>
292
{{if .Binary}}<p>Binair bestand.</p>{{else}}
293
<table class="code">
294
{{range .Lines}}<tr><td class="ln">{{.N}}</td><td class="src">{{.HTML}}</td></tr>{{end}}
295
</table>
296
{{end}}
297
</article>
298
{{else}}
299
{{template "filetable" .}}
300
{{end}}
301
</div>
302
</div>
303
<script src="/assets/repo.js"></script>
168
304
{{template "layout-end" .}}
169
305
{{end}}
170
306
171
{{define "blob"}}
307
{{define "tags"}}
172
308
{{template "layout-start" .}}
173
<h1>{{.BlobPath}}</h1>
309
<h1>Tags</h1>
174
310
{{template "repotabs" .}}
175
{{if .Binary}}<p>Binair bestand, niet getoond.</p>{{else}}<pre>{{.Blob}}</pre>{{end}}
311
<ul class="clean">
312
{{range .TagNames}}<li><code>{{.}}</code></li>{{else}}<li class="muted">Nog geen tags.</li>{{end}}
313
</ul>
176
314
{{template "layout-end" .}}
177
315
{{end}}
178
316
@@ -138,41 +138,179 @@138
{{template "layout-end" .}}138
{{template "layout-end" .}}139
{{end}}139
{{end}}140
140
141
{{define "ficon"}}142
{{if eq . "dir"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#8aa0b8" d="M1.5 3.5A1.5 1.5 0 0 1 3 2h3l1.2 1.5H13A1.5 1.5 0 0 1 14.5 5v7.2a1.3 1.3 0 0 1-1.3 1.3H2.8A1.3 1.3 0 0 1 1.5 12.2z"/></svg>143
{{else if eq . "md"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#1f6feb" d="M2 3h12v10H2z"/><path fill="#fff" d="M4 10V6h1.2l1.3 2 1.3-2H9v4H7.8V8L6.5 10 5.2 8v2zm6.2 0V8.2H9l1.8-2.2h1.4L10.6 8.2H12V10z"/></svg>144
{{else if eq . "code"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#cf222e" d="M6.2 4.2 2.4 8l3.8 3.8-1.1 1.1L.2 8l4.9-4.9zm3.6 0 1.1-1.1L15.8 8l-4.9 4.9-1.1-1.1L13.6 8z"/></svg>145
{{else if eq . "cfg"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#9a6700" d="M8 1.5 14 5v6l-6 3.5L2 11V5z"/></svg>146
{{else if eq . "lic"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#8250df" d="M4 1.5h8v13l-4-2.2-4 2.2z"/></svg>147
{{else if eq . "img"}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#1a7f37" d="M2 3h12v10H2z"/><circle cx="6" cy="6.5" r="1.2" fill="#fff"/><path fill="#fff" d="m3.5 11 3-3 2 2 1.5-1.5 2.5 2.5z"/></svg>148
{{else}}<svg class="ficon" viewBox="0 0 16 16" aria-hidden="true"><path fill="#6e7781" d="M4 1.5h5l3 3V14H4z"/><path fill="#fff" d="M9 1.5v3h3"/></svg>149
{{end}}150
{{end}}151
152
{{define "visicon"}}153
{{if eq .Repo.Visibility "public"}}<svg class="vis" viewBox="0 0 16 16" aria-label="Openbaar"><circle cx="8" cy="8" r="6" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.2" d="M2 8h12M8 2c1.8 1.8 1.8 10.2 0 12M8 2c-1.8 1.8-1.8 10.2 0 12"/></svg>154
{{else}}<svg class="vis" viewBox="0 0 16 16" aria-label="Privé"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>155
{{end}}156
{{end}}157
158
{{define "branchpick"}}159
<label class="branch">160
<select data-rev>161
{{range .Branches}}<option value="{{.Name}}" {{if eq .Name $.Rev}}selected{{end}}>{{.Name}}</option>{{end}}162
</select>163
</label>164
{{if .RevProtected}}<svg class="vis" viewBox="0 0 16 16" aria-label="Beschermd"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>{{end}}165
{{end}}166
167
{{define "commitbar"}}168
{{if .Head}}169
<div class="commitbar">170
<span class="avatar">{{initial .Head.Author}}</span>171
<div class="grow">172
<a href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>173
<div class="muted">{{.Head.Author}} · {{.Head.When}}</div>174
</div>175
<code class="sha">{{slice .Head.SHA 0 8}}</code>176
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="Kopieer">Kopieer</button>177
<a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">Geschiedenis</a>178
</div>179
{{end}}180
{{end}}181
182
{{define "codemenu"}}183
<details class="menu">184
<summary class="btn ghost">Code</summary>185
<div class="menu-panel">186
{{if .CloneSSH}}187
<p class="muted">SSH</p>188
<div class="copyline"><input readonly value="{{.CloneSSH}}"><button type="button" data-copy="{{.CloneSSH}}">Kopieer</button></div>189
{{end}}190
<p class="muted">HTTPS</p>191
<div class="copyline"><input readonly value="{{.CloneHTTP}}"><button type="button" data-copy="{{.CloneHTTP}}">Kopieer</button></div>192
<p class="muted">Gebruikersnaam en een token als wachtwoord.</p>193
</div>194
</details>195
{{end}}196
197
{{define "filetable"}}198
{{if .Files}}199
<table class="files">200
<thead><tr><th>Naam</th><th>Laatste commit</th><th>Laatste wijziging</th></tr></thead>201
<tbody>202
{{range .Files}}203
<tr>204
<td>{{template "ficon" .Icon}} {{if .Dir}}<a href="/{{$.Repo.FullPath}}/-/tree/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{else}}<a href="/{{$.Repo.FullPath}}/-/blob/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{end}}</td>205
<td class="msg">{{if .SHA}}<a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a>{{end}}</td>206
<td class="muted">{{.When}}</td>207
</tr>208
{{end}}209
</tbody>210
</table>211
{{else if eq .Page "files"}}<p class="muted">Deze map is leeg.</p>{{else if not .Head}}<p class="panel">Nog geen commits.</p>{{end}}212
{{end}}213
141
{{define "repo"}}214
{{define "repo"}}142
{{template "layout-start" .}}215
{{template "layout-start" .}}143
<h1>{{.Repo.FullPath}}</h1>216
<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<span>{{.Repo.OwnerPath}}</span>{{end}} / <span>{{.Repo.Name}}</span></p>144
{{template "repotabs" .}}217
{{template "repotabs" .}}145
<p>{{.Repo.Description}}</p>218
<div class="projhead">146
<p class="code">git clone {{.CloneHTTP}}{{if .CloneSSH}}219
<span class="tile">{{initial .Repo.Name}}</span>147
git clone {{.CloneSSH}}{{end}}</p>220
<h1>{{.Repo.Name}}</h1>148
<p class="muted">HTTPS: gebruik je gebruikersnaam en een toegangstoken als wachtwoord. Branch {{.Rev}}.</p>221
{{template "visicon" .}}149
{{if not .Commits}}<p class="panel">Nog geen commits.</p>{{end}}222
</div>150
<ul class="clean">223
<div class="proj">151
{{range .Entries}}<li>{{if eq .Type "tree"}}<a href="/{{$.Repo.FullPath}}/-/tree/{{.Path}}?rev={{$.Rev}}">{{.Name}}/</a>{{else}}<a href="/{{$.Repo.FullPath}}/-/blob/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{end}}</li>{{end}}224
<div>152
</ul>225
<div class="toolbar">153
<h2>Recente commits</h2>226
<div class="left">{{template "branchpick" .}} <span class="pathnow">{{.Repo.Name}}</span></div>154
<ul class="clean">227
<div class="right">155
{{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Short}}</a> {{.Subject}} <span class="muted">{{.Author}} · {{.Date}}</span></li>{{end}}228
<a class="btn ghost" href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}&focus=1">Bestand zoeken</a>156
</ul>229
{{template "codemenu" .}}230
</div>231
</div>232
{{template "commitbar" .}}233
{{template "filetable" .}}234
{{if .ReadmeName}}235
<article class="readme">236
<header>{{template "ficon" "md"}} {{.ReadmeName}}</header>237
<div class="mdbody">{{.Readme}}</div>238
</article>239
{{end}}240
</div>241
<aside class="side">242
<h2>Projectinformatie</h2>243
{{if .Repo.Description}}<p>{{.Repo.Description}}</p>{{end}}244
<ul class="counts">245
<li><a href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{.NCommits}} {{if eq .NCommits 1}}commit{{else}}commits{{end}}</a></li>246
<li><a href="/{{.Repo.FullPath}}/-/branches">{{.NBranches}} {{if eq .NBranches 1}}branch{{else}}branches{{end}}</a></li>247
<li><a href="/{{.Repo.FullPath}}/-/tags">{{.NTags}} {{if eq .NTags 1}}tag{{else}}tags{{end}}</a></li>248
<li><a href="/{{.Repo.FullPath}}/-/releases">{{.NReleases}} {{if eq .NReleases 1}}release{{else}}releases{{end}}</a></li>249
</ul>250
{{if .ReadmeName}}<p><a href="/{{.Repo.FullPath}}/-/blob/{{.ReadmeName}}?rev={{.Rev}}">README</a></p>{{end}}251
{{if .LicensePath}}<p><a href="/{{.Repo.FullPath}}/-/blob/{{.LicensePath}}?rev={{.Rev}}">LICENSE</a></p>{{end}}252
{{if .Created}}<p class="muted">Aangemaakt op {{.Created}}</p>{{end}}253
</aside>254
</div>255
<script src="/assets/repo.js"></script>157
{{template "layout-end" .}}256
{{template "layout-end" .}}158
{{end}}257
{{end}}159
258
160
{{define "tree"}}259
{{define "files"}}161
{{template "layout-start" .}}260
{{template "layout-start" .}}162
<h1>{{.Repo.Name}}</h1>261
<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<span>{{.Repo.OwnerPath}}</span>{{end}} / <a href="/{{.Repo.FullPath}}?rev={{.Rev}}">{{.Repo.Name}}</a></p>163
{{template "repotabs" .}}262
{{template "repotabs" .}}164
<p class="muted">{{.TreePath}}</p>263
<div class="fileview">165
<ul class="clean">264
<aside class="treebox">166
{{range .Entries}}<li>{{if eq .Type "tree"}}<a href="/{{$.Repo.FullPath}}/-/tree/{{.Path}}?rev={{$.Rev}}">{{.Name}}/</a>{{else}}<a href="/{{$.Repo.FullPath}}/-/blob/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{end}}</li>{{end}}265
<h2>Bestanden</h2>167
</ul>266
<input type="search" placeholder="Zoeken" data-tree-filter>267
<ul class="treelist">268
{{range .Tree}}269
<li class="depth-{{.Depth}}{{if .Active}} active{{end}}" data-path="{{.Path}}">270
{{template "ficon" .Icon}}271
{{if .Dir}}<a href="/{{$.Repo.FullPath}}/-/tree/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{else}}<a href="/{{$.Repo.FullPath}}/-/blob/{{.Path}}?rev={{$.Rev}}">{{.Name}}</a>{{end}}272
</li>273
{{end}}274
</ul>275
</aside>276
<div>277
<div class="toolbar">278
<div class="left">279
{{template "branchpick" .}}280
<span class="pathnow">281
<a href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}">{{.Repo.Name}}</a>282
{{if .BlobPath}}{{range splitPath .BlobPath}} / <span>{{.}}</span>{{end}}{{else if .TreePath}}{{range splitPath .TreePath}} / <span>{{.}}</span>{{end}}{{end}}283
</span>284
{{if or .BlobPath .TreePath}}<button type="button" class="iconbtn" data-copy="{{if .BlobPath}}{{.BlobPath}}{{else}}{{.TreePath}}{{end}}" aria-label="Kopieer">Kopieer</button>{{end}}285
</div>286
</div>287
{{if .BlobPath}}288
<h1 class="filename">{{template "ficon" (iconOf .FileName)}} {{.FileName}}</h1>289
{{template "commitbar" .}}290
<article class="codebox">291
<header>{{template "ficon" (iconOf .FileName)}} {{.FileName}} <span class="muted">{{.BlobSize}}</span></header>292
{{if .Binary}}<p>Binair bestand.</p>{{else}}293
<table class="code">294
{{range .Lines}}<tr><td class="ln">{{.N}}</td><td class="src">{{.HTML}}</td></tr>{{end}}295
</table>296
{{end}}297
</article>298
{{else}}299
{{template "filetable" .}}300
{{end}}301
</div>302
</div>303
<script src="/assets/repo.js"></script>168
{{template "layout-end" .}}304
{{template "layout-end" .}}169
{{end}}305
{{end}}170
306
171
{{define "blob"}}307
{{define "tags"}}172
{{template "layout-start" .}}308
{{template "layout-start" .}}173
<h1>{{.BlobPath}}</h1>309
<h1>Tags</h1>174
{{template "repotabs" .}}310
{{template "repotabs" .}}175
{{if .Binary}}<p>Binair bestand, niet getoond.</p>{{else}}<pre>{{.Blob}}</pre>{{end}}311
<ul class="clean">312
{{range .TagNames}}<li><code>{{.}}</code></li>{{else}}<li class="muted">Nog geen tags.</li>{{end}}313
</ul>176
{{template "layout-end" .}}314
{{template "layout-end" .}}177
{{end}}315
{{end}}178
316
@@ -180,6 +180,9 @@ func (s *Store) CreateRepo(ctx context.Context, ownerKind string, ownerID int64,
180
180
return Repo{}, err
181
181
}
182
182
id, _ := res.LastInsertId()
183
if err := s.AddProtected(ctx, id, defaultBranch); err != nil {
184
return Repo{}, err
185
}
183
186
return s.RepoByID(ctx, id)
184
187
}
185
188
@@ -180,6 +180,9 @@ func (s *Store) CreateRepo(ctx context.Context, ownerKind string, ownerID int64,180
return Repo{}, err180
return Repo{}, err181
}181
}182
id, _ := res.LastInsertId()182
id, _ := res.LastInsertId()183
if err := s.AddProtected(ctx, id, defaultBranch); err != nil {184
return Repo{}, err185
}183
return s.RepoByID(ctx, id)186
return s.RepoByID(ctx, id)184
}187
}185
188
@@ -159,6 +159,23 @@ func TestRolesSecretsAndPending(t *testing.T) {
159
159
}
160
160
}
161
161
162
func TestNewRepoProtectsMaster(t *testing.T) {
163
s := openTest(t)
164
ctx := context.Background()
165
tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
166
if err != nil {
167
t.Fatal(err)
168
}
169
repo, err := s.CreateRepo(ctx, "user", tim.ID, "demo", "", "master", "private")
170
if err != nil {
171
t.Fatal(err)
172
}
173
pats, err := s.ProtectedPatterns(ctx, repo.ID)
174
if err != nil || len(pats) != 1 || pats[0] != "master" {
175
t.Fatalf("beschermd: %v %v", pats, err)
176
}
177
}
178
162
179
func openTest(t *testing.T) *Store {
163
180
t.Helper()
164
181
key := make([]byte, 32)
@@ -159,6 +159,23 @@ func TestRolesSecretsAndPending(t *testing.T) {159
}159
}160
}160
}161
161
162
func TestNewRepoProtectsMaster(t *testing.T) {163
s := openTest(t)164
ctx := context.Background()165
tim, err := s.UpsertUser(ctx, 1, "tim", "", false)166
if err != nil {167
t.Fatal(err)168
}169
repo, err := s.CreateRepo(ctx, "user", tim.ID, "demo", "", "master", "private")170
if err != nil {171
t.Fatal(err)172
}173
pats, err := s.ProtectedPatterns(ctx, repo.ID)174
if err != nil || len(pats) != 1 || pats[0] != "master" {175
t.Fatalf("beschermd: %v %v", pats, err)176
}177
}178
162
func openTest(t *testing.T) *Store {179
func openTest(t *testing.T) *Store {163
t.Helper()180
t.Helper()164
key := make([]byte, 32)181
key := make([]byte, 32)