mirror of
https://github.com/wisplite/raster.git
synced 2026-05-01 06:32:44 -05:00
image viewer page, improved gallery tiling, thumbnail generation and caching
This commit is contained in:
@@ -4,6 +4,7 @@ import (
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/wisplite/raster/internal/services"
|
||||
@@ -103,4 +104,53 @@ func RegisterMediaRoutes(rg *gin.RouterGroup) {
|
||||
}
|
||||
c.File(mediaData.Path)
|
||||
})
|
||||
media.GET("/thumb/:albumId/:mediaId", func(c *gin.Context) {
|
||||
albumID := c.Param("albumId")
|
||||
mediaID := c.Param("mediaId")
|
||||
widthStr := c.Query("width")
|
||||
heightStr := c.Query("height")
|
||||
width, _ := strconv.Atoi(widthStr)
|
||||
height, _ := strconv.Atoi(heightStr)
|
||||
|
||||
if albumID == "root" {
|
||||
albumID = ""
|
||||
}
|
||||
isPublic, err := services.IsAlbumPublic(albumID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
allowed := false
|
||||
if isPublic {
|
||||
allowed = true
|
||||
} else {
|
||||
accessToken := c.GetHeader("Authorization")
|
||||
userID, err := services.ValidateAccessToken(accessToken)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
accessLevel, err := services.CheckUserAlbumAccess(userID, albumID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
if accessLevel >= 0 {
|
||||
allowed = true
|
||||
} else {
|
||||
c.JSON(http.StatusForbidden, gin.H{"error": "user does not have permission to view media in this album"})
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if allowed {
|
||||
thumbPath, err := services.GetThumbnail(albumID, mediaID, width, height)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
c.File(thumbPath)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -7,8 +7,12 @@ import (
|
||||
_ "image/jpeg"
|
||||
_ "image/png"
|
||||
"mime/multipart"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/disintegration/imaging"
|
||||
"github.com/google/uuid"
|
||||
"github.com/rwcarlsen/goexif/exif"
|
||||
"github.com/wisplite/raster/internal/db"
|
||||
"github.com/wisplite/raster/internal/models"
|
||||
"gorm.io/datatypes"
|
||||
@@ -31,30 +35,54 @@ func UploadMedia(file *multipart.FileHeader, albumID string, accessToken string)
|
||||
albumPath = "root"
|
||||
}
|
||||
|
||||
// Extract metadata (dimensions)
|
||||
// Extract metadata (dimensions and file info)
|
||||
var meta datatypes.JSON
|
||||
metadataMap := map[string]interface{}{
|
||||
"originalFilename": file.Filename,
|
||||
"fileSize": file.Size,
|
||||
"contentType": file.Header.Get("Content-Type"),
|
||||
}
|
||||
|
||||
src, err := file.Open()
|
||||
if err == nil {
|
||||
defer src.Close()
|
||||
cfg, _, err := image.DecodeConfig(src)
|
||||
cfg, format, err := image.DecodeConfig(src)
|
||||
if err == nil {
|
||||
m := map[string]int{
|
||||
"width": cfg.Width,
|
||||
"height": cfg.Height,
|
||||
metadataMap["width"] = cfg.Width
|
||||
metadataMap["height"] = cfg.Height
|
||||
metadataMap["format"] = format
|
||||
|
||||
// Check for EXIF orientation
|
||||
src.Seek(0, 0)
|
||||
x, err := exif.Decode(src)
|
||||
if err == nil {
|
||||
orient, err := x.Get(exif.Orientation)
|
||||
if err == nil {
|
||||
val, err := orient.Int(0)
|
||||
if err == nil {
|
||||
if val >= 5 && val <= 8 {
|
||||
metadataMap["width"] = cfg.Height
|
||||
metadataMap["height"] = cfg.Width
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
b, _ := json.Marshal(m)
|
||||
meta = datatypes.JSON(b)
|
||||
}
|
||||
}
|
||||
|
||||
b, _ := json.Marshal(metadataMap)
|
||||
meta = datatypes.JSON(b)
|
||||
|
||||
mediaID := uuid.New().String()
|
||||
mediaPath := fmt.Sprintf("media/%s/%s.%s", albumPath, mediaID, file.Filename)
|
||||
media := models.Media{
|
||||
ID: mediaID,
|
||||
AlbumID: albumID,
|
||||
Path: mediaPath,
|
||||
Type: file.Header.Get("Content-Type"),
|
||||
Metadata: meta,
|
||||
ID: mediaID,
|
||||
AlbumID: albumID,
|
||||
Path: mediaPath,
|
||||
Type: file.Header.Get("Content-Type"),
|
||||
Title: file.Filename,
|
||||
Description: "",
|
||||
Metadata: meta,
|
||||
}
|
||||
result := db.GetDB().Create(&media)
|
||||
if result.Error != nil {
|
||||
@@ -100,3 +128,69 @@ func GetMedia(albumID string, mediaID string) (models.Media, error) {
|
||||
}
|
||||
return media, nil
|
||||
}
|
||||
|
||||
func GetThumbnail(albumID string, mediaID string, width int, height int) (string, error) {
|
||||
media, err := GetMedia(albumID, mediaID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
if width == 0 {
|
||||
width = 200
|
||||
}
|
||||
if height == 0 {
|
||||
height = 200
|
||||
}
|
||||
|
||||
cacheDir := "cache/thumbnails"
|
||||
if err := os.MkdirAll(cacheDir, 0755); err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
ext := filepath.Ext(media.Path)
|
||||
if ext == "" {
|
||||
ext = ".jpg"
|
||||
}
|
||||
thumbName := fmt.Sprintf("%s_%dx%d%s", mediaID, width, height, ext)
|
||||
thumbPath := filepath.Join(cacheDir, thumbName)
|
||||
|
||||
if _, err := os.Stat(thumbPath); err == nil {
|
||||
return thumbPath, nil
|
||||
}
|
||||
|
||||
srcImage, err := imaging.Open(media.Path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
f, err := os.Open(media.Path)
|
||||
if err == nil {
|
||||
x, err := exif.Decode(f)
|
||||
f.Close()
|
||||
if err == nil {
|
||||
orient, err := x.Get(exif.Orientation)
|
||||
if err == nil {
|
||||
val, err := orient.Int(0)
|
||||
if err == nil {
|
||||
switch val {
|
||||
case 3:
|
||||
srcImage = imaging.Rotate180(srcImage)
|
||||
case 6:
|
||||
srcImage = imaging.Rotate270(srcImage)
|
||||
case 8:
|
||||
srcImage = imaging.Rotate90(srcImage)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dstImage := imaging.Fill(srcImage, width, height, imaging.Center, imaging.Lanczos)
|
||||
|
||||
err = imaging.Save(dstImage, thumbPath)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return thumbPath, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user