stephen/caddy-hugo2
1
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

committing changes from who knows when

Browse Source
This commit is contained in:
stephen
2022-07-05 22:18:23 -04:00
parent 548075696c
commit 51c4837aaf
9 changed files with 1046 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files
media.go
+19 -14
View File
@@ -18,7 +18,12 @@ func (ch *CaddyHugo) ReferencedMedia() map[string]map[page.Page]struct{} {
found := map[string]map[page.Page]struct{}{}
for _, pg := range ch.HugoSites.Pages() {
r := bytes.NewBufferString(string(pg.Render()))
renderOutput, err := pg.Render()
if err != nil {
continue
}
r := bytes.NewBufferString(string(renderOutput))
doc, err := goquery.NewDocumentFromReader(r)
if err != nil {
continue
@@ -43,16 +48,16 @@ func (ch *CaddyHugo) ReferencedMedia() map[string]map[page.Page]struct{} {
return found
}
func (ch *CaddyHugo) uploadMedia(w http.ResponseWriter, r *http.Request) (int, error) {
func (ch *CaddyHugo) uploadMedia(w http.ResponseWriter, r *http.Request) error {
if ch.Media == nil {
http.NotFound(w, r)
return 404, nil
return nil
}
mr, err := r.MultipartReader()
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return 400, nil
return nil
}
for {
@@ -62,7 +67,7 @@ func (ch *CaddyHugo) uploadMedia(w http.ResponseWriter, r *http.Request) (int, e
}
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return 400, nil
return err
}
name := part.FileName()
@@ -70,18 +75,18 @@ func (ch *CaddyHugo) uploadMedia(w http.ResponseWriter, r *http.Request) (int, e
err = ch.Media.ReceiveNewMedia(name, part)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return 500, nil
return nil
}
}
}
return 200, nil
return nil
}
func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int, error) {
func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) error {
if ch.Media == nil {
http.NotFound(w, r)
return 404, nil
return nil
}
referenced := ch.ReferencedMedia()
@@ -114,7 +119,7 @@ func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int
mm, err := ch.Media.Walk()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return 500, nil
return err
}
for _, m := range media.Set(mm).ByDate() {
@@ -167,15 +172,15 @@ func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int
}
}
</script></body><html>`)
return 200, nil
return nil
}
func (ch *CaddyHugo) serveMedia(w http.ResponseWriter, r *http.Request) (int, error) {
func (ch *CaddyHugo) serveMedia(w http.ResponseWriter, r *http.Request) error {
if ch.Media == nil {
http.NotFound(w, r)
return 404, nil
return nil
}
ch.Media.ServeHTTP(w, r)
return 200, nil
return nil
}