More changes to uploads:
- Have got upload images appearing in the post list - Allowed for deleting uploads - Allowed for seeing the upload progress - Fixed the setting of upload properties like the MIME type - Removed the stripe exif logic with just re-encoding PNGs and JPEGs by loading them and saving them
This commit is contained in:
parent
d0cebe6564
commit
199ff9feb9
21 changed files with 471 additions and 65 deletions
|
|
@ -2,12 +2,14 @@ package handlers
|
|||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/gofiber/fiber/v3"
|
||||
"lmika.dev/lmika/weiro/models"
|
||||
"lmika.dev/lmika/weiro/services/uploads"
|
||||
"lmika.dev/pkg/modash/moslice"
|
||||
)
|
||||
|
|
@ -45,6 +47,23 @@ func (uh UploadsHandler) Show(c fiber.Ctx) error {
|
|||
return c.Render("uploads/show", fiber.Map{"upload": upload})
|
||||
}
|
||||
|
||||
func (uh UploadsHandler) Delete(c fiber.Ctx) error {
|
||||
uploadIDStr := c.Params("uploadID")
|
||||
if uploadIDStr == "" {
|
||||
return fiber.ErrBadRequest
|
||||
}
|
||||
uploadID, err := strconv.ParseInt(uploadIDStr, 10, 64)
|
||||
if err != nil {
|
||||
return fiber.ErrBadRequest
|
||||
}
|
||||
|
||||
if err := uh.UploadsService.DeleteUpload(c.Context(), uploadID); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return c.Redirect().To(fmt.Sprintf("/sites/%v/uploads", models.MustGetSite(c.Context()).ID))
|
||||
}
|
||||
|
||||
func (uh UploadsHandler) ShowRaw(c fiber.Ctx) error {
|
||||
uploadIDStr := c.Params("uploadID")
|
||||
if uploadIDStr == "" {
|
||||
|
|
@ -61,10 +80,29 @@ func (uh UploadsHandler) ShowRaw(c fiber.Ctx) error {
|
|||
return err
|
||||
}
|
||||
|
||||
return uh.serveUpload(c, upload, rwFn)
|
||||
}
|
||||
|
||||
func (uh UploadsHandler) ShowFromSlug(c fiber.Ctx) error {
|
||||
uploadSlug := c.Params("+")
|
||||
if uploadSlug == "" {
|
||||
return fiber.ErrBadRequest
|
||||
}
|
||||
|
||||
upload, rwFn, err := uh.UploadsService.OpenUploadFromSlug(c.Context(), uploadSlug)
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
return err
|
||||
}
|
||||
|
||||
return uh.serveUpload(c, upload, rwFn)
|
||||
}
|
||||
|
||||
func (uh UploadsHandler) serveUpload(c fiber.Ctx, upload models.Upload, uploadReader func() (io.ReadCloser, error)) error {
|
||||
c.Set("Content-Type", upload.MIMEType)
|
||||
c.Status(http.StatusOK)
|
||||
return c.SendStreamWriter(func(w *bufio.Writer) {
|
||||
rw, err := rwFn()
|
||||
rw, err := uploadReader()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -75,7 +113,6 @@ func (uh UploadsHandler) ShowRaw(c fiber.Ctx) error {
|
|||
return
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func (uh UploadsHandler) New(c fiber.Ctx) error {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue