Merge branch 'cursor/read-cache' into 'stage'
@@ -107,6 +107,7 @@ func serve(args []string) error {
107
107
if m, ok := provider.(auth.Mailer); ok && cfg.Auth.ClientSecret != "" {
108
108
srv.Mail = m
109
109
}
110
srv.InitReadCache()
110
111
abandoned, err := st.FailAbandonedJobs(ctx)
111
112
if err != nil {
112
113
return err
@@ -107,6 +107,7 @@ func serve(args []string) error {107
if m, ok := provider.(auth.Mailer); ok && cfg.Auth.ClientSecret != "" {107
if m, ok := provider.(auth.Mailer); ok && cfg.Auth.ClientSecret != "" {108
srv.Mail = m108
srv.Mail = m109
}109
}110
srv.InitReadCache()110
abandoned, err := st.FailAbandonedJobs(ctx)111
abandoned, err := st.FailAbandonedJobs(ctx)111
if err != nil {112
if err != nil {112
return err113
return err@@ -24,7 +24,11 @@ type Config struct {
24
24
StatePath string `yaml:"state_path"`
25
25
// StoragePath is optioneel. Leeg betekent dat de beheerder het pad
26
26
// in de webinterface kiest. Er is geen standaardpad.
27
StoragePath string `yaml:"storage_path"`
27
StoragePath string `yaml:"storage_path"`
28
// CachePath is de optionele leescache (bij voorkeur op een SSD).
29
// Leeg betekent geen cache. Beheer kan het overschrijven.
30
CachePath string `yaml:"cache_path"`
31
CacheMaxMB int64 `yaml:"cache_max_mb"`
28
32
TrustedProxies []string `yaml:"trusted_proxies"`
29
33
// BehindProxy is het oude veld. Het wordt geweigerd: één boolean
30
34
// vertrouwt ofwel iedereen, ofwel niemand. De lijst hierboven beslist.
@@ -120,6 +124,9 @@ func Load(path string) (Config, error) {
120
124
if v := os.Getenv("BLUEGIT_STORAGE_PATH"); v != "" {
121
125
c.StoragePath = v
122
126
}
127
if v := os.Getenv("BLUEGIT_CACHE_PATH"); v != "" {
128
c.CachePath = v
129
}
123
130
if v := os.Getenv("BLUEGIT_LISTEN"); v != "" {
124
131
c.Listen = v
125
132
}
@@ -24,7 +24,11 @@ type Config struct {24
StatePath string `yaml:"state_path"`24
StatePath string `yaml:"state_path"`25
// StoragePath is optioneel. Leeg betekent dat de beheerder het pad25
// StoragePath is optioneel. Leeg betekent dat de beheerder het pad26
// in de webinterface kiest. Er is geen standaardpad.26
// in de webinterface kiest. Er is geen standaardpad.27
StoragePath string `yaml:"storage_path"`27
StoragePath string `yaml:"storage_path"`28
// CachePath is de optionele leescache (bij voorkeur op een SSD).29
// Leeg betekent geen cache. Beheer kan het overschrijven.30
CachePath string `yaml:"cache_path"`31
CacheMaxMB int64 `yaml:"cache_max_mb"`28
TrustedProxies []string `yaml:"trusted_proxies"`32
TrustedProxies []string `yaml:"trusted_proxies"`29
// BehindProxy is het oude veld. Het wordt geweigerd: één boolean33
// BehindProxy is het oude veld. Het wordt geweigerd: één boolean30
// vertrouwt ofwel iedereen, ofwel niemand. De lijst hierboven beslist.34
// vertrouwt ofwel iedereen, ofwel niemand. De lijst hierboven beslist.@@ -120,6 +124,9 @@ func Load(path string) (Config, error) {120
if v := os.Getenv("BLUEGIT_STORAGE_PATH"); v != "" {124
if v := os.Getenv("BLUEGIT_STORAGE_PATH"); v != "" {121
c.StoragePath = v125
c.StoragePath = v122
}126
}127
if v := os.Getenv("BLUEGIT_CACHE_PATH"); v != "" {128
c.CachePath = v129
}123
if v := os.Getenv("BLUEGIT_LISTEN"); v != "" {130
if v := os.Getenv("BLUEGIT_LISTEN"); v != "" {124
c.Listen = v131
c.Listen = v125
}132
}@@ -0,0 +1,72 @@
1
package i18n
2
3
func init() {
4
addCatalog(en, cacheEN)
5
addCatalog(nl, cacheNL)
6
addCatalog(de, cacheDE)
7
addCatalog(fr, cacheFR)
8
}
9
10
var cacheEN = map[string]string{
11
"setup.cacheTitle": "Read cache",
12
"setup.cacheLead": "Optional. Overview pages (README, file lists, branches, tags, counts) are kept here so they don't have to be read from the repository disk. Pick a path on a fast disk; empty turns the cache off. Only the cache/ subfolder is ever cleared.",
13
"setup.cacheUse": "In use: %s of %s, %d entries (hits %d, misses %d since start).",
14
"setup.cacheOff": "The cache is off.",
15
"setup.cachePath": "Cache path",
16
"setup.cacheMax": "Maximum size (MB, 0 = 512)",
17
"setup.cacheClear": "Clear cache",
18
"setup.cacheSaved": "Cache settings saved.",
19
"setup.cacheCleared": "Cache cleared.",
20
"setup.locTitle": "What is stored where",
21
"err.cacheAbs": "The cache path must be absolute.",
22
"err.cacheInside": "The cache path may not be inside the storage or state folder.",
23
"err.cacheDir": "The cache folder is not writable: %s",
24
}
25
26
var cacheNL = map[string]string{
27
"setup.cacheTitle": "Leescache",
28
"setup.cacheLead": "Optioneel. Overzichtspagina's (README, bestandslijsten, branches, tags, aantallen) worden hier bewaard, zodat ze niet van de repository-schijf hoeven te komen. Kies een pad op een snelle schijf; leeg zet de cache uit. Alleen de submap cache/ wordt ooit geleegd.",
29
"setup.cacheUse": "In gebruik: %s van %s, %d items (%d treffers, %d missers sinds de start).",
30
"setup.cacheOff": "De cache staat uit.",
31
"setup.cachePath": "Cachepad",
32
"setup.cacheMax": "Maximale grootte (MB, 0 = 512)",
33
"setup.cacheClear": "Cache legen",
34
"setup.cacheSaved": "Cache-instellingen opgeslagen.",
35
"setup.cacheCleared": "Cache geleegd.",
36
"setup.locTitle": "Wat staat waar",
37
"err.cacheAbs": "Het cachepad moet absoluut zijn.",
38
"err.cacheInside": "Het cachepad mag niet in de opslag- of state-map liggen.",
39
"err.cacheDir": "De cachemap is niet beschrijfbaar: %s",
40
}
41
42
var cacheDE = map[string]string{
43
"setup.cacheTitle": "Lese-Cache",
44
"setup.cacheLead": "Optional. Übersichtsseiten (README, Dateilisten, Branches, Tags, Zähler) werden hier abgelegt, damit sie nicht von der Repository-Platte gelesen werden müssen. Wähle einen Pfad auf einer schnellen Platte; leer schaltet den Cache aus. Geleert wird nur der Unterordner cache/.",
45
"setup.cacheUse": "Belegt: %s von %s, %d Einträge (%d Treffer, %d Fehlgriffe seit dem Start).",
46
"setup.cacheOff": "Der Cache ist aus.",
47
"setup.cachePath": "Cache-Pfad",
48
"setup.cacheMax": "Maximale Größe (MB, 0 = 512)",
49
"setup.cacheClear": "Cache leeren",
50
"setup.cacheSaved": "Cache-Einstellungen gespeichert.",
51
"setup.cacheCleared": "Cache geleert.",
52
"setup.locTitle": "Was liegt wo",
53
"err.cacheAbs": "Der Cache-Pfad muss absolut sein.",
54
"err.cacheInside": "Der Cache-Pfad darf nicht im Speicher- oder State-Ordner liegen.",
55
"err.cacheDir": "Der Cache-Ordner ist nicht beschreibbar: %s",
56
}
57
58
var cacheFR = map[string]string{
59
"setup.cacheTitle": "Cache de lecture",
60
"setup.cacheLead": "Facultatif. Les pages de synthèse (README, listes de fichiers, branches, tags, compteurs) sont conservées ici pour éviter de lire le disque des dépôts. Choisissez un chemin sur un disque rapide ; vide désactive le cache. Seul le sous-dossier cache/ est vidé.",
61
"setup.cacheUse": "Utilisé : %s sur %s, %d entrées (%d succès, %d échecs depuis le démarrage).",
62
"setup.cacheOff": "Le cache est désactivé.",
63
"setup.cachePath": "Chemin du cache",
64
"setup.cacheMax": "Taille maximale (Mo, 0 = 512)",
65
"setup.cacheClear": "Vider le cache",
66
"setup.cacheSaved": "Réglages du cache enregistrés.",
67
"setup.cacheCleared": "Cache vidé.",
68
"setup.locTitle": "Où se trouve quoi",
69
"err.cacheAbs": "Le chemin du cache doit être absolu.",
70
"err.cacheInside": "Le chemin du cache ne peut pas se trouver dans le dossier de stockage ou d'état.",
71
"err.cacheDir": "Le dossier du cache n'est pas accessible en écriture : %s",
72
}
@@ -0,0 +1,72 @@1
package i18n2
3
func init() {4
addCatalog(en, cacheEN)5
addCatalog(nl, cacheNL)6
addCatalog(de, cacheDE)7
addCatalog(fr, cacheFR)8
}9
10
var cacheEN = map[string]string{11
"setup.cacheTitle": "Read cache",12
"setup.cacheLead": "Optional. Overview pages (README, file lists, branches, tags, counts) are kept here so they don't have to be read from the repository disk. Pick a path on a fast disk; empty turns the cache off. Only the cache/ subfolder is ever cleared.",13
"setup.cacheUse": "In use: %s of %s, %d entries (hits %d, misses %d since start).",14
"setup.cacheOff": "The cache is off.",15
"setup.cachePath": "Cache path",16
"setup.cacheMax": "Maximum size (MB, 0 = 512)",17
"setup.cacheClear": "Clear cache",18
"setup.cacheSaved": "Cache settings saved.",19
"setup.cacheCleared": "Cache cleared.",20
"setup.locTitle": "What is stored where",21
"err.cacheAbs": "The cache path must be absolute.",22
"err.cacheInside": "The cache path may not be inside the storage or state folder.",23
"err.cacheDir": "The cache folder is not writable: %s",24
}25
26
var cacheNL = map[string]string{27
"setup.cacheTitle": "Leescache",28
"setup.cacheLead": "Optioneel. Overzichtspagina's (README, bestandslijsten, branches, tags, aantallen) worden hier bewaard, zodat ze niet van de repository-schijf hoeven te komen. Kies een pad op een snelle schijf; leeg zet de cache uit. Alleen de submap cache/ wordt ooit geleegd.",29
"setup.cacheUse": "In gebruik: %s van %s, %d items (%d treffers, %d missers sinds de start).",30
"setup.cacheOff": "De cache staat uit.",31
"setup.cachePath": "Cachepad",32
"setup.cacheMax": "Maximale grootte (MB, 0 = 512)",33
"setup.cacheClear": "Cache legen",34
"setup.cacheSaved": "Cache-instellingen opgeslagen.",35
"setup.cacheCleared": "Cache geleegd.",36
"setup.locTitle": "Wat staat waar",37
"err.cacheAbs": "Het cachepad moet absoluut zijn.",38
"err.cacheInside": "Het cachepad mag niet in de opslag- of state-map liggen.",39
"err.cacheDir": "De cachemap is niet beschrijfbaar: %s",40
}41
42
var cacheDE = map[string]string{43
"setup.cacheTitle": "Lese-Cache",44
"setup.cacheLead": "Optional. Übersichtsseiten (README, Dateilisten, Branches, Tags, Zähler) werden hier abgelegt, damit sie nicht von der Repository-Platte gelesen werden müssen. Wähle einen Pfad auf einer schnellen Platte; leer schaltet den Cache aus. Geleert wird nur der Unterordner cache/.",45
"setup.cacheUse": "Belegt: %s von %s, %d Einträge (%d Treffer, %d Fehlgriffe seit dem Start).",46
"setup.cacheOff": "Der Cache ist aus.",47
"setup.cachePath": "Cache-Pfad",48
"setup.cacheMax": "Maximale Größe (MB, 0 = 512)",49
"setup.cacheClear": "Cache leeren",50
"setup.cacheSaved": "Cache-Einstellungen gespeichert.",51
"setup.cacheCleared": "Cache geleert.",52
"setup.locTitle": "Was liegt wo",53
"err.cacheAbs": "Der Cache-Pfad muss absolut sein.",54
"err.cacheInside": "Der Cache-Pfad darf nicht im Speicher- oder State-Ordner liegen.",55
"err.cacheDir": "Der Cache-Ordner ist nicht beschreibbar: %s",56
}57
58
var cacheFR = map[string]string{59
"setup.cacheTitle": "Cache de lecture",60
"setup.cacheLead": "Facultatif. Les pages de synthèse (README, listes de fichiers, branches, tags, compteurs) sont conservées ici pour éviter de lire le disque des dépôts. Choisissez un chemin sur un disque rapide ; vide désactive le cache. Seul le sous-dossier cache/ est vidé.",61
"setup.cacheUse": "Utilisé : %s sur %s, %d entrées (%d succès, %d échecs depuis le démarrage).",62
"setup.cacheOff": "Le cache est désactivé.",63
"setup.cachePath": "Chemin du cache",64
"setup.cacheMax": "Taille maximale (Mo, 0 = 512)",65
"setup.cacheClear": "Vider le cache",66
"setup.cacheSaved": "Réglages du cache enregistrés.",67
"setup.cacheCleared": "Cache vidé.",68
"setup.locTitle": "Où se trouve quoi",69
"err.cacheAbs": "Le chemin du cache doit être absolu.",70
"err.cacheInside": "Le chemin du cache ne peut pas se trouver dans le dossier de stockage ou d'état.",71
"err.cacheDir": "Le dossier du cache n'est pas accessible en écriture : %s",72
}@@ -0,0 +1,295 @@
1
// Package readcache is een optionele, wegwerpbare cache voor afgeleide
2
// paginadata (README, trees, laatste commits, ref-lijsten, tellingen).
3
// De bron blijft altijd git: een fout in de cache betekent een miss.
4
//
5
// Indeling: <root>/cache/<repoID>/{sha,refs}/<hash>. Alleen cache/ is van
6
// deze package; Clear en LRU raken niets anders onder root aan.
7
package readcache
8
9
import (
10
"container/list"
11
"crypto/sha256"
12
"encoding/hex"
13
"encoding/json"
14
"errors"
15
"io/fs"
16
"os"
17
"path/filepath"
18
"strconv"
19
"strings"
20
"sync"
21
"sync/atomic"
22
)
23
24
// DefaultMax is de standaardgrootte: 512 MiB.
25
const DefaultMax = 512 << 20
26
27
// Cache is veilig voor gelijktijdig gebruik. Een nil *Cache is uit.
28
type Cache struct {
29
dir string
30
max int64
31
32
mu sync.Mutex
33
lru *list.List // voorkant = recent
34
items map[string]*list.Element
35
size int64
36
37
hits, misses atomic.Int64
38
gens map[int64]uint64
39
allGen uint64
40
}
41
42
type entry struct {
43
rel string
44
size int64
45
}
46
47
// Open maakt <root>/cache aan en leest de bestaande inhoud in.
48
func Open(root string, max int64) (*Cache, error) {
49
root = strings.TrimSpace(root)
50
if root == "" {
51
return nil, errors.New("readcache: geen pad")
52
}
53
if max <= 0 {
54
max = DefaultMax
55
}
56
dir := filepath.Join(root, "cache")
57
if err := os.MkdirAll(dir, 0o750); err != nil {
58
return nil, err
59
}
60
c := &Cache{dir: dir, max: max, lru: list.New(), items: map[string]*list.Element{}, gens: map[int64]uint64{}}
61
type found struct {
62
rel string
63
size int64
64
mod int64
65
}
66
var all []found
67
_ = filepath.WalkDir(dir, func(p string, d fs.DirEntry, err error) error {
68
if err != nil || d.IsDir() {
69
return nil
70
}
71
if strings.HasPrefix(d.Name(), ".tmp-") {
72
_ = os.Remove(p)
73
return nil
74
}
75
info, err := d.Info()
76
if err != nil {
77
return nil
78
}
79
rel, _ := filepath.Rel(dir, p)
80
all = append(all, found{rel, info.Size(), info.ModTime().UnixNano()})
81
return nil
82
})
83
// oudste achteraan
84
for i := 1; i < len(all); i++ {
85
for j := i; j > 0 && all[j].mod > all[j-1].mod; j-- {
86
all[j], all[j-1] = all[j-1], all[j]
87
}
88
}
89
for _, f := range all {
90
c.items[f.rel] = c.lru.PushBack(&entry{f.rel, f.size})
91
c.size += f.size
92
}
93
c.mu.Lock()
94
c.evictLocked()
95
c.mu.Unlock()
96
return c, nil
97
}
98
99
// Dir is de cachemap zelf (<root>/cache).
100
func (c *Cache) Dir() string {
101
if c == nil {
102
return ""
103
}
104
return c.dir
105
}
106
107
func repoDir(repoID int64) string { return strconv.FormatInt(repoID, 10) }
108
109
// rel geeft het pad voor een sleutel. refs=true hoort bij een ref-naam
110
// en verdwijnt bij elke ref-wijziging; anders is de sleutel onveranderlijk.
111
func rel(repoID int64, refs bool, key string) string {
112
sum := sha256.Sum256([]byte(key))
113
ns := "sha"
114
if refs {
115
ns = "refs"
116
}
117
return filepath.Join(repoDir(repoID), ns, hex.EncodeToString(sum[:16]))
118
}
119
120
// GetJSON vult v uit de cache. false bij een miss of corrupte entry.
121
func (c *Cache) GetJSON(repoID int64, refs bool, key string, v any) bool {
122
if c == nil {
123
return false
124
}
125
r := rel(repoID, refs, key)
126
b, err := os.ReadFile(filepath.Join(c.dir, r))
127
if err != nil {
128
c.misses.Add(1)
129
return false
130
}
131
// eerste regel is de volledige sleutel, tegen hash-botsingen
132
nl := strings.IndexByte(string(b), '\n')
133
if nl < 0 || string(b[:nl]) != key || json.Unmarshal(b[nl+1:], v) != nil {
134
c.misses.Add(1)
135
c.remove(r)
136
return false
137
}
138
c.hits.Add(1)
139
c.mu.Lock()
140
if el, ok := c.items[r]; ok {
141
c.lru.MoveToFront(el)
142
}
143
c.mu.Unlock()
144
return true
145
}
146
147
// Gen is de generatie van een repo. Lees die vóór git en geef hem aan
148
// PutJSONAt: een ref-wijziging tussendoor maakt de schrijfactie ongeldig.
149
func (c *Cache) Gen(repoID int64) uint64 {
150
if c == nil {
151
return 0
152
}
153
c.mu.Lock()
154
defer c.mu.Unlock()
155
return c.gens[repoID] + c.allGen<<32
156
}
157
158
// PutJSON schrijft atomisch. Fouten worden genegeerd.
159
func (c *Cache) PutJSON(repoID int64, refs bool, key string, v any) {
160
c.PutJSONAt(repoID, refs, key, v, c.Gen(repoID))
161
}
162
163
// PutJSONAt schrijft alleen als de generatie nog gen is.
164
func (c *Cache) PutJSONAt(repoID int64, refs bool, key string, v any, gen uint64) {
165
if c == nil || strings.ContainsRune(key, '\n') {
166
return
167
}
168
body, err := json.Marshal(v)
169
if err != nil {
170
return
171
}
172
data := append([]byte(key+"\n"), body...)
173
if int64(len(data)) > c.max/4 {
174
return
175
}
176
r := rel(repoID, refs, key)
177
full := filepath.Join(c.dir, r)
178
if err := os.MkdirAll(filepath.Dir(full), 0o750); err != nil {
179
return
180
}
181
tmp, err := os.CreateTemp(filepath.Dir(full), ".tmp-*")
182
if err != nil {
183
return
184
}
185
_, werr := tmp.Write(data)
186
cerr := tmp.Close()
187
if werr != nil || cerr != nil || os.Rename(tmp.Name(), full) != nil {
188
_ = os.Remove(tmp.Name())
189
return
190
}
191
c.mu.Lock()
192
if c.gens[repoID]+c.allGen<<32 != gen {
193
c.mu.Unlock()
194
_ = os.Remove(full)
195
return
196
}
197
if el, ok := c.items[r]; ok {
198
c.size -= el.Value.(*entry).size
199
c.lru.Remove(el)
200
}
201
c.items[r] = c.lru.PushFront(&entry{r, int64(len(data))})
202
c.size += int64(len(data))
203
c.evictLocked()
204
c.mu.Unlock()
205
}
206
207
func (c *Cache) evictLocked() {
208
for c.size > c.max {
209
el := c.lru.Back()
210
if el == nil {
211
return
212
}
213
e := el.Value.(*entry)
214
_ = os.Remove(filepath.Join(c.dir, e.rel))
215
c.lru.Remove(el)
216
delete(c.items, e.rel)
217
c.size -= e.size
218
}
219
}
220
221
func (c *Cache) remove(r string) {
222
_ = os.Remove(filepath.Join(c.dir, r))
223
c.mu.Lock()
224
if el, ok := c.items[r]; ok {
225
c.size -= el.Value.(*entry).size
226
c.lru.Remove(el)
227
delete(c.items, r)
228
}
229
c.mu.Unlock()
230
}
231
232
func (c *Cache) dropPrefix(repoID int64, prefix string) {
233
c.mu.Lock()
234
defer c.mu.Unlock()
235
c.gens[repoID]++
236
_ = os.RemoveAll(filepath.Join(c.dir, prefix))
237
for r, el := range c.items {
238
if r == prefix || strings.HasPrefix(r, prefix+string(filepath.Separator)) {
239
c.size -= el.Value.(*entry).size
240
c.lru.Remove(el)
241
delete(c.items, r)
242
}
243
}
244
}
245
246
// DropRefs vergeet alles wat van een ref-naam afhangt.
247
func (c *Cache) DropRefs(repoID int64) {
248
if c != nil {
249
c.dropPrefix(repoID, filepath.Join(repoDir(repoID), "refs"))
250
}
251
}
252
253
// DropRepo vergeet alles van één repo (verwijderd, hernoemd, zichtbaarheid).
254
func (c *Cache) DropRepo(repoID int64) {
255
if c != nil {
256
c.dropPrefix(repoID, repoDir(repoID))
257
}
258
}
259
260
// Clear leegt de hele cache/-map, en niets daarbuiten.
261
func (c *Cache) Clear() {
262
if c == nil {
263
return
264
}
265
c.mu.Lock()
266
defer c.mu.Unlock()
267
ents, _ := os.ReadDir(c.dir)
268
for _, e := range ents {
269
_ = os.RemoveAll(filepath.Join(c.dir, e.Name()))
270
}
271
c.allGen++
272
c.lru.Init()
273
c.items = map[string]*list.Element{}
274
c.size = 0
275
}
276
277
// Usage is de stand voor Beheer.
278
type Usage struct {
279
Dir string
280
Bytes int64
281
Max int64
282
Entries int
283
Hits int64
284
Misses int64
285
}
286
287
// Usage geeft de huidige stand.
288
func (c *Cache) Usage() Usage {
289
if c == nil {
290
return Usage{}
291
}
292
c.mu.Lock()
293
defer c.mu.Unlock()
294
return Usage{Dir: c.dir, Bytes: c.size, Max: c.max, Entries: len(c.items), Hits: c.hits.Load(), Misses: c.misses.Load()}
295
}
@@ -0,0 +1,295 @@1
// Package readcache is een optionele, wegwerpbare cache voor afgeleide2
// paginadata (README, trees, laatste commits, ref-lijsten, tellingen).3
// De bron blijft altijd git: een fout in de cache betekent een miss.4
//5
// Indeling: <root>/cache/<repoID>/{sha,refs}/<hash>. Alleen cache/ is van6
// deze package; Clear en LRU raken niets anders onder root aan.7
package readcache8
9
import (10
"container/list"11
"crypto/sha256"12
"encoding/hex"13
"encoding/json"14
"errors"15
"io/fs"16
"os"17
"path/filepath"18
"strconv"19
"strings"20
"sync"21
"sync/atomic"22
)23
24
// DefaultMax is de standaardgrootte: 512 MiB.25
const DefaultMax = 512 << 2026
27
// Cache is veilig voor gelijktijdig gebruik. Een nil *Cache is uit.28
type Cache struct {29
dir string30
max int6431
32
mu sync.Mutex33
lru *list.List // voorkant = recent34
items map[string]*list.Element35
size int6436
37
hits, misses atomic.Int6438
gens map[int64]uint6439
allGen uint6440
}41
42
type entry struct {43
rel string44
size int6445
}46
47
// Open maakt <root>/cache aan en leest de bestaande inhoud in.48
func Open(root string, max int64) (*Cache, error) {49
root = strings.TrimSpace(root)50
if root == "" {51
return nil, errors.New("readcache: geen pad")52
}53
if max <= 0 {54
max = DefaultMax55
}56
dir := filepath.Join(root, "cache")57
if err := os.MkdirAll(dir, 0o750); err != nil {58
return nil, err59
}60
c := &Cache{dir: dir, max: max, lru: list.New(), items: map[string]*list.Element{}, gens: map[int64]uint64{}}61
type found struct {62
rel string63
size int6464
mod int6465
}66
var all []found67
_ = filepath.WalkDir(dir, func(p string, d fs.DirEntry, err error) error {68
if err != nil || d.IsDir() {69
return nil70
}71
if strings.HasPrefix(d.Name(), ".tmp-") {72
_ = os.Remove(p)73
return nil74
}75
info, err := d.Info()76
if err != nil {77
return nil78
}79
rel, _ := filepath.Rel(dir, p)80
all = append(all, found{rel, info.Size(), info.ModTime().UnixNano()})81
return nil82
})83
// oudste achteraan84
for i := 1; i < len(all); i++ {85
for j := i; j > 0 && all[j].mod > all[j-1].mod; j-- {86
all[j], all[j-1] = all[j-1], all[j]87
}88
}89
for _, f := range all {90
c.items[f.rel] = c.lru.PushBack(&entry{f.rel, f.size})91
c.size += f.size92
}93
c.mu.Lock()94
c.evictLocked()95
c.mu.Unlock()96
return c, nil97
}98
99
// Dir is de cachemap zelf (<root>/cache).100
func (c *Cache) Dir() string {101
if c == nil {102
return ""103
}104
return c.dir105
}106
107
func repoDir(repoID int64) string { return strconv.FormatInt(repoID, 10) }108
109
// rel geeft het pad voor een sleutel. refs=true hoort bij een ref-naam110
// en verdwijnt bij elke ref-wijziging; anders is de sleutel onveranderlijk.111
func rel(repoID int64, refs bool, key string) string {112
sum := sha256.Sum256([]byte(key))113
ns := "sha"114
if refs {115
ns = "refs"116
}117
return filepath.Join(repoDir(repoID), ns, hex.EncodeToString(sum[:16]))118
}119
120
// GetJSON vult v uit de cache. false bij een miss of corrupte entry.121
func (c *Cache) GetJSON(repoID int64, refs bool, key string, v any) bool {122
if c == nil {123
return false124
}125
r := rel(repoID, refs, key)126
b, err := os.ReadFile(filepath.Join(c.dir, r))127
if err != nil {128
c.misses.Add(1)129
return false130
}131
// eerste regel is de volledige sleutel, tegen hash-botsingen132
nl := strings.IndexByte(string(b), '\n')133
if nl < 0 || string(b[:nl]) != key || json.Unmarshal(b[nl+1:], v) != nil {134
c.misses.Add(1)135
c.remove(r)136
return false137
}138
c.hits.Add(1)139
c.mu.Lock()140
if el, ok := c.items[r]; ok {141
c.lru.MoveToFront(el)142
}143
c.mu.Unlock()144
return true145
}146
147
// Gen is de generatie van een repo. Lees die vóór git en geef hem aan148
// PutJSONAt: een ref-wijziging tussendoor maakt de schrijfactie ongeldig.149
func (c *Cache) Gen(repoID int64) uint64 {150
if c == nil {151
return 0152
}153
c.mu.Lock()154
defer c.mu.Unlock()155
return c.gens[repoID] + c.allGen<<32156
}157
158
// PutJSON schrijft atomisch. Fouten worden genegeerd.159
func (c *Cache) PutJSON(repoID int64, refs bool, key string, v any) {160
c.PutJSONAt(repoID, refs, key, v, c.Gen(repoID))161
}162
163
// PutJSONAt schrijft alleen als de generatie nog gen is.164
func (c *Cache) PutJSONAt(repoID int64, refs bool, key string, v any, gen uint64) {165
if c == nil || strings.ContainsRune(key, '\n') {166
return167
}168
body, err := json.Marshal(v)169
if err != nil {170
return171
}172
data := append([]byte(key+"\n"), body...)173
if int64(len(data)) > c.max/4 {174
return175
}176
r := rel(repoID, refs, key)177
full := filepath.Join(c.dir, r)178
if err := os.MkdirAll(filepath.Dir(full), 0o750); err != nil {179
return180
}181
tmp, err := os.CreateTemp(filepath.Dir(full), ".tmp-*")182
if err != nil {183
return184
}185
_, werr := tmp.Write(data)186
cerr := tmp.Close()187
if werr != nil || cerr != nil || os.Rename(tmp.Name(), full) != nil {188
_ = os.Remove(tmp.Name())189
return190
}191
c.mu.Lock()192
if c.gens[repoID]+c.allGen<<32 != gen {193
c.mu.Unlock()194
_ = os.Remove(full)195
return196
}197
if el, ok := c.items[r]; ok {198
c.size -= el.Value.(*entry).size199
c.lru.Remove(el)200
}201
c.items[r] = c.lru.PushFront(&entry{r, int64(len(data))})202
c.size += int64(len(data))203
c.evictLocked()204
c.mu.Unlock()205
}206
207
func (c *Cache) evictLocked() {208
for c.size > c.max {209
el := c.lru.Back()210
if el == nil {211
return212
}213
e := el.Value.(*entry)214
_ = os.Remove(filepath.Join(c.dir, e.rel))215
c.lru.Remove(el)216
delete(c.items, e.rel)217
c.size -= e.size218
}219
}220
221
func (c *Cache) remove(r string) {222
_ = os.Remove(filepath.Join(c.dir, r))223
c.mu.Lock()224
if el, ok := c.items[r]; ok {225
c.size -= el.Value.(*entry).size226
c.lru.Remove(el)227
delete(c.items, r)228
}229
c.mu.Unlock()230
}231
232
func (c *Cache) dropPrefix(repoID int64, prefix string) {233
c.mu.Lock()234
defer c.mu.Unlock()235
c.gens[repoID]++236
_ = os.RemoveAll(filepath.Join(c.dir, prefix))237
for r, el := range c.items {238
if r == prefix || strings.HasPrefix(r, prefix+string(filepath.Separator)) {239
c.size -= el.Value.(*entry).size240
c.lru.Remove(el)241
delete(c.items, r)242
}243
}244
}245
246
// DropRefs vergeet alles wat van een ref-naam afhangt.247
func (c *Cache) DropRefs(repoID int64) {248
if c != nil {249
c.dropPrefix(repoID, filepath.Join(repoDir(repoID), "refs"))250
}251
}252
253
// DropRepo vergeet alles van één repo (verwijderd, hernoemd, zichtbaarheid).254
func (c *Cache) DropRepo(repoID int64) {255
if c != nil {256
c.dropPrefix(repoID, repoDir(repoID))257
}258
}259
260
// Clear leegt de hele cache/-map, en niets daarbuiten.261
func (c *Cache) Clear() {262
if c == nil {263
return264
}265
c.mu.Lock()266
defer c.mu.Unlock()267
ents, _ := os.ReadDir(c.dir)268
for _, e := range ents {269
_ = os.RemoveAll(filepath.Join(c.dir, e.Name()))270
}271
c.allGen++272
c.lru.Init()273
c.items = map[string]*list.Element{}274
c.size = 0275
}276
277
// Usage is de stand voor Beheer.278
type Usage struct {279
Dir string280
Bytes int64281
Max int64282
Entries int283
Hits int64284
Misses int64285
}286
287
// Usage geeft de huidige stand.288
func (c *Cache) Usage() Usage {289
if c == nil {290
return Usage{}291
}292
c.mu.Lock()293
defer c.mu.Unlock()294
return Usage{Dir: c.dir, Bytes: c.size, Max: c.max, Entries: len(c.items), Hits: c.hits.Load(), Misses: c.misses.Load()}295
}@@ -0,0 +1,90 @@
1
package readcache
2
3
import (
4
"os"
5
"path/filepath"
6
"strings"
7
"testing"
8
)
9
10
func TestRoundTripAndInvalidation(t *testing.T) {
11
root := t.TempDir()
12
keep := filepath.Join(root, "data", "bluegit.db")
13
_ = os.MkdirAll(filepath.Dir(keep), 0o750)
14
_ = os.WriteFile(keep, []byte("db"), 0o600)
15
c, err := Open(root, 1<<20)
16
if err != nil {
17
t.Fatal(err)
18
}
19
c.PutJSON(1, false, "tree:abc", []string{"a", "b"})
20
c.PutJSON(1, true, "branches", []string{"main"})
21
c.PutJSON(2, true, "branches", []string{"dev"})
22
var got []string
23
if !c.GetJSON(1, false, "tree:abc", &got) || len(got) != 2 {
24
t.Fatalf("miss: %v", got)
25
}
26
c.DropRefs(1)
27
if c.GetJSON(1, true, "branches", &got) {
28
t.Fatal("refs niet vergeten")
29
}
30
if !c.GetJSON(1, false, "tree:abc", &got) || !c.GetJSON(2, true, "branches", &got) {
31
t.Fatal("te veel vergeten")
32
}
33
c.DropRepo(2)
34
if c.GetJSON(2, true, "branches", &got) {
35
t.Fatal("repo niet vergeten")
36
}
37
c.Clear()
38
if c.Usage().Entries != 0 || c.GetJSON(1, false, "tree:abc", &got) {
39
t.Fatal("niet leeg")
40
}
41
if b, err := os.ReadFile(keep); err != nil || string(b) != "db" {
42
t.Fatal("Clear raakte data/ aan")
43
}
44
}
45
46
func TestCorruptEntryIsMiss(t *testing.T) {
47
c, _ := Open(t.TempDir(), 1<<20)
48
c.PutJSON(1, false, "k", 5)
49
_ = os.WriteFile(filepath.Join(c.Dir(), rel(1, false, "k")), []byte("k\n{kapot"), 0o600)
50
var n int
51
if c.GetJSON(1, false, "k", &n) {
52
t.Fatal("corrupt gelezen")
53
}
54
if c.Usage().Entries != 0 {
55
t.Fatal("corrupte entry bleef staan")
56
}
57
}
58
59
func TestLRUAndReopen(t *testing.T) {
60
root := t.TempDir()
61
c, _ := Open(root, 4000)
62
big := strings.Repeat("x", 900)
63
for i := 0; i < 10; i++ {
64
c.PutJSON(1, false, "k"+string(rune('a'+i)), big)
65
}
66
var s string
67
if c.Usage().Bytes > 4000 || c.GetJSON(1, false, "ka", &s) || !c.GetJSON(1, false, "kj", &s) {
68
t.Fatalf("LRU: %+v", c.Usage())
69
}
70
c2, _ := Open(root, 4000)
71
if c2.Usage().Entries != c.Usage().Entries || !c2.GetJSON(1, false, "kj", &s) {
72
t.Fatal("heropenen")
73
}
74
var nilc *Cache
75
nilc.PutJSON(1, false, "x", 1)
76
if nilc.GetJSON(1, false, "x", &s) {
77
t.Fatal("nil-cache")
78
}
79
}
80
81
func TestStalePutAfterDropIsIgnored(t *testing.T) {
82
c, _ := Open(t.TempDir(), 1<<20)
83
gen := c.Gen(1)
84
c.DropRefs(1) // push tijdens het lezen uit git
85
c.PutJSONAt(1, true, "branches", []string{"oud"}, gen)
86
var got []string
87
if c.GetJSON(1, true, "branches", &got) {
88
t.Fatal("verouderde data geschreven")
89
}
90
}
@@ -0,0 +1,90 @@1
package readcache2
3
import (4
"os"5
"path/filepath"6
"strings"7
"testing"8
)9
10
func TestRoundTripAndInvalidation(t *testing.T) {11
root := t.TempDir()12
keep := filepath.Join(root, "data", "bluegit.db")13
_ = os.MkdirAll(filepath.Dir(keep), 0o750)14
_ = os.WriteFile(keep, []byte("db"), 0o600)15
c, err := Open(root, 1<<20)16
if err != nil {17
t.Fatal(err)18
}19
c.PutJSON(1, false, "tree:abc", []string{"a", "b"})20
c.PutJSON(1, true, "branches", []string{"main"})21
c.PutJSON(2, true, "branches", []string{"dev"})22
var got []string23
if !c.GetJSON(1, false, "tree:abc", &got) || len(got) != 2 {24
t.Fatalf("miss: %v", got)25
}26
c.DropRefs(1)27
if c.GetJSON(1, true, "branches", &got) {28
t.Fatal("refs niet vergeten")29
}30
if !c.GetJSON(1, false, "tree:abc", &got) || !c.GetJSON(2, true, "branches", &got) {31
t.Fatal("te veel vergeten")32
}33
c.DropRepo(2)34
if c.GetJSON(2, true, "branches", &got) {35
t.Fatal("repo niet vergeten")36
}37
c.Clear()38
if c.Usage().Entries != 0 || c.GetJSON(1, false, "tree:abc", &got) {39
t.Fatal("niet leeg")40
}41
if b, err := os.ReadFile(keep); err != nil || string(b) != "db" {42
t.Fatal("Clear raakte data/ aan")43
}44
}45
46
func TestCorruptEntryIsMiss(t *testing.T) {47
c, _ := Open(t.TempDir(), 1<<20)48
c.PutJSON(1, false, "k", 5)49
_ = os.WriteFile(filepath.Join(c.Dir(), rel(1, false, "k")), []byte("k\n{kapot"), 0o600)50
var n int51
if c.GetJSON(1, false, "k", &n) {52
t.Fatal("corrupt gelezen")53
}54
if c.Usage().Entries != 0 {55
t.Fatal("corrupte entry bleef staan")56
}57
}58
59
func TestLRUAndReopen(t *testing.T) {60
root := t.TempDir()61
c, _ := Open(root, 4000)62
big := strings.Repeat("x", 900)63
for i := 0; i < 10; i++ {64
c.PutJSON(1, false, "k"+string(rune('a'+i)), big)65
}66
var s string67
if c.Usage().Bytes > 4000 || c.GetJSON(1, false, "ka", &s) || !c.GetJSON(1, false, "kj", &s) {68
t.Fatalf("LRU: %+v", c.Usage())69
}70
c2, _ := Open(root, 4000)71
if c2.Usage().Entries != c.Usage().Entries || !c2.GetJSON(1, false, "kj", &s) {72
t.Fatal("heropenen")73
}74
var nilc *Cache75
nilc.PutJSON(1, false, "x", 1)76
if nilc.GetJSON(1, false, "x", &s) {77
t.Fatal("nil-cache")78
}79
}80
81
func TestStalePutAfterDropIsIgnored(t *testing.T) {82
c, _ := Open(t.TempDir(), 1<<20)83
gen := c.Gen(1)84
c.DropRefs(1) // push tijdens het lezen uit git85
c.PutJSONAt(1, true, "branches", []string{"oud"}, gen)86
var got []string87
if c.GetJSON(1, true, "branches", &got) {88
t.Fatal("verouderde data geschreven")89
}90
}@@ -0,0 +1,195 @@
1
package server
2
3
import (
4
"encoding/json"
5
"errors"
6
"net/http"
7
"os"
8
"path/filepath"
9
"strconv"
10
"strings"
11
12
"gitlab.com/Timfa/bluegit/internal/i18n"
13
"gitlab.com/Timfa/bluegit/internal/readcache"
14
"gitlab.com/Timfa/bluegit/internal/state"
15
)
16
17
// cacheFile staat in de state-map en wint van config.yml, net als storage_path.
18
const cacheFile = "cache.json"
19
20
// CacheSetting is het gekozen cachepad. Leeg = geen cache.
21
type CacheSetting struct {
22
Path string `json:"path"`
23
MaxMB int64 `json:"max_mb"`
24
}
25
26
func (s *Server) savedCache() (CacheSetting, bool) {
27
if s.StateDir == "" {
28
return CacheSetting{}, false
29
}
30
b, err := os.ReadFile(filepath.Join(s.StateDir, cacheFile))
31
if err != nil {
32
return CacheSetting{}, false
33
}
34
var c CacheSetting
35
if json.Unmarshal(b, &c) != nil {
36
return CacheSetting{}, false
37
}
38
return c, true
39
}
40
41
// CacheConfig is wat nu geldt: opgeslagen keuze, anders config/env.
42
func (s *Server) CacheConfig() CacheSetting {
43
if c, ok := s.savedCache(); ok {
44
return c
45
}
46
return CacheSetting{Path: strings.TrimSpace(s.Cfg.CachePath), MaxMB: s.Cfg.CacheMaxMB}
47
}
48
49
// InitReadCache opent de cache bij het starten. Een fout zet de cache uit.
50
func (s *Server) InitReadCache() {
51
c := s.CacheConfig()
52
if err := s.openCache(c); err != nil && s.Log != nil {
53
s.Log.Warn("leescache uit", "path", c.Path, "err", err)
54
}
55
}
56
57
func (s *Server) openCache(c CacheSetting) error {
58
if strings.TrimSpace(c.Path) == "" {
59
s.SetReadCache(nil)
60
return nil
61
}
62
if !filepath.IsAbs(c.Path) {
63
return i18n.E("err.cacheAbs")
64
}
65
rc, err := readcache.Open(c.Path, c.MaxMB<<20)
66
if err != nil {
67
s.SetReadCache(nil)
68
return err
69
}
70
s.SetReadCache(rc)
71
return nil
72
}
73
74
func (s *Server) opSetCache(path string, maxMB int64) error {
75
path = strings.TrimSpace(path)
76
if path != "" {
77
path = filepath.Clean(path)
78
if !filepath.IsAbs(path) {
79
return fail(400, i18n.E("err.cacheAbs"))
80
}
81
for _, other := range []string{s.StoragePath(), s.StateDir} {
82
if other != "" && (path == filepath.Clean(other) || strings.HasPrefix(path+"/", filepath.Clean(other)+"/")) {
83
return fail(400, i18n.E("err.cacheInside"))
84
}
85
}
86
if err := os.MkdirAll(filepath.Join(path, "cache"), 0o750); err != nil {
87
return fail(400, i18n.E("err.cacheDir", err.Error()))
88
}
89
probe, err := os.CreateTemp(filepath.Join(path, "cache"), ".tmp-probe-*")
90
if err != nil {
91
return fail(400, i18n.E("err.cacheDir", err.Error()))
92
}
93
probe.Close()
94
_ = os.Remove(probe.Name())
95
}
96
if maxMB < 0 {
97
maxMB = 0
98
}
99
c := CacheSetting{Path: path, MaxMB: maxMB}
100
if s.StateDir == "" {
101
return fail(400, errors.New("geen state-map"))
102
}
103
b, _ := json.Marshal(c)
104
tmp := filepath.Join(s.StateDir, cacheFile+".tmp")
105
if err := os.WriteFile(tmp, b, 0o640); err != nil {
106
return fail(500, err)
107
}
108
if err := os.Rename(tmp, filepath.Join(s.StateDir, cacheFile)); err != nil {
109
return fail(500, err)
110
}
111
if err := s.openCache(c); err != nil {
112
return fail(400, err)
113
}
114
return nil
115
}
116
117
// cacheInfo is de stand voor Beheer en de API.
118
func (s *Server) cacheInfo() map[string]any {
119
c := s.CacheConfig()
120
u := s.ReadCache().Usage()
121
out := map[string]any{
122
"path": c.Path, "max_mb": c.MaxMB, "enabled": s.ReadCache() != nil,
123
"bytes": u.Bytes, "max_bytes": u.Max, "entries": u.Entries, "hits": u.Hits, "misses": u.Misses,
124
"locations": s.locations(),
125
"bytes_h": state.Format(uint64(u.Bytes)), "max_h": state.Format(uint64(u.Max)),
126
}
127
return out
128
}
129
130
// locations zegt waar wat staat, met het soort schijf.
131
func (s *Server) locations() []map[string]string {
132
var out []map[string]string
133
add := func(what, p string) {
134
if p != "" {
135
out = append(out, map[string]string{"what": what, "path": p, "disk": state.DiskKind(p)})
136
}
137
}
138
add("database", filepath.Join(s.StateDir, "bluegit.db"))
139
add("logos", filepath.Join(s.StateDir, "logos"))
140
if st := s.StoragePath(); st != "" {
141
add("repos", filepath.Join(st, "repos"))
142
add("artifacts", filepath.Join(st, "artifacts"))
143
}
144
if c := s.ReadCache(); c != nil {
145
add("cache", c.Dir())
146
}
147
return out
148
}
149
150
func (s *Server) apiAdminCache(w http.ResponseWriter, r *http.Request) {
151
if !apiUser(r).InstanceAdmin {
152
s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
153
return
154
}
155
if r.Method == http.MethodPut {
156
var in CacheSetting
157
if err := readJSON(r, &in); err != nil {
158
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
159
return
160
}
161
if !s.apiOK(w, r, s.opSetCache(in.Path, in.MaxMB)) {
162
return
163
}
164
}
165
writeJSON(w, http.StatusOK, s.cacheInfo())
166
}
167
168
func (s *Server) apiAdminCacheClear(w http.ResponseWriter, r *http.Request) {
169
if !apiUser(r).InstanceAdmin {
170
s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
171
return
172
}
173
s.ReadCache().Clear()
174
writeJSON(w, http.StatusOK, s.cacheInfo())
175
}
176
177
func (s *Server) setupCacheSave(w http.ResponseWriter, r *http.Request) {
178
if _, ok := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
179
return
180
}
181
maxMB, _ := strconv.ParseInt(strings.TrimSpace(r.FormValue("max_mb")), 10, 64)
182
if err := s.opSetCache(r.FormValue("cache_path"), maxMB); err != nil {
183
s.renderSetup(w, r, s.trErr(r, err), "")
184
return
185
}
186
s.redirect(w, r, "/setup", s.tr(r, "setup.cacheSaved"), "")
187
}
188
189
func (s *Server) setupCacheClear(w http.ResponseWriter, r *http.Request) {
190
if _, ok := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
191
return
192
}
193
s.ReadCache().Clear()
194
s.redirect(w, r, "/setup", s.tr(r, "setup.cacheCleared"), "")
195
}
@@ -0,0 +1,195 @@1
package server2
3
import (4
"encoding/json"5
"errors"6
"net/http"7
"os"8
"path/filepath"9
"strconv"10
"strings"11
12
"gitlab.com/Timfa/bluegit/internal/i18n"13
"gitlab.com/Timfa/bluegit/internal/readcache"14
"gitlab.com/Timfa/bluegit/internal/state"15
)16
17
// cacheFile staat in de state-map en wint van config.yml, net als storage_path.18
const cacheFile = "cache.json"19
20
// CacheSetting is het gekozen cachepad. Leeg = geen cache.21
type CacheSetting struct {22
Path string `json:"path"`23
MaxMB int64 `json:"max_mb"`24
}25
26
func (s *Server) savedCache() (CacheSetting, bool) {27
if s.StateDir == "" {28
return CacheSetting{}, false29
}30
b, err := os.ReadFile(filepath.Join(s.StateDir, cacheFile))31
if err != nil {32
return CacheSetting{}, false33
}34
var c CacheSetting35
if json.Unmarshal(b, &c) != nil {36
return CacheSetting{}, false37
}38
return c, true39
}40
41
// CacheConfig is wat nu geldt: opgeslagen keuze, anders config/env.42
func (s *Server) CacheConfig() CacheSetting {43
if c, ok := s.savedCache(); ok {44
return c45
}46
return CacheSetting{Path: strings.TrimSpace(s.Cfg.CachePath), MaxMB: s.Cfg.CacheMaxMB}47
}48
49
// InitReadCache opent de cache bij het starten. Een fout zet de cache uit.50
func (s *Server) InitReadCache() {51
c := s.CacheConfig()52
if err := s.openCache(c); err != nil && s.Log != nil {53
s.Log.Warn("leescache uit", "path", c.Path, "err", err)54
}55
}56
57
func (s *Server) openCache(c CacheSetting) error {58
if strings.TrimSpace(c.Path) == "" {59
s.SetReadCache(nil)60
return nil61
}62
if !filepath.IsAbs(c.Path) {63
return i18n.E("err.cacheAbs")64
}65
rc, err := readcache.Open(c.Path, c.MaxMB<<20)66
if err != nil {67
s.SetReadCache(nil)68
return err69
}70
s.SetReadCache(rc)71
return nil72
}73
74
func (s *Server) opSetCache(path string, maxMB int64) error {75
path = strings.TrimSpace(path)76
if path != "" {77
path = filepath.Clean(path)78
if !filepath.IsAbs(path) {79
return fail(400, i18n.E("err.cacheAbs"))80
}81
for _, other := range []string{s.StoragePath(), s.StateDir} {82
if other != "" && (path == filepath.Clean(other) || strings.HasPrefix(path+"/", filepath.Clean(other)+"/")) {83
return fail(400, i18n.E("err.cacheInside"))84
}85
}86
if err := os.MkdirAll(filepath.Join(path, "cache"), 0o750); err != nil {87
return fail(400, i18n.E("err.cacheDir", err.Error()))88
}89
probe, err := os.CreateTemp(filepath.Join(path, "cache"), ".tmp-probe-*")90
if err != nil {91
return fail(400, i18n.E("err.cacheDir", err.Error()))92
}93
probe.Close()94
_ = os.Remove(probe.Name())95
}96
if maxMB < 0 {97
maxMB = 098
}99
c := CacheSetting{Path: path, MaxMB: maxMB}100
if s.StateDir == "" {101
return fail(400, errors.New("geen state-map"))102
}103
b, _ := json.Marshal(c)104
tmp := filepath.Join(s.StateDir, cacheFile+".tmp")105
if err := os.WriteFile(tmp, b, 0o640); err != nil {106
return fail(500, err)107
}108
if err := os.Rename(tmp, filepath.Join(s.StateDir, cacheFile)); err != nil {109
return fail(500, err)110
}111
if err := s.openCache(c); err != nil {112
return fail(400, err)113
}114
return nil115
}116
117
// cacheInfo is de stand voor Beheer en de API.118
func (s *Server) cacheInfo() map[string]any {119
c := s.CacheConfig()120
u := s.ReadCache().Usage()121
out := map[string]any{122
"path": c.Path, "max_mb": c.MaxMB, "enabled": s.ReadCache() != nil,123
"bytes": u.Bytes, "max_bytes": u.Max, "entries": u.Entries, "hits": u.Hits, "misses": u.Misses,124
"locations": s.locations(),125
"bytes_h": state.Format(uint64(u.Bytes)), "max_h": state.Format(uint64(u.Max)),126
}127
return out128
}129
130
// locations zegt waar wat staat, met het soort schijf.131
func (s *Server) locations() []map[string]string {132
var out []map[string]string133
add := func(what, p string) {134
if p != "" {135
out = append(out, map[string]string{"what": what, "path": p, "disk": state.DiskKind(p)})136
}137
}138
add("database", filepath.Join(s.StateDir, "bluegit.db"))139
add("logos", filepath.Join(s.StateDir, "logos"))140
if st := s.StoragePath(); st != "" {141
add("repos", filepath.Join(st, "repos"))142
add("artifacts", filepath.Join(st, "artifacts"))143
}144
if c := s.ReadCache(); c != nil {145
add("cache", c.Dir())146
}147
return out148
}149
150
func (s *Server) apiAdminCache(w http.ResponseWriter, r *http.Request) {151
if !apiUser(r).InstanceAdmin {152
s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))153
return154
}155
if r.Method == http.MethodPut {156
var in CacheSetting157
if err := readJSON(r, &in); err != nil {158
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))159
return160
}161
if !s.apiOK(w, r, s.opSetCache(in.Path, in.MaxMB)) {162
return163
}164
}165
writeJSON(w, http.StatusOK, s.cacheInfo())166
}167
168
func (s *Server) apiAdminCacheClear(w http.ResponseWriter, r *http.Request) {169
if !apiUser(r).InstanceAdmin {170
s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))171
return172
}173
s.ReadCache().Clear()174
writeJSON(w, http.StatusOK, s.cacheInfo())175
}176
177
func (s *Server) setupCacheSave(w http.ResponseWriter, r *http.Request) {178
if _, ok := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {179
return180
}181
maxMB, _ := strconv.ParseInt(strings.TrimSpace(r.FormValue("max_mb")), 10, 64)182
if err := s.opSetCache(r.FormValue("cache_path"), maxMB); err != nil {183
s.renderSetup(w, r, s.trErr(r, err), "")184
return185
}186
s.redirect(w, r, "/setup", s.tr(r, "setup.cacheSaved"), "")187
}188
189
func (s *Server) setupCacheClear(w http.ResponseWriter, r *http.Request) {190
if _, ok := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {191
return192
}193
s.ReadCache().Clear()194
s.redirect(w, r, "/setup", s.tr(r, "setup.cacheCleared"), "")195
}@@ -126,4 +126,7 @@ var apiCatalog = []apiRoute{
126
126
127
127
{http.MethodGet, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Read instance storage", (*Server).apiAdminStorage},
128
128
{http.MethodPut, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Set instance storage", (*Server).apiAdminStorage},
129
{http.MethodGet, "/api/v1/admin/cache", access.ScopeAdmin, authUser, "Read cache settings and usage", (*Server).apiAdminCache},
130
{http.MethodPut, "/api/v1/admin/cache", access.ScopeAdmin, authUser, "Set cache path", (*Server).apiAdminCache},
131
{http.MethodPost, "/api/v1/admin/cache/clear", access.ScopeAdmin, authUser, "Clear the read cache", (*Server).apiAdminCacheClear},
129
132
}
@@ -126,4 +126,7 @@ var apiCatalog = []apiRoute{126
126
127
{http.MethodGet, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Read instance storage", (*Server).apiAdminStorage},127
{http.MethodGet, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Read instance storage", (*Server).apiAdminStorage},128
{http.MethodPut, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Set instance storage", (*Server).apiAdminStorage},128
{http.MethodPut, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Set instance storage", (*Server).apiAdminStorage},129
{http.MethodGet, "/api/v1/admin/cache", access.ScopeAdmin, authUser, "Read cache settings and usage", (*Server).apiAdminCache},130
{http.MethodPut, "/api/v1/admin/cache", access.ScopeAdmin, authUser, "Set cache path", (*Server).apiAdminCache},131
{http.MethodPost, "/api/v1/admin/cache/clear", access.ScopeAdmin, authUser, "Clear the read cache", (*Server).apiAdminCacheClear},129
}132
}@@ -27,8 +27,7 @@ func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
27
27
v := s.repoView(w, r, repo, role, "title.branches")
28
28
v.Page = "branches"
29
29
v.Wide = true
30
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
31
tips, _ := gitrepo.BranchTips(r.Context(), s.Git, dir)
30
tips, _ := s.cBranchTips(r.Context(), repo)
32
31
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
33
32
lang := s.langOf(r)
34
33
now := time.Now()
@@ -47,7 +46,7 @@ func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
47
46
}
48
47
row.CanEdit = role.CanWriteCode() && !row.Default && !row.Protected
49
48
if !row.Default && repo.DefaultBranch != "" {
50
ahead, behind, err := gitrepo.AheadBehind(r.Context(), s.Git, dir, repo.DefaultBranch, tip.Name)
49
ahead, behind, err := s.cAheadBehind(r.Context(), repo, repo.DefaultBranch, tip.Name)
51
50
if err == nil {
52
51
row.Ahead, row.Behind = ahead, behind
53
52
}
@@ -95,7 +94,7 @@ func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
95
94
board.ShowStale = len(board.Stale) > 0
96
95
}
97
96
v.Branch = board
98
tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)
97
tags, _ := s.cTags(r.Context(), repo)
99
98
for _, name := range tags {
100
99
v.Tags = append(v.Tags, TagRow{Name: name})
101
100
}
@@ -27,8 +27,7 @@ func (s *Server) branches(w http.ResponseWriter, r *http.Request) {27
v := s.repoView(w, r, repo, role, "title.branches")27
v := s.repoView(w, r, repo, role, "title.branches")28
v.Page = "branches"28
v.Page = "branches"29
v.Wide = true29
v.Wide = true30
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)30
tips, _ := s.cBranchTips(r.Context(), repo)31
tips, _ := gitrepo.BranchTips(r.Context(), s.Git, dir)32
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)31
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)33
lang := s.langOf(r)32
lang := s.langOf(r)34
now := time.Now()33
now := time.Now()@@ -47,7 +46,7 @@ func (s *Server) branches(w http.ResponseWriter, r *http.Request) {47
}46
}48
row.CanEdit = role.CanWriteCode() && !row.Default && !row.Protected47
row.CanEdit = role.CanWriteCode() && !row.Default && !row.Protected49
if !row.Default && repo.DefaultBranch != "" {48
if !row.Default && repo.DefaultBranch != "" {50
ahead, behind, err := gitrepo.AheadBehind(r.Context(), s.Git, dir, repo.DefaultBranch, tip.Name)49
ahead, behind, err := s.cAheadBehind(r.Context(), repo, repo.DefaultBranch, tip.Name)51
if err == nil {50
if err == nil {52
row.Ahead, row.Behind = ahead, behind51
row.Ahead, row.Behind = ahead, behind53
}52
}@@ -95,7 +94,7 @@ func (s *Server) branches(w http.ResponseWriter, r *http.Request) {95
board.ShowStale = len(board.Stale) > 094
board.ShowStale = len(board.Stale) > 096
}95
}97
v.Branch = board96
v.Branch = board98
tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)97
tags, _ := s.cTags(r.Context(), repo)99
for _, name := range tags {98
for _, name := range tags {100
v.Tags = append(v.Tags, TagRow{Name: name})99
v.Tags = append(v.Tags, TagRow{Name: name})101
}100
}@@ -83,7 +83,7 @@ func (s *Server) ciEditor(w http.ResponseWriter, r *http.Request) {
83
83
v.Page = "editor"
84
84
v.Rev = ref
85
85
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
86
s.branchList(r, &v, dir)
86
s.branchList(r, &v, repo)
87
87
body, missing := s.ciFileAt(r, dir, ref)
88
88
if missing {
89
89
body = ciTemplate
@@ -83,7 +83,7 @@ func (s *Server) ciEditor(w http.ResponseWriter, r *http.Request) {83
v.Page = "editor"83
v.Page = "editor"84
v.Rev = ref84
v.Rev = ref85
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)85
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)86
s.branchList(r, &v, dir)86
s.branchList(r, &v, repo)87
body, missing := s.ciFileAt(r, dir, ref)87
body, missing := s.ciFileAt(r, dir, ref)88
if missing {88
if missing {89
body = ciTemplate89
body = ciTemplate@@ -44,6 +44,7 @@ func (s *Server) postReceive(ctx context.Context, repo store.Repo, user store.Us
44
44
// AfterPush behandelt elke nieuwe ref zoals een git push.
45
45
// git http, SSH en postReceive zijn de enige aanroepers.
46
46
func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {
47
s.refsChanged(repo)
47
48
if after == nil {
48
49
return
49
50
}
@@ -44,6 +44,7 @@ func (s *Server) postReceive(ctx context.Context, repo store.Repo, user store.Us44
// AfterPush behandelt elke nieuwe ref zoals een git push.44
// AfterPush behandelt elke nieuwe ref zoals een git push.45
// git http, SSH en postReceive zijn de enige aanroepers.45
// git http, SSH en postReceive zijn de enige aanroepers.46
func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {46
func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {47
s.refsChanged(repo)47
if after == nil {48
if after == nil {48
return49
return49
}50
}@@ -0,0 +1,204 @@
1
package server
2
3
import (
4
"context"
5
"regexp"
6
"strconv"
7
8
"gitlab.com/Timfa/bluegit/internal/gitrepo"
9
"gitlab.com/Timfa/bluegit/internal/readcache"
10
"gitlab.com/Timfa/bluegit/internal/store"
11
)
12
13
// De leescache zit tussen de pagina's en git. Toegang is al gecontroleerd
14
// voordat een handler hier komt (guard/repoView); de cache weet niets van
15
// rechten en geeft alleen terug wat git voor dezelfde repo zou geven.
16
// Sleutels op een commit-SHA zijn onveranderlijk. Alles op een ref-naam
17
// staat in de refs-ruimte en verdwijnt bij elke ref-wijziging (AfterPush).
18
19
// ReadCache is de actieve cache, of nil.
20
func (s *Server) ReadCache() *readcache.Cache {
21
s.cacheMu.RLock()
22
defer s.cacheMu.RUnlock()
23
return s.rcache
24
}
25
26
// SetReadCache zet of wist de cache.
27
func (s *Server) SetReadCache(c *readcache.Cache) {
28
s.cacheMu.Lock()
29
s.rcache = c
30
s.cacheMu.Unlock()
31
}
32
33
var fullSHA = regexp.MustCompile(`^[0-9a-f]{40}([0-9a-f]{24})?$`)
34
35
func cachedRead[T any](s *Server, repoID int64, refs bool, key string, fn func() (T, error)) (T, error) {
36
c := s.ReadCache()
37
var v T
38
if c != nil && c.GetJSON(repoID, refs, key, &v) {
39
return v, nil
40
}
41
gen := c.Gen(repoID)
42
v, err := fn()
43
if err == nil && c != nil {
44
c.PutJSONAt(repoID, refs, key, v, gen)
45
}
46
return v, err
47
}
48
49
func (s *Server) gdir(repo store.Repo) string {
50
return gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
51
}
52
53
func (s *Server) cRefs(ctx context.Context, repo store.Repo) (map[string]string, error) {
54
return cachedRead(s, repo.ID, true, "refs", func() (map[string]string, error) {
55
return gitrepo.Refs(ctx, s.Git, s.gdir(repo))
56
})
57
}
58
59
// revKey kiest de cachesleutel voor rev: de commit-SHA als die bekend is,
60
// anders de naam in de refs-ruimte.
61
func (s *Server) revKey(ctx context.Context, repo store.Repo, rev string) (refs bool, key string) {
62
if fullSHA.MatchString(rev) {
63
return false, rev
64
}
65
if s.ReadCache() == nil {
66
return true, rev
67
}
68
if m, err := s.cRefs(ctx, repo); err == nil {
69
for _, full := range []string{"refs/heads/" + rev, "refs/tags/" + rev, rev} {
70
if sha, ok := m[full]; ok && fullSHA.MatchString(sha) {
71
return false, sha
72
}
73
}
74
}
75
return true, rev
76
}
77
78
func (s *Server) cBranches(ctx context.Context, repo store.Repo) ([]string, error) {
79
return cachedRead(s, repo.ID, true, "branches", func() ([]string, error) {
80
return gitrepo.Branches(ctx, s.Git, s.gdir(repo))
81
})
82
}
83
84
func (s *Server) cBranchTips(ctx context.Context, repo store.Repo) ([]gitrepo.BranchTip, error) {
85
return cachedRead(s, repo.ID, true, "tips", func() ([]gitrepo.BranchTip, error) {
86
return gitrepo.BranchTips(ctx, s.Git, s.gdir(repo))
87
})
88
}
89
90
func (s *Server) cTags(ctx context.Context, repo store.Repo) ([]string, error) {
91
return cachedRead(s, repo.ID, true, "tags", func() ([]string, error) {
92
return gitrepo.Tags(ctx, s.Git, s.gdir(repo))
93
})
94
}
95
96
func (s *Server) cListTags(ctx context.Context, repo store.Repo) ([]gitrepo.TagInfo, error) {
97
return cachedRead(s, repo.ID, true, "listtags", func() ([]gitrepo.TagInfo, error) {
98
return gitrepo.ListTags(ctx, s.Git, s.gdir(repo))
99
})
100
}
101
102
func (s *Server) cAheadBehind(ctx context.Context, repo store.Repo, base, branch string) (int, int, error) {
103
_, kb := s.revKey(ctx, repo, base)
104
_, kr := s.revKey(ctx, repo, branch)
105
refs := !fullSHA.MatchString(kb) || !fullSHA.MatchString(kr)
106
v, err := cachedRead(s, repo.ID, refs, "ab:"+kb+":"+kr, func() ([2]int, error) {
107
a, b, err := gitrepo.AheadBehind(ctx, s.Git, s.gdir(repo), base, branch)
108
return [2]int{a, b}, err
109
})
110
return v[0], v[1], err
111
}
112
113
type statsVal struct{ Commits, Branches, Tags int }
114
115
func (s *Server) cStats(ctx context.Context, repo store.Repo, rev string) (int, int, int, error) {
116
// branches en tags hangen van refs af; dus altijd in de refs-ruimte
117
v, err := cachedRead(s, repo.ID, true, "stats:"+rev, func() (statsVal, error) {
118
c, b, t, err := gitrepo.Stats(ctx, s.Git, s.gdir(repo), rev)
119
return statsVal{c, b, t}, err
120
})
121
return v.Commits, v.Branches, v.Tags, err
122
}
123
124
func (s *Server) cLastCommit(ctx context.Context, repo store.Repo, rev, path string) (gitrepo.Commit, error) {
125
refs, k := s.revKey(ctx, repo, rev)
126
return cachedRead(s, repo.ID, refs, "last:"+k+":"+path, func() (gitrepo.Commit, error) {
127
return gitrepo.LastCommit(ctx, s.Git, s.gdir(repo), rev, path)
128
})
129
}
130
131
func (s *Server) cTree(ctx context.Context, repo store.Repo, rev, rel string) ([]gitrepo.Entry, error) {
132
refs, k := s.revKey(ctx, repo, rev)
133
return cachedRead(s, repo.ID, refs, "tree:"+k+":"+rel, func() ([]gitrepo.Entry, error) {
134
return gitrepo.Tree(ctx, s.Git, s.gdir(repo), rev, rel)
135
})
136
}
137
138
func (s *Server) cTreeAll(ctx context.Context, repo store.Repo, rev string) ([]gitrepo.Entry, error) {
139
refs, k := s.revKey(ctx, repo, rev)
140
return cachedRead(s, repo.ID, refs, "treeall:"+k, func() ([]gitrepo.Entry, error) {
141
return gitrepo.TreeAll(ctx, s.Git, s.gdir(repo), rev)
142
})
143
}
144
145
func (s *Server) cTouch(ctx context.Context, repo store.Repo, rev string) (map[string]gitrepo.Commit, error) {
146
refs, k := s.revKey(ctx, repo, rev)
147
return cachedRead(s, repo.ID, refs, "touch:"+k, func() (map[string]gitrepo.Commit, error) {
148
return gitrepo.Touch(ctx, s.Git, s.gdir(repo), rev)
149
})
150
}
151
152
type blobVal struct {
153
Text string
154
Binary bool
155
}
156
157
// cDoc is voor kleine documenten zoals de README; grote bestanden lezen
158
// we gewoon uit git.
159
func (s *Server) cDoc(ctx context.Context, repo store.Repo, rev, path string, max int) (string, bool, error) {
160
refs, k := s.revKey(ctx, repo, rev)
161
v, err := cachedRead(s, repo.ID, refs, "doc:"+strconv.Itoa(max)+":"+k+":"+path, func() (blobVal, error) {
162
t, b, err := gitrepo.Blob(ctx, s.Git, s.gdir(repo), rev, path, max)
163
return blobVal{t, b}, err
164
})
165
return v.Text, v.Binary, err
166
}
167
168
// refreshCache is de write-through na elke ref-wijziging: oude ref-data
169
// weg, daarna de overzichtspagina van de standaardbranch opnieuw vullen.
170
// refsChanged vergeet de ref-data meteen (dus nooit verouderd) en vult
171
// op de achtergrond opnieuw.
172
func (s *Server) refsChanged(repo store.Repo) {
173
c := s.ReadCache()
174
if c == nil {
175
return
176
}
177
c.DropRefs(repo.ID)
178
go s.refreshCache(repo)
179
}
180
181
func (s *Server) refreshCache(repo store.Repo) {
182
if s.ReadCache() == nil {
183
return
184
}
185
ctx := context.Background()
186
_, _ = s.cRefs(ctx, repo)
187
_, _ = s.cBranches(ctx, repo)
188
_, _ = s.cBranchTips(ctx, repo)
189
_, _ = s.cTags(ctx, repo)
190
_, _ = s.cListTags(ctx, repo)
191
rev := repo.DefaultBranch
192
if rev == "" {
193
return
194
}
195
_, _, _, _ = s.cStats(ctx, repo, rev)
196
_, _ = s.cLastCommit(ctx, repo, rev, "")
197
_, _ = s.cTouch(ctx, repo, rev)
198
if entries, err := s.cTree(ctx, repo, rev, ""); err == nil {
199
if readme, _ := findDocs(entries); readme != "" {
200
_, _, _ = s.cDoc(ctx, repo, rev, readme, 200_000)
201
}
202
}
203
_ = s.repoLanguage(ctx, repo, rev)
204
}
@@ -0,0 +1,204 @@1
package server2
3
import (4
"context"5
"regexp"6
"strconv"7
8
"gitlab.com/Timfa/bluegit/internal/gitrepo"9
"gitlab.com/Timfa/bluegit/internal/readcache"10
"gitlab.com/Timfa/bluegit/internal/store"11
)12
13
// De leescache zit tussen de pagina's en git. Toegang is al gecontroleerd14
// voordat een handler hier komt (guard/repoView); de cache weet niets van15
// rechten en geeft alleen terug wat git voor dezelfde repo zou geven.16
// Sleutels op een commit-SHA zijn onveranderlijk. Alles op een ref-naam17
// staat in de refs-ruimte en verdwijnt bij elke ref-wijziging (AfterPush).18
19
// ReadCache is de actieve cache, of nil.20
func (s *Server) ReadCache() *readcache.Cache {21
s.cacheMu.RLock()22
defer s.cacheMu.RUnlock()23
return s.rcache24
}25
26
// SetReadCache zet of wist de cache.27
func (s *Server) SetReadCache(c *readcache.Cache) {28
s.cacheMu.Lock()29
s.rcache = c30
s.cacheMu.Unlock()31
}32
33
var fullSHA = regexp.MustCompile(`^[0-9a-f]{40}([0-9a-f]{24})?$`)34
35
func cachedRead[T any](s *Server, repoID int64, refs bool, key string, fn func() (T, error)) (T, error) {36
c := s.ReadCache()37
var v T38
if c != nil && c.GetJSON(repoID, refs, key, &v) {39
return v, nil40
}41
gen := c.Gen(repoID)42
v, err := fn()43
if err == nil && c != nil {44
c.PutJSONAt(repoID, refs, key, v, gen)45
}46
return v, err47
}48
49
func (s *Server) gdir(repo store.Repo) string {50
return gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)51
}52
53
func (s *Server) cRefs(ctx context.Context, repo store.Repo) (map[string]string, error) {54
return cachedRead(s, repo.ID, true, "refs", func() (map[string]string, error) {55
return gitrepo.Refs(ctx, s.Git, s.gdir(repo))56
})57
}58
59
// revKey kiest de cachesleutel voor rev: de commit-SHA als die bekend is,60
// anders de naam in de refs-ruimte.61
func (s *Server) revKey(ctx context.Context, repo store.Repo, rev string) (refs bool, key string) {62
if fullSHA.MatchString(rev) {63
return false, rev64
}65
if s.ReadCache() == nil {66
return true, rev67
}68
if m, err := s.cRefs(ctx, repo); err == nil {69
for _, full := range []string{"refs/heads/" + rev, "refs/tags/" + rev, rev} {70
if sha, ok := m[full]; ok && fullSHA.MatchString(sha) {71
return false, sha72
}73
}74
}75
return true, rev76
}77
78
func (s *Server) cBranches(ctx context.Context, repo store.Repo) ([]string, error) {79
return cachedRead(s, repo.ID, true, "branches", func() ([]string, error) {80
return gitrepo.Branches(ctx, s.Git, s.gdir(repo))81
})82
}83
84
func (s *Server) cBranchTips(ctx context.Context, repo store.Repo) ([]gitrepo.BranchTip, error) {85
return cachedRead(s, repo.ID, true, "tips", func() ([]gitrepo.BranchTip, error) {86
return gitrepo.BranchTips(ctx, s.Git, s.gdir(repo))87
})88
}89
90
func (s *Server) cTags(ctx context.Context, repo store.Repo) ([]string, error) {91
return cachedRead(s, repo.ID, true, "tags", func() ([]string, error) {92
return gitrepo.Tags(ctx, s.Git, s.gdir(repo))93
})94
}95
96
func (s *Server) cListTags(ctx context.Context, repo store.Repo) ([]gitrepo.TagInfo, error) {97
return cachedRead(s, repo.ID, true, "listtags", func() ([]gitrepo.TagInfo, error) {98
return gitrepo.ListTags(ctx, s.Git, s.gdir(repo))99
})100
}101
102
func (s *Server) cAheadBehind(ctx context.Context, repo store.Repo, base, branch string) (int, int, error) {103
_, kb := s.revKey(ctx, repo, base)104
_, kr := s.revKey(ctx, repo, branch)105
refs := !fullSHA.MatchString(kb) || !fullSHA.MatchString(kr)106
v, err := cachedRead(s, repo.ID, refs, "ab:"+kb+":"+kr, func() ([2]int, error) {107
a, b, err := gitrepo.AheadBehind(ctx, s.Git, s.gdir(repo), base, branch)108
return [2]int{a, b}, err109
})110
return v[0], v[1], err111
}112
113
type statsVal struct{ Commits, Branches, Tags int }114
115
func (s *Server) cStats(ctx context.Context, repo store.Repo, rev string) (int, int, int, error) {116
// branches en tags hangen van refs af; dus altijd in de refs-ruimte117
v, err := cachedRead(s, repo.ID, true, "stats:"+rev, func() (statsVal, error) {118
c, b, t, err := gitrepo.Stats(ctx, s.Git, s.gdir(repo), rev)119
return statsVal{c, b, t}, err120
})121
return v.Commits, v.Branches, v.Tags, err122
}123
124
func (s *Server) cLastCommit(ctx context.Context, repo store.Repo, rev, path string) (gitrepo.Commit, error) {125
refs, k := s.revKey(ctx, repo, rev)126
return cachedRead(s, repo.ID, refs, "last:"+k+":"+path, func() (gitrepo.Commit, error) {127
return gitrepo.LastCommit(ctx, s.Git, s.gdir(repo), rev, path)128
})129
}130
131
func (s *Server) cTree(ctx context.Context, repo store.Repo, rev, rel string) ([]gitrepo.Entry, error) {132
refs, k := s.revKey(ctx, repo, rev)133
return cachedRead(s, repo.ID, refs, "tree:"+k+":"+rel, func() ([]gitrepo.Entry, error) {134
return gitrepo.Tree(ctx, s.Git, s.gdir(repo), rev, rel)135
})136
}137
138
func (s *Server) cTreeAll(ctx context.Context, repo store.Repo, rev string) ([]gitrepo.Entry, error) {139
refs, k := s.revKey(ctx, repo, rev)140
return cachedRead(s, repo.ID, refs, "treeall:"+k, func() ([]gitrepo.Entry, error) {141
return gitrepo.TreeAll(ctx, s.Git, s.gdir(repo), rev)142
})143
}144
145
func (s *Server) cTouch(ctx context.Context, repo store.Repo, rev string) (map[string]gitrepo.Commit, error) {146
refs, k := s.revKey(ctx, repo, rev)147
return cachedRead(s, repo.ID, refs, "touch:"+k, func() (map[string]gitrepo.Commit, error) {148
return gitrepo.Touch(ctx, s.Git, s.gdir(repo), rev)149
})150
}151
152
type blobVal struct {153
Text string154
Binary bool155
}156
157
// cDoc is voor kleine documenten zoals de README; grote bestanden lezen158
// we gewoon uit git.159
func (s *Server) cDoc(ctx context.Context, repo store.Repo, rev, path string, max int) (string, bool, error) {160
refs, k := s.revKey(ctx, repo, rev)161
v, err := cachedRead(s, repo.ID, refs, "doc:"+strconv.Itoa(max)+":"+k+":"+path, func() (blobVal, error) {162
t, b, err := gitrepo.Blob(ctx, s.Git, s.gdir(repo), rev, path, max)163
return blobVal{t, b}, err164
})165
return v.Text, v.Binary, err166
}167
168
// refreshCache is de write-through na elke ref-wijziging: oude ref-data169
// weg, daarna de overzichtspagina van de standaardbranch opnieuw vullen.170
// refsChanged vergeet de ref-data meteen (dus nooit verouderd) en vult171
// op de achtergrond opnieuw.172
func (s *Server) refsChanged(repo store.Repo) {173
c := s.ReadCache()174
if c == nil {175
return176
}177
c.DropRefs(repo.ID)178
go s.refreshCache(repo)179
}180
181
func (s *Server) refreshCache(repo store.Repo) {182
if s.ReadCache() == nil {183
return184
}185
ctx := context.Background()186
_, _ = s.cRefs(ctx, repo)187
_, _ = s.cBranches(ctx, repo)188
_, _ = s.cBranchTips(ctx, repo)189
_, _ = s.cTags(ctx, repo)190
_, _ = s.cListTags(ctx, repo)191
rev := repo.DefaultBranch192
if rev == "" {193
return194
}195
_, _, _, _ = s.cStats(ctx, repo, rev)196
_, _ = s.cLastCommit(ctx, repo, rev, "")197
_, _ = s.cTouch(ctx, repo, rev)198
if entries, err := s.cTree(ctx, repo, rev, ""); err == nil {199
if readme, _ := findDocs(entries); readme != "" {200
_, _, _ = s.cDoc(ctx, repo, rev, readme, 200_000)201
}202
}203
_ = s.repoLanguage(ctx, repo, rev)204
}@@ -120,12 +120,11 @@ func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.Me
120
120
}
121
121
122
122
func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {
123
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
124
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
123
names, _ := s.cBranches(r.Context(), repo)
125
124
for _, name := range names {
126
125
v.Branches = append(v.Branches, BranchRow{Name: name, Default: name == repo.DefaultBranch})
127
126
}
128
tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)
127
tags, _ := s.cTags(r.Context(), repo)
129
128
for _, name := range tags {
130
129
v.Tags = append(v.Tags, TagRow{Name: name})
131
130
}
@@ -120,12 +120,11 @@ func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.Me120
}120
}121
121
122
func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {122
func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {123
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)123
names, _ := s.cBranches(r.Context(), repo)124
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)125
for _, name := range names {124
for _, name := range names {126
v.Branches = append(v.Branches, BranchRow{Name: name, Default: name == repo.DefaultBranch})125
v.Branches = append(v.Branches, BranchRow{Name: name, Default: name == repo.DefaultBranch})127
}126
}128
tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)127
tags, _ := s.cTags(r.Context(), repo)129
for _, name := range tags {128
for _, name := range tags {130
v.Tags = append(v.Tags, TagRow{Name: name})129
v.Tags = append(v.Tags, TagRow{Name: name})131
}130
}@@ -138,6 +138,9 @@ func (s *Server) opUpdateRepo(ctx context.Context, user store.User, repo store.R
138
138
if err := s.Store.UpdateRepo(ctx, repo.ID, description, visibility); err != nil {
139
139
return fail(400, err)
140
140
}
141
if visibility != repo.Visibility {
142
s.ReadCache().DropRepo(repo.ID)
143
}
141
144
return nil
142
145
}
143
146
@@ -154,6 +157,7 @@ func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.R
154
157
return fail(400, err)
155
158
}
156
159
_ = os.RemoveAll(dir)
160
s.ReadCache().DropRepo(repo.ID)
157
161
return nil
158
162
}
159
163
@@ -138,6 +138,9 @@ func (s *Server) opUpdateRepo(ctx context.Context, user store.User, repo store.R138
if err := s.Store.UpdateRepo(ctx, repo.ID, description, visibility); err != nil {138
if err := s.Store.UpdateRepo(ctx, repo.ID, description, visibility); err != nil {139
return fail(400, err)139
return fail(400, err)140
}140
}141
if visibility != repo.Visibility {142
s.ReadCache().DropRepo(repo.ID)143
}141
return nil144
return nil142
}145
}143
146
@@ -154,6 +157,7 @@ func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.R154
return fail(400, err)157
return fail(400, err)155
}158
}156
_ = os.RemoveAll(dir)159
_ = os.RemoveAll(dir)160
s.ReadCache().DropRepo(repo.ID)157
return nil161
return nil158
}162
}159
163
@@ -180,6 +180,7 @@ func (s *Server) opDeleteTag(ctx context.Context, user store.User, repo store.Re
180
180
if err := gitrepo.DeleteTag(ctx, s.Git, dir, name); err != nil {
181
181
return fail(400, err)
182
182
}
183
s.refsChanged(repo)
183
184
return nil
184
185
}
185
186
@@ -180,6 +180,7 @@ func (s *Server) opDeleteTag(ctx context.Context, user store.User, repo store.Re180
if err := gitrepo.DeleteTag(ctx, s.Git, dir, name); err != nil {180
if err := gitrepo.DeleteTag(ctx, s.Git, dir, name); err != nil {181
return fail(400, err)181
return fail(400, err)182
}182
}183
s.refsChanged(repo)183
return nil184
return nil184
}185
}185
186
@@ -19,31 +19,30 @@ import (
19
19
20
20
func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
21
21
v.Page = "overview"
22
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
23
s.branchList(r, v, dir)
22
s.branchList(r, v, repo)
24
23
lang := i18n.Parse(v.Lang)
25
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {
24
if c, err := s.cLastCommit(r.Context(), repo, v.Rev, ""); err == nil && c.SHA != "" {
26
25
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
27
26
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)
28
27
v.Head = &rows[0]
29
28
}
30
29
}
31
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")
32
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
30
entries, err := s.cTree(r.Context(), repo, v.Rev, "")
31
touch, _ := s.cTouch(r.Context(), repo, v.Rev)
33
32
if err == nil {
34
33
v.Files = fileRows(entries, "", touch, lang)
35
34
}
36
35
readme, license := findDocs(entries)
37
36
v.LicensePath = license
38
37
if readme != "" {
39
text, binary, err := gitrepo.Blob(r.Context(), s.Git, dir, v.Rev, readme, 200_000)
38
text, binary, err := s.cDoc(r.Context(), repo, v.Rev, readme, 200_000)
40
39
if err == nil && !binary {
41
40
v.ReadmeName = readme
42
41
base := "/" + repo.FullPath() + "/-/blob/"
43
42
v.Readme = template.HTML(markdown.RenderTasks(text, base, v.Rev, "/"+repo.FullPath(), markdown.Tasks{Count: s.tr(r, "tpl.tasks")}))
44
43
}
45
44
}
46
commits, branches, tags, _ := gitrepo.Stats(r.Context(), s.Git, dir, v.Rev)
45
commits, branches, tags, _ := s.cStats(r.Context(), repo, v.Rev)
47
46
v.NCommits, v.NBranches, v.NTags = commits, branches, tags
48
47
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {
49
48
v.NReleases = len(rels)
@@ -55,13 +54,13 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string
55
54
v.Page = "files"
56
55
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
57
56
lang := i18n.Parse(v.Lang)
58
s.branchList(r, v, dir)
59
all, _ := gitrepo.TreeAll(r.Context(), s.Git, dir, v.Rev)
57
s.branchList(r, v, repo)
58
all, _ := s.cTreeAll(r.Context(), repo, v.Rev)
60
59
v.Tree = treeRows(all, rel)
61
60
if !isFile {
62
61
v.TreePath = rel
63
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel)
64
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
62
entries, err := s.cTree(r.Context(), repo, v.Rev, rel)
63
touch, _ := s.cTouch(r.Context(), repo, v.Rev)
65
64
if err == nil {
66
65
v.Files = fileRows(entries, rel, touch, lang)
67
66
}
@@ -82,7 +81,7 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string
82
81
if n, err := gitrepo.BlobSize(r.Context(), s.Git, dir, v.Rev, rel); err == nil {
83
82
v.BlobSize = formatSize(n)
84
83
}
85
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {
84
if c, err := s.cLastCommit(r.Context(), repo, v.Rev, rel); err == nil && c.SHA != "" {
86
85
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
87
86
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)
88
87
v.Head = &rows[0]
@@ -90,10 +89,10 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string
90
89
}
91
90
}
92
91
93
func (s *Server) branchList(r *http.Request, v *View, dir string) {
92
func (s *Server) branchList(r *http.Request, v *View, repo store.Repo) {
94
93
patterns, _ := s.Store.ProtectedPatterns(r.Context(), v.Repo.ID)
95
94
v.RevProtected = access.BranchProtected(patterns, v.Rev)
96
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
95
names, _ := s.cBranches(r.Context(), repo)
97
96
seen := false
98
97
for _, name := range names {
99
98
if name == v.Rev {
@@ -19,31 +19,30 @@ import (19
19
20
func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {20
func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {21
v.Page = "overview"21
v.Page = "overview"22
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)22
s.branchList(r, v, repo)23
s.branchList(r, v, dir)24
lang := i18n.Parse(v.Lang)23
lang := i18n.Parse(v.Lang)25
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {24
if c, err := s.cLastCommit(r.Context(), repo, v.Rev, ""); err == nil && c.SHA != "" {26
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {25
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {27
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)26
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)28
v.Head = &rows[0]27
v.Head = &rows[0]29
}28
}30
}29
}31
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")30
entries, err := s.cTree(r.Context(), repo, v.Rev, "")32
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)31
touch, _ := s.cTouch(r.Context(), repo, v.Rev)33
if err == nil {32
if err == nil {34
v.Files = fileRows(entries, "", touch, lang)33
v.Files = fileRows(entries, "", touch, lang)35
}34
}36
readme, license := findDocs(entries)35
readme, license := findDocs(entries)37
v.LicensePath = license36
v.LicensePath = license38
if readme != "" {37
if readme != "" {39
text, binary, err := gitrepo.Blob(r.Context(), s.Git, dir, v.Rev, readme, 200_000)38
text, binary, err := s.cDoc(r.Context(), repo, v.Rev, readme, 200_000)40
if err == nil && !binary {39
if err == nil && !binary {41
v.ReadmeName = readme40
v.ReadmeName = readme42
base := "/" + repo.FullPath() + "/-/blob/"41
base := "/" + repo.FullPath() + "/-/blob/"43
v.Readme = template.HTML(markdown.RenderTasks(text, base, v.Rev, "/"+repo.FullPath(), markdown.Tasks{Count: s.tr(r, "tpl.tasks")}))42
v.Readme = template.HTML(markdown.RenderTasks(text, base, v.Rev, "/"+repo.FullPath(), markdown.Tasks{Count: s.tr(r, "tpl.tasks")}))44
}43
}45
}44
}46
commits, branches, tags, _ := gitrepo.Stats(r.Context(), s.Git, dir, v.Rev)45
commits, branches, tags, _ := s.cStats(r.Context(), repo, v.Rev)47
v.NCommits, v.NBranches, v.NTags = commits, branches, tags46
v.NCommits, v.NBranches, v.NTags = commits, branches, tags48
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {47
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {49
v.NReleases = len(rels)48
v.NReleases = len(rels)@@ -55,13 +54,13 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string55
v.Page = "files"54
v.Page = "files"56
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)55
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)57
lang := i18n.Parse(v.Lang)56
lang := i18n.Parse(v.Lang)58
s.branchList(r, v, dir)57
s.branchList(r, v, repo)59
all, _ := gitrepo.TreeAll(r.Context(), s.Git, dir, v.Rev)58
all, _ := s.cTreeAll(r.Context(), repo, v.Rev)60
v.Tree = treeRows(all, rel)59
v.Tree = treeRows(all, rel)61
if !isFile {60
if !isFile {62
v.TreePath = rel61
v.TreePath = rel63
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel)62
entries, err := s.cTree(r.Context(), repo, v.Rev, rel)64
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)63
touch, _ := s.cTouch(r.Context(), repo, v.Rev)65
if err == nil {64
if err == nil {66
v.Files = fileRows(entries, rel, touch, lang)65
v.Files = fileRows(entries, rel, touch, lang)67
}66
}@@ -82,7 +81,7 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string82
if n, err := gitrepo.BlobSize(r.Context(), s.Git, dir, v.Rev, rel); err == nil {81
if n, err := gitrepo.BlobSize(r.Context(), s.Git, dir, v.Rev, rel); err == nil {83
v.BlobSize = formatSize(n)82
v.BlobSize = formatSize(n)84
}83
}85
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {84
if c, err := s.cLastCommit(r.Context(), repo, v.Rev, rel); err == nil && c.SHA != "" {86
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {85
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {87
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)86
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)88
v.Head = &rows[0]87
v.Head = &rows[0]@@ -90,10 +89,10 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string90
}89
}91
}90
}92
91
93
func (s *Server) branchList(r *http.Request, v *View, dir string) {92
func (s *Server) branchList(r *http.Request, v *View, repo store.Repo) {94
patterns, _ := s.Store.ProtectedPatterns(r.Context(), v.Repo.ID)93
patterns, _ := s.Store.ProtectedPatterns(r.Context(), v.Repo.ID)95
v.RevProtected = access.BranchProtected(patterns, v.Rev)94
v.RevProtected = access.BranchProtected(patterns, v.Rev)96
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)95
names, _ := s.cBranches(r.Context(), repo)97
seen := false96
seen := false98
for _, name := range names {97
for _, name := range names {99
if name == v.Rev {98
if name == v.Rev {@@ -0,0 +1,218 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
6
"os"
7
"path/filepath"
8
"strings"
9
"testing"
10
"time"
11
12
"gitlab.com/Timfa/bluegit/internal/readcache"
13
"gitlab.com/Timfa/bluegit/internal/store"
14
)
15
16
func cacheServer(t *testing.T) (*Server, string, func(path string) (int, string), *http.Client, string, string) {
17
t.Helper()
18
srv, ts, st := mergeFixServer(t)
19
srv.StateDir = t.TempDir()
20
root := t.TempDir()
21
if err := srv.opSetCache(root, 64); err != nil {
22
t.Fatal(err)
23
}
24
tim := loginClient(t, ts)
25
token := mintToken(t, tim, ts)
26
work := pushPair(t, ts, token, "cached", "hallo\n", "verder\n")
27
git(t, work, "checkout", "master")
28
writeFile(t, filepath.Join(work, "README.md"), "# Eerste versie\n")
29
git(t, work, "add", "README.md")
30
git(t, work, "commit", "-m", "readme")
31
git(t, work, "push", "origin", "master")
32
_ = st
33
get := func(path string) (int, string) {
34
res, err := tim.Get(ts.URL + path)
35
if err != nil {
36
t.Fatal(err)
37
}
38
return res.StatusCode, read(t, res)
39
}
40
return srv, root, get, tim, ts.URL, work
41
}
42
43
func repoOf(t *testing.T, srv *Server, name string) store.Repo {
44
t.Helper()
45
repos, err := srv.Store.AllRepos(context.Background())
46
if err != nil {
47
t.Fatal(err)
48
}
49
for _, r := range repos {
50
if r.Name == name {
51
return r
52
}
53
}
54
t.Fatalf("repo %s ontbreekt", name)
55
return store.Repo{}
56
}
57
58
// waitWarm wacht tot de achtergrond-vulling na een push klaar is.
59
func waitWarm(srv *Server) {
60
time.Sleep(300 * time.Millisecond)
61
}
62
63
func TestReadCacheServesOverviewWithoutRepoDisk(t *testing.T) {
64
srv, root, get, _, _, work := cacheServer(t)
65
waitWarm(srv)
66
pages := []string{"/tim/cached", "/tim/cached/-/branches", "/tim/cached/-/tags"}
67
for _, p := range pages {
68
if code, _ := get(p); code != 200 {
69
t.Fatalf("%s: %d", p, code)
70
}
71
}
72
if srv.ReadCache().Usage().Entries == 0 {
73
t.Fatal("niets gecachet")
74
}
75
// HDD 'weg': de repository-map tijdelijk verplaatsen.
76
repo := repoOf(t, srv, "cached")
77
dir := srv.gdir(repo)
78
if err := os.Rename(dir, dir+".weg"); err != nil {
79
t.Fatal(err)
80
}
81
_, body := get("/tim/cached")
82
if !strings.Contains(body, "Eerste versie") {
83
t.Fatal("README niet uit de cache")
84
}
85
if _, body := get("/tim/cached/-/branches"); !strings.Contains(body, "topic") {
86
t.Fatal("branches niet uit de cache")
87
}
88
if err := os.Rename(dir+".weg", dir); err != nil {
89
t.Fatal(err)
90
}
91
92
// write-through: na een push nooit de oude README
93
writeFile(t, filepath.Join(work, "README.md"), "# Tweede versie\n")
94
git(t, work, "add", "README.md")
95
git(t, work, "commit", "-m", "readme 2")
96
git(t, work, "push", "origin", "master")
97
git(t, work, "push", "origin", "master:nieuwe-branch")
98
_, body = get("/tim/cached")
99
if !strings.Contains(body, "Tweede versie") || strings.Contains(body, "Eerste versie") {
100
t.Fatal("verouderde README na push")
101
}
102
if _, body := get("/tim/cached/-/branches"); !strings.Contains(body, "nieuwe-branch") {
103
t.Fatal("nieuwe branch ontbreekt")
104
}
105
106
// corrupte entries zijn een miss, geen fout
107
_ = filepath.Walk(filepath.Join(root, "cache"), func(p string, info os.FileInfo, err error) error {
108
if err == nil && !info.IsDir() {
109
_ = os.WriteFile(p, []byte("kapot"), 0o600)
110
}
111
return nil
112
})
113
if code, body := get("/tim/cached"); code != 200 || !strings.Contains(body, "Tweede versie") {
114
t.Fatalf("corrupte cache brak de pagina: %d", code)
115
}
116
}
117
118
func TestReadCacheRespectsVisibility(t *testing.T) {
119
srv, _, get, _, base, _ := cacheServer(t)
120
waitWarm(srv)
121
get("/tim/cached")
122
repo := repoOf(t, srv, "cached")
123
anon := &http.Client{}
124
res, _ := anon.Get(base + "/tim/cached")
125
res.Body.Close()
126
if res.StatusCode != 200 {
127
t.Fatalf("publiek anoniem: %d", res.StatusCode)
128
}
129
before := srv.ReadCache().Usage().Entries
130
tim, _ := srv.Store.UserByUsername(context.Background(), "tim")
131
if err := srv.opUpdateRepo(context.Background(), tim, repo, repo.Description, "private"); err != nil {
132
t.Fatal(err)
133
}
134
if after := srv.ReadCache().Usage().Entries; after >= before {
135
t.Fatalf("cache niet gewist bij zichtbaarheid: %d -> %d", before, after)
136
}
137
get("/tim/cached") // eigenaar warmt opnieuw
138
for _, p := range []string{"/tim/cached", "/tim/cached/-/branches", "/tim/cached/-/tags"} {
139
res, _ := anon.Get(base + p)
140
body := read(t, res)
141
if res.StatusCode == 200 || strings.Contains(body, "Eerste versie") {
142
t.Fatalf("%s lekt naar anoniem: %d", p, res.StatusCode)
143
}
144
}
145
}
146
147
func TestReadCacheClearKeepsData(t *testing.T) {
148
srv, root, get, _, _, _ := cacheServer(t)
149
get("/tim/cached")
150
keep := filepath.Join(root, "data", "bewaar.txt")
151
_ = os.MkdirAll(filepath.Dir(keep), 0o750)
152
_ = os.WriteFile(keep, []byte("x"), 0o600)
153
srv.ReadCache().Clear()
154
if srv.ReadCache().Usage().Entries != 0 {
155
t.Fatal("niet leeg")
156
}
157
if _, err := os.Stat(keep); err != nil {
158
t.Fatal("data/ geraakt")
159
}
160
repo := repoOf(t, srv, "cached")
161
srv.ReadCache().PutJSON(repo.ID, false, "x", 1)
162
tim, _ := srv.Store.UserByUsername(context.Background(), "tim")
163
if err := srv.opDeleteRepo(context.Background(), tim, repo, "cached"); err != nil {
164
t.Fatal(err)
165
}
166
if srv.ReadCache().Usage().Entries != 0 {
167
t.Fatal("cache van verwijderde repo bleef staan")
168
}
169
}
170
171
func TestSetCacheValidates(t *testing.T) {
172
srv, _, _ := mergeFixServer(t)
173
srv.StateDir = t.TempDir()
174
if srv.opSetCache("relatief", 0) == nil {
175
t.Fatal("relatief pad geaccepteerd")
176
}
177
if srv.opSetCache(filepath.Join(srv.StoragePath(), "cache"), 0) == nil {
178
t.Fatal("pad in opslag geaccepteerd")
179
}
180
root := t.TempDir()
181
if err := srv.opSetCache(root, 0); err != nil || srv.ReadCache() == nil {
182
t.Fatal(err)
183
}
184
// blijft bewaard over een herstart
185
srv2 := &Server{StateDir: srv.StateDir}
186
srv2.InitReadCache()
187
if srv2.ReadCache() == nil || srv2.CacheConfig().Path != root {
188
t.Fatal("instelling niet bewaard")
189
}
190
if err := srv.opSetCache("", 0); err != nil || srv.ReadCache() != nil {
191
t.Fatal("uitzetten mislukt")
192
}
193
}
194
195
// TestReadCacheColdWarm meet een overzichtspagina koud en warm.
196
func TestReadCacheColdWarm(t *testing.T) {
197
srv, _, get, _, _, _ := cacheServer(t)
198
waitWarm(srv)
199
const n = 20
200
measure := func() time.Duration {
201
start := time.Now()
202
for i := 0; i < n; i++ {
203
get("/tim/cached")
204
}
205
return time.Since(start) / n
206
}
207
keep := srv.ReadCache()
208
srv.SetReadCache(nil)
209
cold := measure()
210
srv.SetReadCache(keep)
211
get("/tim/cached")
212
warm := measure()
213
t.Logf("overzicht: zonder cache %v, warm %v per pagina", cold, warm)
214
if warm > cold*2 {
215
t.Fatalf("warm (%v) veel trager dan koud (%v)", warm, cold)
216
}
217
_ = readcache.DefaultMax
218
}
@@ -0,0 +1,218 @@1
package server2
3
import (4
"context"5
"net/http"6
"os"7
"path/filepath"8
"strings"9
"testing"10
"time"11
12
"gitlab.com/Timfa/bluegit/internal/readcache"13
"gitlab.com/Timfa/bluegit/internal/store"14
)15
16
func cacheServer(t *testing.T) (*Server, string, func(path string) (int, string), *http.Client, string, string) {17
t.Helper()18
srv, ts, st := mergeFixServer(t)19
srv.StateDir = t.TempDir()20
root := t.TempDir()21
if err := srv.opSetCache(root, 64); err != nil {22
t.Fatal(err)23
}24
tim := loginClient(t, ts)25
token := mintToken(t, tim, ts)26
work := pushPair(t, ts, token, "cached", "hallo\n", "verder\n")27
git(t, work, "checkout", "master")28
writeFile(t, filepath.Join(work, "README.md"), "# Eerste versie\n")29
git(t, work, "add", "README.md")30
git(t, work, "commit", "-m", "readme")31
git(t, work, "push", "origin", "master")32
_ = st33
get := func(path string) (int, string) {34
res, err := tim.Get(ts.URL + path)35
if err != nil {36
t.Fatal(err)37
}38
return res.StatusCode, read(t, res)39
}40
return srv, root, get, tim, ts.URL, work41
}42
43
func repoOf(t *testing.T, srv *Server, name string) store.Repo {44
t.Helper()45
repos, err := srv.Store.AllRepos(context.Background())46
if err != nil {47
t.Fatal(err)48
}49
for _, r := range repos {50
if r.Name == name {51
return r52
}53
}54
t.Fatalf("repo %s ontbreekt", name)55
return store.Repo{}56
}57
58
// waitWarm wacht tot de achtergrond-vulling na een push klaar is.59
func waitWarm(srv *Server) {60
time.Sleep(300 * time.Millisecond)61
}62
63
func TestReadCacheServesOverviewWithoutRepoDisk(t *testing.T) {64
srv, root, get, _, _, work := cacheServer(t)65
waitWarm(srv)66
pages := []string{"/tim/cached", "/tim/cached/-/branches", "/tim/cached/-/tags"}67
for _, p := range pages {68
if code, _ := get(p); code != 200 {69
t.Fatalf("%s: %d", p, code)70
}71
}72
if srv.ReadCache().Usage().Entries == 0 {73
t.Fatal("niets gecachet")74
}75
// HDD 'weg': de repository-map tijdelijk verplaatsen.76
repo := repoOf(t, srv, "cached")77
dir := srv.gdir(repo)78
if err := os.Rename(dir, dir+".weg"); err != nil {79
t.Fatal(err)80
}81
_, body := get("/tim/cached")82
if !strings.Contains(body, "Eerste versie") {83
t.Fatal("README niet uit de cache")84
}85
if _, body := get("/tim/cached/-/branches"); !strings.Contains(body, "topic") {86
t.Fatal("branches niet uit de cache")87
}88
if err := os.Rename(dir+".weg", dir); err != nil {89
t.Fatal(err)90
}91
92
// write-through: na een push nooit de oude README93
writeFile(t, filepath.Join(work, "README.md"), "# Tweede versie\n")94
git(t, work, "add", "README.md")95
git(t, work, "commit", "-m", "readme 2")96
git(t, work, "push", "origin", "master")97
git(t, work, "push", "origin", "master:nieuwe-branch")98
_, body = get("/tim/cached")99
if !strings.Contains(body, "Tweede versie") || strings.Contains(body, "Eerste versie") {100
t.Fatal("verouderde README na push")101
}102
if _, body := get("/tim/cached/-/branches"); !strings.Contains(body, "nieuwe-branch") {103
t.Fatal("nieuwe branch ontbreekt")104
}105
106
// corrupte entries zijn een miss, geen fout107
_ = filepath.Walk(filepath.Join(root, "cache"), func(p string, info os.FileInfo, err error) error {108
if err == nil && !info.IsDir() {109
_ = os.WriteFile(p, []byte("kapot"), 0o600)110
}111
return nil112
})113
if code, body := get("/tim/cached"); code != 200 || !strings.Contains(body, "Tweede versie") {114
t.Fatalf("corrupte cache brak de pagina: %d", code)115
}116
}117
118
func TestReadCacheRespectsVisibility(t *testing.T) {119
srv, _, get, _, base, _ := cacheServer(t)120
waitWarm(srv)121
get("/tim/cached")122
repo := repoOf(t, srv, "cached")123
anon := &http.Client{}124
res, _ := anon.Get(base + "/tim/cached")125
res.Body.Close()126
if res.StatusCode != 200 {127
t.Fatalf("publiek anoniem: %d", res.StatusCode)128
}129
before := srv.ReadCache().Usage().Entries130
tim, _ := srv.Store.UserByUsername(context.Background(), "tim")131
if err := srv.opUpdateRepo(context.Background(), tim, repo, repo.Description, "private"); err != nil {132
t.Fatal(err)133
}134
if after := srv.ReadCache().Usage().Entries; after >= before {135
t.Fatalf("cache niet gewist bij zichtbaarheid: %d -> %d", before, after)136
}137
get("/tim/cached") // eigenaar warmt opnieuw138
for _, p := range []string{"/tim/cached", "/tim/cached/-/branches", "/tim/cached/-/tags"} {139
res, _ := anon.Get(base + p)140
body := read(t, res)141
if res.StatusCode == 200 || strings.Contains(body, "Eerste versie") {142
t.Fatalf("%s lekt naar anoniem: %d", p, res.StatusCode)143
}144
}145
}146
147
func TestReadCacheClearKeepsData(t *testing.T) {148
srv, root, get, _, _, _ := cacheServer(t)149
get("/tim/cached")150
keep := filepath.Join(root, "data", "bewaar.txt")151
_ = os.MkdirAll(filepath.Dir(keep), 0o750)152
_ = os.WriteFile(keep, []byte("x"), 0o600)153
srv.ReadCache().Clear()154
if srv.ReadCache().Usage().Entries != 0 {155
t.Fatal("niet leeg")156
}157
if _, err := os.Stat(keep); err != nil {158
t.Fatal("data/ geraakt")159
}160
repo := repoOf(t, srv, "cached")161
srv.ReadCache().PutJSON(repo.ID, false, "x", 1)162
tim, _ := srv.Store.UserByUsername(context.Background(), "tim")163
if err := srv.opDeleteRepo(context.Background(), tim, repo, "cached"); err != nil {164
t.Fatal(err)165
}166
if srv.ReadCache().Usage().Entries != 0 {167
t.Fatal("cache van verwijderde repo bleef staan")168
}169
}170
171
func TestSetCacheValidates(t *testing.T) {172
srv, _, _ := mergeFixServer(t)173
srv.StateDir = t.TempDir()174
if srv.opSetCache("relatief", 0) == nil {175
t.Fatal("relatief pad geaccepteerd")176
}177
if srv.opSetCache(filepath.Join(srv.StoragePath(), "cache"), 0) == nil {178
t.Fatal("pad in opslag geaccepteerd")179
}180
root := t.TempDir()181
if err := srv.opSetCache(root, 0); err != nil || srv.ReadCache() == nil {182
t.Fatal(err)183
}184
// blijft bewaard over een herstart185
srv2 := &Server{StateDir: srv.StateDir}186
srv2.InitReadCache()187
if srv2.ReadCache() == nil || srv2.CacheConfig().Path != root {188
t.Fatal("instelling niet bewaard")189
}190
if err := srv.opSetCache("", 0); err != nil || srv.ReadCache() != nil {191
t.Fatal("uitzetten mislukt")192
}193
}194
195
// TestReadCacheColdWarm meet een overzichtspagina koud en warm.196
func TestReadCacheColdWarm(t *testing.T) {197
srv, _, get, _, _, _ := cacheServer(t)198
waitWarm(srv)199
const n = 20200
measure := func() time.Duration {201
start := time.Now()202
for i := 0; i < n; i++ {203
get("/tim/cached")204
}205
return time.Since(start) / n206
}207
keep := srv.ReadCache()208
srv.SetReadCache(nil)209
cold := measure()210
srv.SetReadCache(keep)211
get("/tim/cached")212
warm := measure()213
t.Logf("overzicht: zonder cache %v, warm %v per pagina", cold, warm)214
if warm > cold*2 {215
t.Fatalf("warm (%v) veel trager dan koud (%v)", warm, cold)216
}217
_ = readcache.DefaultMax218
}@@ -132,7 +132,7 @@ func (s *Server) commits(w http.ResponseWriter, r *http.Request) {
132
132
v.Wide = true
133
133
v.Query = clipQuery(r.URL.Query().Get("q"))
134
134
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
135
s.branchList(r, &v, dir)
135
s.branchList(r, &v, repo)
136
136
page := commitPageNum(r.URL.Query().Get("page"))
137
137
list, more := s.commitWindow(r.Context(), dir, v.Rev, v.Query, (page-1)*commitPageSize, commitPageSize)
138
138
lang := i18n.Parse(v.Lang)
@@ -132,7 +132,7 @@ func (s *Server) commits(w http.ResponseWriter, r *http.Request) {132
v.Wide = true132
v.Wide = true133
v.Query = clipQuery(r.URL.Query().Get("q"))133
v.Query = clipQuery(r.URL.Query().Get("q"))134
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)134
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)135
s.branchList(r, &v, dir)135
s.branchList(r, &v, repo)136
page := commitPageNum(r.URL.Query().Get("page"))136
page := commitPageNum(r.URL.Query().Get("page"))137
list, more := s.commitWindow(r.Context(), dir, v.Rev, v.Query, (page-1)*commitPageSize, commitPageSize)137
list, more := s.commitWindow(r.Context(), dir, v.Rev, v.Query, (page-1)*commitPageSize, commitPageSize)138
lang := i18n.Parse(v.Lang)138
lang := i18n.Parse(v.Lang)@@ -7,6 +7,7 @@ import (
7
7
"embed"
8
8
"encoding/hex"
9
9
"fmt"
10
"gitlab.com/Timfa/bluegit/internal/readcache"
10
11
"html/template"
11
12
"io/fs"
12
13
"log/slog"
@@ -65,6 +66,9 @@ type Server struct {
65
66
// mergingMR zijn merge requests die opMergeMR nu zelf afrondt.
66
67
// AfterPush mag hun bronbranch niet alvast verwijderen.
67
68
mergingMR sync.Map
69
70
cacheMu sync.RWMutex
71
rcache *readcache.Cache
68
72
}
69
73
70
74
type principal struct {
@@ -101,6 +105,8 @@ func (s *Server) Handler() http.Handler {
101
105
mux.HandleFunc("POST /new/group", s.createGroup)
102
106
mux.HandleFunc("GET /setup", s.setupPage)
103
107
mux.HandleFunc("POST /setup", s.setupSave)
108
mux.HandleFunc("POST /setup/cache", s.setupCacheSave)
109
mux.HandleFunc("POST /setup/cache/clear", s.setupCacheClear)
104
110
mux.HandleFunc("GET /settings", s.account)
105
111
mux.HandleFunc("POST /settings/language", s.saveLanguage)
106
112
mux.HandleFunc("POST /settings/profile", s.saveProfile)
@@ -608,6 +614,7 @@ type View struct {
608
614
StoragePercent int
609
615
StorageBlueGit string
610
616
StoragePartial bool
617
Cache map[string]any
611
618
StorageReserved string
612
619
HasReserved bool
613
620
MinFree string
@@ -7,6 +7,7 @@ import (7
"embed"7
"embed"8
"encoding/hex"8
"encoding/hex"9
"fmt"9
"fmt"10
"gitlab.com/Timfa/bluegit/internal/readcache"10
"html/template"11
"html/template"11
"io/fs"12
"io/fs"12
"log/slog"13
"log/slog"@@ -65,6 +66,9 @@ type Server struct {65
// mergingMR zijn merge requests die opMergeMR nu zelf afrondt.66
// mergingMR zijn merge requests die opMergeMR nu zelf afrondt.66
// AfterPush mag hun bronbranch niet alvast verwijderen.67
// AfterPush mag hun bronbranch niet alvast verwijderen.67
mergingMR sync.Map68
mergingMR sync.Map69
70
cacheMu sync.RWMutex71
rcache *readcache.Cache68
}72
}69
73
70
type principal struct {74
type principal struct {@@ -101,6 +105,8 @@ func (s *Server) Handler() http.Handler {101
mux.HandleFunc("POST /new/group", s.createGroup)105
mux.HandleFunc("POST /new/group", s.createGroup)102
mux.HandleFunc("GET /setup", s.setupPage)106
mux.HandleFunc("GET /setup", s.setupPage)103
mux.HandleFunc("POST /setup", s.setupSave)107
mux.HandleFunc("POST /setup", s.setupSave)108
mux.HandleFunc("POST /setup/cache", s.setupCacheSave)109
mux.HandleFunc("POST /setup/cache/clear", s.setupCacheClear)104
mux.HandleFunc("GET /settings", s.account)110
mux.HandleFunc("GET /settings", s.account)105
mux.HandleFunc("POST /settings/language", s.saveLanguage)111
mux.HandleFunc("POST /settings/language", s.saveLanguage)106
mux.HandleFunc("POST /settings/profile", s.saveProfile)112
mux.HandleFunc("POST /settings/profile", s.saveProfile)@@ -608,6 +614,7 @@ type View struct {608
StoragePercent int614
StoragePercent int609
StorageBlueGit string615
StorageBlueGit string610
StoragePartial bool616
StoragePartial bool617
Cache map[string]any611
StorageReserved string618
StorageReserved string612
HasReserved bool619
HasReserved bool613
MinFree string620
MinFree string@@ -227,6 +227,7 @@ func (s *Server) renderSetup(w http.ResponseWriter, r *http.Request, problem, pr
227
227
v.Err = s.trErr(r, err)
228
228
}
229
229
}
230
v.Cache = s.cacheInfo()
230
231
s.attachUpdate(&v, s.langOf(r))
231
232
s.render(w, "setup", v)
232
233
}
@@ -227,6 +227,7 @@ func (s *Server) renderSetup(w http.ResponseWriter, r *http.Request, problem, pr227
v.Err = s.trErr(r, err)227
v.Err = s.trErr(r, err)228
}228
}229
}229
}230
v.Cache = s.cacheInfo()230
s.attachUpdate(&v, s.langOf(r))231
s.attachUpdate(&v, s.langOf(r))231
s.render(w, "setup", v)232
s.render(w, "setup", v)232
}233
}@@ -150,27 +150,26 @@ func (s *Server) publicRepoCard(ctx context.Context, repo store.Repo, rest []str
150
150
151
151
func (s *Server) repoCard(ctx context.Context, repo store.Repo, page, img, oem string) card.Render {
152
152
prose := card.Excerpt(repo.Description, 180)
153
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
154
153
rev := repo.DefaultBranch
155
154
if prose == "" && s.StoragePath() != "" {
156
if entries, err := gitrepo.Tree(ctx, s.Git, dir, rev, ""); err == nil {
155
if entries, err := s.cTree(ctx, repo, rev, ""); err == nil {
157
156
readme, _ := findDocs(entries)
158
157
if readme != "" {
159
if text, binary, err := gitrepo.Blob(ctx, s.Git, dir, rev, readme, 80_000); err == nil && !binary {
158
if text, binary, err := s.cDoc(ctx, repo, rev, readme, 80_000); err == nil && !binary {
160
159
prose = card.Excerpt(text, 180)
161
160
}
162
161
}
163
162
}
164
163
}
165
164
var facts []string
166
if lang := s.repoLanguage(ctx, dir, rev); lang != "" {
165
if lang := s.repoLanguage(ctx, repo, rev); lang != "" {
167
166
facts = append(facts, lang)
168
167
}
169
168
if counts, _, err := s.Store.StarInfo(ctx, 0, []int64{repo.ID}); err == nil {
170
169
facts = append(facts, starLabel(counts[repo.ID]))
171
170
}
172
171
if s.StoragePath() != "" {
173
if c, err := gitrepo.LastCommit(ctx, s.Git, dir, rev, ""); err == nil && c.SHA != "" {
172
if c, err := s.cLastCommit(ctx, repo, rev, ""); err == nil && c.SHA != "" {
174
173
short := c.SHA
175
174
if len(short) > 8 {
176
175
short = short[:8]
@@ -441,11 +440,11 @@ func (s *Server) readLogo(kind string, id int64, mime string) []byte {
441
440
return buf.Bytes()
442
441
}
443
442
444
func (s *Server) repoLanguage(ctx context.Context, dir, rev string) string {
443
func (s *Server) repoLanguage(ctx context.Context, repo store.Repo, rev string) string {
445
444
if s.StoragePath() == "" {
446
445
return ""
447
446
}
448
entries, err := gitrepo.TreeAll(ctx, s.Git, dir, rev)
447
entries, err := s.cTreeAll(ctx, repo, rev)
449
448
if err != nil {
450
449
return ""
451
450
}
@@ -150,27 +150,26 @@ func (s *Server) publicRepoCard(ctx context.Context, repo store.Repo, rest []str150
150
151
func (s *Server) repoCard(ctx context.Context, repo store.Repo, page, img, oem string) card.Render {151
func (s *Server) repoCard(ctx context.Context, repo store.Repo, page, img, oem string) card.Render {152
prose := card.Excerpt(repo.Description, 180)152
prose := card.Excerpt(repo.Description, 180)153
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)154
rev := repo.DefaultBranch153
rev := repo.DefaultBranch155
if prose == "" && s.StoragePath() != "" {154
if prose == "" && s.StoragePath() != "" {156
if entries, err := gitrepo.Tree(ctx, s.Git, dir, rev, ""); err == nil {155
if entries, err := s.cTree(ctx, repo, rev, ""); err == nil {157
readme, _ := findDocs(entries)156
readme, _ := findDocs(entries)158
if readme != "" {157
if readme != "" {159
if text, binary, err := gitrepo.Blob(ctx, s.Git, dir, rev, readme, 80_000); err == nil && !binary {158
if text, binary, err := s.cDoc(ctx, repo, rev, readme, 80_000); err == nil && !binary {160
prose = card.Excerpt(text, 180)159
prose = card.Excerpt(text, 180)161
}160
}162
}161
}163
}162
}164
}163
}165
var facts []string164
var facts []string166
if lang := s.repoLanguage(ctx, dir, rev); lang != "" {165
if lang := s.repoLanguage(ctx, repo, rev); lang != "" {167
facts = append(facts, lang)166
facts = append(facts, lang)168
}167
}169
if counts, _, err := s.Store.StarInfo(ctx, 0, []int64{repo.ID}); err == nil {168
if counts, _, err := s.Store.StarInfo(ctx, 0, []int64{repo.ID}); err == nil {170
facts = append(facts, starLabel(counts[repo.ID]))169
facts = append(facts, starLabel(counts[repo.ID]))171
}170
}172
if s.StoragePath() != "" {171
if s.StoragePath() != "" {173
if c, err := gitrepo.LastCommit(ctx, s.Git, dir, rev, ""); err == nil && c.SHA != "" {172
if c, err := s.cLastCommit(ctx, repo, rev, ""); err == nil && c.SHA != "" {174
short := c.SHA173
short := c.SHA175
if len(short) > 8 {174
if len(short) > 8 {176
short = short[:8]175
short = short[:8]@@ -441,11 +440,11 @@ func (s *Server) readLogo(kind string, id int64, mime string) []byte {441
return buf.Bytes()440
return buf.Bytes()442
}441
}443
442
444
func (s *Server) repoLanguage(ctx context.Context, dir, rev string) string {443
func (s *Server) repoLanguage(ctx context.Context, repo store.Repo, rev string) string {445
if s.StoragePath() == "" {444
if s.StoragePath() == "" {446
return ""445
return ""447
}446
}448
entries, err := gitrepo.TreeAll(ctx, s.Git, dir, rev)447
entries, err := s.cTreeAll(ctx, repo, rev)449
if err != nil {448
if err != nil {450
return ""449
return ""451
}450
}@@ -21,8 +21,7 @@ func (s *Server) tags(w http.ResponseWriter, r *http.Request) {
21
21
v.Page = "tags"
22
22
v.Wide = true
23
23
v.Query = strings.TrimSpace(r.URL.Query().Get("q"))
24
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
25
s.branchList(r, &v, dir)
24
s.branchList(r, &v, repo)
26
25
lang := i18n.Parse(v.Lang)
27
26
patterns, _ := s.Store.ProtectedTagPatterns(r.Context(), repo.ID)
28
27
released := map[string]bool{}
@@ -31,7 +30,7 @@ func (s *Server) tags(w http.ResponseWriter, r *http.Request) {
31
30
released[rel.Tag] = true
32
31
}
33
32
}
34
infos, _ := gitrepo.ListTags(r.Context(), s.Git, dir)
33
infos, _ := s.cListTags(r.Context(), repo)
35
34
needle := strings.ToLower(v.Query)
36
35
for _, info := range infos {
37
36
if needle != "" && !strings.Contains(strings.ToLower(info.Name), needle) {
@@ -21,8 +21,7 @@ func (s *Server) tags(w http.ResponseWriter, r *http.Request) {21
v.Page = "tags"21
v.Page = "tags"22
v.Wide = true22
v.Wide = true23
v.Query = strings.TrimSpace(r.URL.Query().Get("q"))23
v.Query = strings.TrimSpace(r.URL.Query().Get("q"))24
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)24
s.branchList(r, &v, repo)25
s.branchList(r, &v, dir)26
lang := i18n.Parse(v.Lang)25
lang := i18n.Parse(v.Lang)27
patterns, _ := s.Store.ProtectedTagPatterns(r.Context(), repo.ID)26
patterns, _ := s.Store.ProtectedTagPatterns(r.Context(), repo.ID)28
released := map[string]bool{}27
released := map[string]bool{}@@ -31,7 +30,7 @@ func (s *Server) tags(w http.ResponseWriter, r *http.Request) {31
released[rel.Tag] = true30
released[rel.Tag] = true32
}31
}33
}32
}34
infos, _ := gitrepo.ListTags(r.Context(), s.Git, dir)33
infos, _ := s.cListTags(r.Context(), repo)35
needle := strings.ToLower(v.Query)34
needle := strings.ToLower(v.Query)36
for _, info := range infos {35
for _, info := range infos {37
if needle != "" && !strings.Contains(strings.ToLower(info.Name), needle) {36
if needle != "" && !strings.Contains(strings.ToLower(info.Name), needle) {@@ -27,6 +27,22 @@
27
27
</form>
28
28
<p class="muted">{{t "setup.rules" .MinFree}}</p>
29
29
</section>
30
{{with .Cache}}
31
<section class="panel" id="cache">
32
<h2>{{t "setup.cacheTitle"}}</h2>
33
<p class="muted">{{t "setup.cacheLead"}}</p>
34
{{if .enabled}}<p>{{t "setup.cacheUse" .bytes_h .max_h .entries .hits .misses}}</p>{{else}}<p class="muted">{{t "setup.cacheOff"}}</p>{{end}}
35
<form method="post" action="/setup/cache">
36
<input type="hidden" name="csrf" value="{{$.CSRF}}">
37
<label>{{t "setup.cachePath"}} <input name="cache_path" value="{{.path}}" placeholder="/var/cache/bluegit"></label>
38
<label>{{t "setup.cacheMax"}} <input name="max_mb" type="number" min="0" value="{{.max_mb}}" placeholder="512"></label>
39
<button type="submit">{{t "action.save"}}</button>
40
</form>
41
{{if .enabled}}<form method="post" action="/setup/cache/clear"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit" class="btn-ghost">{{t "setup.cacheClear"}}</button></form>{{end}}
42
<h3>{{t "setup.locTitle"}}</h3>
43
<table class="kv">{{range .locations}}<tr><th>{{index . "what"}}</th><td><code>{{index . "path"}}</code></td><td>{{with index . "disk"}}{{.}}{{else}}?{{end}}</td></tr>{{end}}</table>
44
</section>
45
{{end}}
30
46
{{if .ShowUpdate}}{{template "updatestatus" .}}{{end}}
31
47
{{template "layout-end" .}}
32
48
{{end}}
@@ -27,6 +27,22 @@27
</form>27
</form>28
<p class="muted">{{t "setup.rules" .MinFree}}</p>28
<p class="muted">{{t "setup.rules" .MinFree}}</p>29
</section>29
</section>30
{{with .Cache}}31
<section class="panel" id="cache">32
<h2>{{t "setup.cacheTitle"}}</h2>33
<p class="muted">{{t "setup.cacheLead"}}</p>34
{{if .enabled}}<p>{{t "setup.cacheUse" .bytes_h .max_h .entries .hits .misses}}</p>{{else}}<p class="muted">{{t "setup.cacheOff"}}</p>{{end}}35
<form method="post" action="/setup/cache">36
<input type="hidden" name="csrf" value="{{$.CSRF}}">37
<label>{{t "setup.cachePath"}} <input name="cache_path" value="{{.path}}" placeholder="/var/cache/bluegit"></label>38
<label>{{t "setup.cacheMax"}} <input name="max_mb" type="number" min="0" value="{{.max_mb}}" placeholder="512"></label>39
<button type="submit">{{t "action.save"}}</button>40
</form>41
{{if .enabled}}<form method="post" action="/setup/cache/clear"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit" class="btn-ghost">{{t "setup.cacheClear"}}</button></form>{{end}}42
<h3>{{t "setup.locTitle"}}</h3>43
<table class="kv">{{range .locations}}<tr><th>{{index . "what"}}</th><td><code>{{index . "path"}}</code></td><td>{{with index . "disk"}}{{.}}{{else}}?{{end}}</td></tr>{{end}}</table>44
</section>45
{{end}}30
{{if .ShowUpdate}}{{template "updatestatus" .}}{{end}}46
{{if .ShowUpdate}}{{template "updatestatus" .}}{{end}}31
{{template "layout-end" .}}47
{{template "layout-end" .}}32
{{end}}48
{{end}}@@ -0,0 +1,57 @@
1
package state
2
3
import (
4
"bufio"
5
"os"
6
"path/filepath"
7
"strings"
8
)
9
10
// DiskKind zegt of path op een SSD ("ssd"), een draaiende schijf ("hdd")
11
// of iets onbekends ("") staat. Alleen voor weergave in Beheer.
12
func DiskKind(path string) string {
13
abs, err := filepath.Abs(path)
14
if err != nil {
15
return ""
16
}
17
if r, err := filepath.EvalSymlinks(abs); err == nil {
18
abs = r
19
}
20
f, err := os.Open("/proc/self/mounts")
21
if err != nil {
22
return ""
23
}
24
defer f.Close()
25
best, src := "", ""
26
sc := bufio.NewScanner(f)
27
for sc.Scan() {
28
parts := strings.Fields(sc.Text())
29
if len(parts) < 2 {
30
continue
31
}
32
mnt := strings.ReplaceAll(parts[1], `\040`, " ")
33
if (abs == mnt || mnt == "/" || strings.HasPrefix(abs, strings.TrimRight(mnt, "/")+"/")) && len(mnt) >= len(best) {
34
best, src = mnt, parts[0]
35
}
36
}
37
if !strings.HasPrefix(src, "/dev/") {
38
return ""
39
}
40
dev, err := filepath.EvalSymlinks(src)
41
if err != nil {
42
dev = src
43
}
44
sys, err := filepath.EvalSymlinks(filepath.Join("/sys/class/block", filepath.Base(dev)))
45
if err != nil {
46
return ""
47
}
48
for _, p := range []string{filepath.Join(sys, "queue", "rotational"), filepath.Join(sys, "..", "queue", "rotational")} {
49
if b, err := os.ReadFile(p); err == nil {
50
if strings.TrimSpace(string(b)) == "1" {
51
return "hdd"
52
}
53
return "ssd"
54
}
55
}
56
return ""
57
}
@@ -0,0 +1,57 @@1
package state2
3
import (4
"bufio"5
"os"6
"path/filepath"7
"strings"8
)9
10
// DiskKind zegt of path op een SSD ("ssd"), een draaiende schijf ("hdd")11
// of iets onbekends ("") staat. Alleen voor weergave in Beheer.12
func DiskKind(path string) string {13
abs, err := filepath.Abs(path)14
if err != nil {15
return ""16
}17
if r, err := filepath.EvalSymlinks(abs); err == nil {18
abs = r19
}20
f, err := os.Open("/proc/self/mounts")21
if err != nil {22
return ""23
}24
defer f.Close()25
best, src := "", ""26
sc := bufio.NewScanner(f)27
for sc.Scan() {28
parts := strings.Fields(sc.Text())29
if len(parts) < 2 {30
continue31
}32
mnt := strings.ReplaceAll(parts[1], `\040`, " ")33
if (abs == mnt || mnt == "/" || strings.HasPrefix(abs, strings.TrimRight(mnt, "/")+"/")) && len(mnt) >= len(best) {34
best, src = mnt, parts[0]35
}36
}37
if !strings.HasPrefix(src, "/dev/") {38
return ""39
}40
dev, err := filepath.EvalSymlinks(src)41
if err != nil {42
dev = src43
}44
sys, err := filepath.EvalSymlinks(filepath.Join("/sys/class/block", filepath.Base(dev)))45
if err != nil {46
return ""47
}48
for _, p := range []string{filepath.Join(sys, "queue", "rotational"), filepath.Join(sys, "..", "queue", "rotational")} {49
if b, err := os.ReadFile(p); err == nil {50
if strings.TrimSpace(string(b)) == "1" {51
return "hdd"52
}53
return "ssd"54
}55
}56
return ""57
}@@ -22,6 +22,8 @@ ProtectHome=true
22
22
# pad toe via packaging/storage.conf, want ProtectSystem blokkeert het anders.
23
23
StateDirectory=bluegit
24
24
ReadWritePaths=/var/lib/bluegit
25
# CacheDirectory maakt /var/cache/bluegit aan voor de optionele leescache.
26
CacheDirectory=bluegit
25
27
PrivateTmp=true
26
28
27
29
[Install]
@@ -22,6 +22,8 @@ ProtectHome=true22
# pad toe via packaging/storage.conf, want ProtectSystem blokkeert het anders.22
# pad toe via packaging/storage.conf, want ProtectSystem blokkeert het anders.23
StateDirectory=bluegit23
StateDirectory=bluegit24
ReadWritePaths=/var/lib/bluegit24
ReadWritePaths=/var/lib/bluegit25
# CacheDirectory maakt /var/cache/bluegit aan voor de optionele leescache.26
CacheDirectory=bluegit25
PrivateTmp=true27
PrivateTmp=true26
28
27
[Install]29
[Install]@@ -6,6 +6,9 @@ listen: 0.0.0.0:8080
6
6
state_path: /var/lib/bluegit
7
7
# storage_path blijft leeg. De installatiebeheerder kiest de datadisk
8
8
# bij de eerste aanmelding. Er is geen standaardpad.
9
# cache_path is optioneel: een leescache voor overzichtspagina's, bij
10
# voorkeur op de SSD (bijv. /var/cache/bluegit). Leeg = geen cache.
11
# Beheer (/setup) kan het ook instellen. cache_max_mb: standaard 512.
9
12
# Alleen deze adressen mogen X-Forwarded-For en X-Real-IP zetten.
10
13
# Zet hier het IP van de ingress, zoals de mini-PC die verbinding ziet.
11
14
trusted_proxies:
@@ -6,6 +6,9 @@ listen: 0.0.0.0:80806
state_path: /var/lib/bluegit6
state_path: /var/lib/bluegit7
# storage_path blijft leeg. De installatiebeheerder kiest de datadisk7
# storage_path blijft leeg. De installatiebeheerder kiest de datadisk8
# bij de eerste aanmelding. Er is geen standaardpad.8
# bij de eerste aanmelding. Er is geen standaardpad.9
# cache_path is optioneel: een leescache voor overzichtspagina's, bij10
# voorkeur op de SSD (bijv. /var/cache/bluegit). Leeg = geen cache.11
# Beheer (/setup) kan het ook instellen. cache_max_mb: standaard 512.9
# Alleen deze adressen mogen X-Forwarded-For en X-Real-IP zetten.12
# Alleen deze adressen mogen X-Forwarded-For en X-Real-IP zetten.10
# Zet hier het IP van de ingress, zoals de mini-PC die verbinding ziet.13
# Zet hier het IP van de ingress, zoals de mini-PC die verbinding ziet.11
trusted_proxies:14
trusted_proxies: