vor temaplte
This commit is contained in:
@@ -60,21 +60,32 @@ func Register(mux *http.ServeMux, d Deps) {
|
||||
items, nextOut, _ := d.Store.List(r.Context(), nextID, 100)
|
||||
|
||||
type row struct {
|
||||
ID string
|
||||
Name string
|
||||
UpdatedAt int64
|
||||
HasBlob bool
|
||||
Size int64
|
||||
ID string
|
||||
Name string
|
||||
UpdatedAt int64
|
||||
HasBlob bool
|
||||
Size int64
|
||||
Owner string
|
||||
OwnerActive bool
|
||||
}
|
||||
rows := make([]row, 0, len(items))
|
||||
|
||||
peers := d.Mesh.PeerList()
|
||||
ttl := 2 * time.Minute
|
||||
if cfg := d.Mesh.Config(); cfg.PeerTTL > 0 {
|
||||
ttl = cfg.PeerTTL
|
||||
}
|
||||
|
||||
for _, it := range items {
|
||||
meta, ok, _ := d.Blob.Stat(r.Context(), it.ID)
|
||||
rows = append(rows, row{
|
||||
ID: it.ID,
|
||||
Name: it.Name,
|
||||
UpdatedAt: it.UpdatedAt,
|
||||
HasBlob: ok,
|
||||
Size: meta.Size,
|
||||
ID: it.ID,
|
||||
Name: it.Name,
|
||||
UpdatedAt: it.UpdatedAt,
|
||||
HasBlob: ok,
|
||||
Size: meta.Size,
|
||||
Owner: it.Owner,
|
||||
OwnerActive: isOwnerActive(it.Owner, peers, ttl),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -84,6 +95,42 @@ func Register(mux *http.ServeMux, d Deps) {
|
||||
})
|
||||
})
|
||||
|
||||
mux.HandleFunc("/admin/items/takeover", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
id := strings.TrimSpace(r.FormValue("id"))
|
||||
if id != "" {
|
||||
// Nur zulassen, wenn Owner tatsächlich offline ist
|
||||
it, err := d.Store.Get(r.Context(), filesvc.ID(id))
|
||||
if err == nil {
|
||||
peers := d.Mesh.PeerList()
|
||||
ttl := 2 * time.Minute
|
||||
if cfg := d.Mesh.Config(); cfg.PeerTTL > 0 {
|
||||
ttl = cfg.PeerTTL
|
||||
}
|
||||
if !isOwnerActive(it.Owner, peers, ttl) {
|
||||
// eigene URL aus PeerList ermitteln
|
||||
self := ""
|
||||
for _, p := range peers {
|
||||
if p.Self {
|
||||
self = p.URL
|
||||
break
|
||||
}
|
||||
}
|
||||
if self == "" {
|
||||
self = "unknown-self"
|
||||
}
|
||||
if _, err := d.Store.TakeoverOwner(r.Context(), filesvc.ID(id), self); err == nil {
|
||||
_ = d.Mesh.SyncNow(r.Context())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
renderItemsPartial(w, r, d)
|
||||
})
|
||||
|
||||
// Upload (multipart/form-data, Feldname "file", optional name-Override)
|
||||
mux.HandleFunc("/admin/files/upload", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
@@ -258,25 +305,32 @@ func BasicAuth(user, pass string, next http.Handler) http.Handler {
|
||||
// rebuild & render items partial for HTMX swaps
|
||||
func renderItemsPartial(w http.ResponseWriter, r *http.Request, d Deps) {
|
||||
type row struct {
|
||||
ID string
|
||||
Name string
|
||||
UpdatedAt int64
|
||||
HasBlob bool
|
||||
Size int64
|
||||
ID string
|
||||
Name string
|
||||
UpdatedAt int64
|
||||
HasBlob bool
|
||||
Size int64
|
||||
Owner string
|
||||
OwnerActive bool
|
||||
}
|
||||
|
||||
nextID := filesvc.ID(strings.TrimSpace(r.URL.Query().Get("next")))
|
||||
items, nextOut, _ := d.Store.List(r.Context(), nextID, 100)
|
||||
|
||||
peers := d.Mesh.PeerList()
|
||||
ttl := 2 * time.Minute
|
||||
|
||||
rows := make([]row, 0, len(items))
|
||||
for _, it := range items {
|
||||
meta, ok, _ := d.Blob.Stat(r.Context(), (it.ID))
|
||||
rows = append(rows, row{
|
||||
ID: (it.ID),
|
||||
Name: it.Name,
|
||||
UpdatedAt: it.UpdatedAt,
|
||||
HasBlob: ok,
|
||||
Size: meta.Size,
|
||||
ID: (it.ID),
|
||||
Name: it.Name,
|
||||
UpdatedAt: it.UpdatedAt,
|
||||
HasBlob: ok,
|
||||
Size: meta.Size,
|
||||
Owner: it.Owner,
|
||||
OwnerActive: isOwnerActive(it.Owner, peers, ttl),
|
||||
})
|
||||
}
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
@@ -285,3 +339,23 @@ func renderItemsPartial(w http.ResponseWriter, r *http.Request, d Deps) {
|
||||
"Next": nextOut,
|
||||
})
|
||||
}
|
||||
|
||||
func isOwnerActive(owner string, peers []mesh.Peer, ttl time.Duration) bool {
|
||||
if strings.TrimSpace(owner) == "" {
|
||||
return true
|
||||
}
|
||||
cutoff := time.Now().Add(-ttl)
|
||||
for _, p := range peers {
|
||||
if strings.TrimSpace(p.URL) == strings.TrimSpace(owner) {
|
||||
// Self ist immer aktiv, sonst nach LastSeen
|
||||
if p.Self {
|
||||
return true
|
||||
}
|
||||
if p.LastSeen.IsZero() {
|
||||
return false
|
||||
}
|
||||
return p.LastSeen.After(cutoff)
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -24,12 +24,27 @@
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th><th>Name</th><th>Updated</th><th>Blob</th><th style="width:260px">Aktionen</th>
|
||||
<th>Owner</th><th>Status</th><th>ID</th><th>Name</th><th>Updated</th><th>Blob</th><th style="width:260px">Aktionen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{ range .Items }}
|
||||
<tr>
|
||||
<td><small class="muted">{{ .Owner }}</small></td>
|
||||
<td>
|
||||
{{ if .OwnerActive }}
|
||||
<span class="pill">online</span>
|
||||
{{ else }}
|
||||
<span class="pill" style="background:#5b1a1a;border-color:#7a2b2b;color:#fbb">offline</span>
|
||||
<form style="display:inline"
|
||||
hx-post="/admin/items/takeover"
|
||||
hx-target="#items" hx-swap="outerHTML"
|
||||
onsubmit="return confirm('Owner übernehmen?');">
|
||||
<input type="hidden" name="id" value="{{ .ID }}">
|
||||
<button class="btn" type="submit">Übernehmen</button>
|
||||
</form>
|
||||
{{ end }}
|
||||
</td>
|
||||
<td>{{ .ID }}</td>
|
||||
<td>{{ .Name }}</td>
|
||||
<td><small class="muted">{{ printf "%.19s" (timeRFC3339 .UpdatedAt) }}</small></td>
|
||||
|
||||
Reference in New Issue
Block a user