luisgulo/photoprism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using relative path for file names in database

Browse Source
This commit is contained in:
Michael Mayer 2018-09-18 19:23:40 +02:00
parent 0148096c86
commit 0c39f51a86
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/photoprism/importer.go
View File

@ -2,7 +2,6 @@ package photoprism
import (
"fmt"
"github.com/pkg/errors"
"log"
"os"
"path"
@ -141,7 +140,7 @@ func (i *Importer) GetDestinationFilename(mainFile *MediaFile, mediaFile *MediaF
for fileExists(result) {
if mediaFile.GetHash() == fileHash(result) {
return result, errors.New("File already exists")
return result, fmt.Errorf("file already exists: %s", result)
}
iteration++

2
internal/photoprism/indexer.go
View File

@ -170,7 +170,7 @@ func (i *Indexer) IndexMediaFile(mediaFile *MediaFile) {
if result := i.db.First(&file, "file_hash = ?", fileHash); result.Error != nil {
file.PhotoID = photo.ID
file.FilePrimary = isPrimary
file.FileName = mediaFile.GetFilename()
file.FileName = mediaFile.GetRelativeFilename(i.originalsPath)
file.FileHash = fileHash
file.FileType = mediaFile.GetType()
file.FileMime = mediaFile.GetMimeType()

9
internal/server/routes.go
View File

@ -1,6 +1,7 @@
package server
import (
"fmt"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
"github.com/photoprism/photoprism/internal/forms"
@ -59,7 +60,9 @@ func ConfigureRoutes(app *gin.Engine, conf *photoprism.Config) {
file := search.FindFile(id)
if mediaFile, err := photoprism.NewMediaFile(file.FileName); err == nil {
fileName := fmt.Sprintf("%s/%s", conf.OriginalsPath, file.FileName)
if mediaFile, err := photoprism.NewMediaFile(fileName); err == nil {
thumbnail, _ := mediaFile.GetThumbnail(conf.ThumbnailsPath, size)
c.File(thumbnail.GetFilename())
@ -76,7 +79,9 @@ func ConfigureRoutes(app *gin.Engine, conf *photoprism.Config) {
file := search.FindFile(id)
if mediaFile, err := photoprism.NewMediaFile(file.FileName); err == nil {
fileName := fmt.Sprintf("%s/%s", conf.OriginalsPath, file.FileName)
if mediaFile, err := photoprism.NewMediaFile(fileName); err == nil {
thumbnail, _ := mediaFile.GetSquareThumbnail(conf.ThumbnailsPath, size)
c.File(thumbnail.GetFilename())