Universal sidecar configuration, indexing with multiple roots #268 #348

Slowly getting to the point where only very few people are able to maintain this codebase :)

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer
2020-06-07 10:09:35 +02:00
parent 9bd2a867be
commit a91206a509
60 changed files with 468 additions and 319 deletions

View File

@@ -3,9 +3,9 @@ package api
import (
"fmt"
"net/http"
"path"
"github.com/photoprism/photoprism/internal/config"
"github.com/photoprism/photoprism/internal/photoprism"
"github.com/photoprism/photoprism/internal/query"
"github.com/photoprism/photoprism/pkg/fs"
"github.com/photoprism/photoprism/pkg/txt"
@@ -37,7 +37,7 @@ func GetDownload(router *gin.RouterGroup, conf *config.Config) {
return
}
fileName := path.Join(conf.OriginalsPath(), f.FileName)
fileName := photoprism.FileName(f.FileRoot, f.FileName)
if !fs.FileExists(fileName) {
log.Errorf("download: file %s is missing", txt.Quote(f.FileName))