johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Videos: Add immutable cache header to API response #2875

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2023-04-14 14:46:56 +02:00
parent d74a9c097e
commit ffd307e11d
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
internal/api/thumbnails.go
View File

@@ -63,10 +63,12 @@ func GetThumb(router *gin.RouterGroup) {
return
}
// Add HTTP cache header.
AddImmutableCacheHeader(c)
if download {
c.FileAttachment(fileName, cropName.Jpeg())
} else {
AddThumbCacheHeader(c)
c.File(fileName)
}
@@ -107,10 +109,12 @@ func GetThumb(router *gin.RouterGroup) {
return
}
if c.Query("download") != "" {
// Add HTTP cache header.
AddImmutableCacheHeader(c)
if download {
c.FileAttachment(cached.FileName, cached.ShareName)
} else {
AddThumbCacheHeader(c)
c.File(cached.FileName)
}
@@ -120,7 +124,10 @@ func GetThumb(router *gin.RouterGroup) {
// Return existing thumbs straight away.
if !download {
if fileName, err := size.ResolvedName(fileHash, conf.ThumbCachePath()); err == nil {
AddThumbCacheHeader(c)
// Add HTTP cache header.
AddImmutableCacheHeader(c)
// Return requested content.
c.File(fileName)
return
}
@@ -177,12 +184,14 @@ func GetThumb(router *gin.RouterGroup) {
}
// Use original file if thumb size exceeds limit, see https://github.com/photoprism/photoprism/issues/157
if size.ExceedsLimit() && c.Query("download") == "" {
if size.ExceedsLimit() && !download {
log.Debugf("%s: using original, size exceeds limit (width %d, height %d)", logPrefix, size.Width, size.Height)
AddThumbCacheHeader(c)
c.File(fileName)
// Add HTTP cache header.
AddImmutableCacheHeader(c)
// Return requested content.
c.File(fileName)
return
}
@@ -211,11 +220,13 @@ func GetThumb(router *gin.RouterGroup) {
cache.SetDefault(cacheKey, ThumbCache{thumbName, f.ShareBase(0)})
log.Debugf("cached %s [%s]", cacheKey, time.Since(start))
// Set the download or cache header and return the thumbnail.
// Add HTTP cache header.
AddImmutableCacheHeader(c)
// Return requested content.
if download {
c.FileAttachment(thumbName, f.DownloadName(DownloadName(c), 0))
} else {
AddThumbCacheHeader(c)
c.File(thumbName)
}
})