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

Routing: Prefix frontend UI routes with /library #840 #2466

Browse Source 
Also improves migrations and updates the db schema docs.

Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2022-10-15 21:54:11 +02:00
parent 3bad6820d7
commit e3bb8b19dd
202 changed files with 3189 additions and 2608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/api/thumbnails.go
View File

@@ -8,9 +8,9 @@ import (
"github.com/gin-gonic/gin"
"github.com/photoprism/photoprism/internal/crop"
"github.com/photoprism/photoprism/internal/get"
"github.com/photoprism/photoprism/internal/photoprism"
"github.com/photoprism/photoprism/internal/query"
"github.com/photoprism/photoprism/internal/service"
"github.com/photoprism/photoprism/internal/thumb"
"github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/fs"
@@ -35,7 +35,7 @@ func GetThumb(router *gin.RouterGroup) {
logPrefix := "thumb"
start := time.Now()
conf := service.Config()
conf := get.Config()
download := c.Query("download") != ""
fileHash, cropArea := crop.ParseThumb(clean.Token(c.Param("thumb")))
@@ -93,7 +93,7 @@ func GetThumb(router *gin.RouterGroup) {
}
}
cache := service.ThumbCache()
cache := get.ThumbCache()
cacheKey := CacheKey("thumbs", fileHash, string(sizeName))
if cacheData, ok := cache.Get(cacheKey); ok {
@@ -196,7 +196,7 @@ func GetThumb(router *gin.RouterGroup) {
thumbName, err = size.FromCache(fileName, f.FileHash, conf.ThumbCachePath())
}
// Failed?
// RunFailed?
if err != nil {
log.Errorf("%s: %s", logPrefix, err)
c.Data(http.StatusOK, "image/svg+xml", brokenIconSvg)