beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Rename Config.GetThumbnailsPath() to ThumbnailsPath(), see #50

Browse source
This commit is contained in:
Michael Mayer 2018-12-21 03:24:22 +01:00
parent 3462257cce
commit 628c598f08
10 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/api/thumbnails.go
View file

@ -41,14 +41,14 @@ func GetThumbnail(router *gin.RouterGroup, conf photoprism.Config) {
if mediaFile, err := photoprism.NewMediaFile(fileName); err == nil { if mediaFile, err := photoprism.NewMediaFile(fileName); err == nil {
switch thumbnailType { switch thumbnailType {
case "fit": case "fit":
if thumbnail, err := mediaFile.GetThumbnail(conf.GetThumbnailsPath(), size); err == nil { if thumbnail, err := mediaFile.GetThumbnail(conf.ThumbnailsPath(), size); err == nil {
c.File(thumbnail.GetFilename()) c.File(thumbnail.GetFilename())
} else { } else {
log.Printf("could not create thumbnail: %s", err.Error()) log.Printf("could not create thumbnail: %s", err.Error())
c.Data(400, "image/svg+xml", photoIconSvg) c.Data(400, "image/svg+xml", photoIconSvg)
} }
case "square": case "square":
if thumbnail, err := mediaFile.GetSquareThumbnail(conf.GetThumbnailsPath(), size); err == nil { if thumbnail, err := mediaFile.GetSquareThumbnail(conf.ThumbnailsPath(), size); err == nil {
c.File(thumbnail.GetFilename()) c.File(thumbnail.GetFilename())
} else { } else {
log.Printf("could not create square thumbnail: %s", err.Error()) log.Printf("could not create square thumbnail: %s", err.Error())

2
internal/commands/export.go
View file

@ -75,7 +75,7 @@ func exportAction(ctx *cli.Context) error {
fmt.Printf("Exporting photos to %s...\n", exportPath) fmt.Printf("Exporting photos to %s...\n", exportPath)
photoprism.ExportPhotosFromOriginals(originals, conf.GetThumbnailsPath(), exportPath, size) photoprism.ExportPhotosFromOriginals(originals, conf.ThumbnailsPath(), exportPath, size)
fmt.Println("Done.") fmt.Println("Done.")

4
internal/commands/thumbnails.go
View file

@ -37,7 +37,7 @@ func thumbnailsAction(ctx *cli.Context) error {
log.Fatal(err) log.Fatal(err)
} }
fmt.Printf("Creating thumbnails in %s...\n", conf.GetThumbnailsPath()) fmt.Printf("Creating thumbnails in %s...\n", conf.ThumbnailsPath())
sizes := ctx.IntSlice("size") sizes := ctx.IntSlice("size")
@ -51,7 +51,7 @@ func thumbnailsAction(ctx *cli.Context) error {
} }
for _, size := range sizes { for _, size := range sizes {
photoprism.CreateThumbnailsFromOriginals(conf.OriginalsPath(), conf.GetThumbnailsPath(), size, ctx.Bool("square")) photoprism.CreateThumbnailsFromOriginals(conf.OriginalsPath(), conf.ThumbnailsPath(), size, ctx.Bool("square"))
} }
fmt.Println("Done.") fmt.Println("Done.")

6
internal/context/config.go
View file

@ -225,7 +225,7 @@ func (c *Config) CreateDirectories() error {
return err return err
} }
if err := os.MkdirAll(c.GetThumbnailsPath(), os.ModePerm); err != nil { if err := os.MkdirAll(c.ThumbnailsPath(), os.ModePerm); err != nil {
return err return err
} }
@ -381,8 +381,8 @@ func (c *Config) CachePath() string {
return c.cachePath return c.cachePath
} }
// GetThumbnailsPath returns the path to the cached thumbnails. // ThumbnailsPath returns the path to the cached thumbnails.
func (c *Config) GetThumbnailsPath() string { func (c *Config) ThumbnailsPath() string {
return c.CachePath() + "/thumbnails" return c.CachePath() + "/thumbnails"
} }

2
internal/context/config_test.go
View file

@ -30,7 +30,7 @@ func TestConfig_SetValuesFromFile(t *testing.T) {
assert.Equal(t, "/srv/photoprism", c.GetAssetsPath()) assert.Equal(t, "/srv/photoprism", c.GetAssetsPath())
assert.Equal(t, "/srv/photoprism/cache", c.CachePath()) assert.Equal(t, "/srv/photoprism/cache", c.CachePath())
assert.Equal(t, "/srv/photoprism/cache/thumbnails", c.GetThumbnailsPath()) assert.Equal(t, "/srv/photoprism/cache/thumbnails", c.ThumbnailsPath())
assert.Equal(t, "/srv/photoprism/photos/originals", c.OriginalsPath()) assert.Equal(t, "/srv/photoprism/photos/originals", c.OriginalsPath())
assert.Equal(t, "/srv/photoprism/photos/import", c.ImportPath()) assert.Equal(t, "/srv/photoprism/photos/import", c.ImportPath())
assert.Equal(t, "/srv/photoprism/photos/export", c.ExportPath()) assert.Equal(t, "/srv/photoprism/photos/export", c.ExportPath())

2
internal/photoprism/config.go
View file

@ -38,7 +38,7 @@ type Config interface {
CachePath() string CachePath() string
DarktableCli() string DarktableCli() string
GetThumbnailsPath() string ThumbnailsPath() string
GetAssetsPath() string GetAssetsPath() string
GetTensorFlowModelPath() string GetTensorFlowModelPath() string
GetDatabasePath() string GetDatabasePath() string

2
internal/photoprism/config_test.go
View file

@ -54,7 +54,7 @@ func TestContextConfig_SetValuesFromFile(t *testing.T) {
assert.Equal(t, "/srv/photoprism", c.GetAssetsPath()) assert.Equal(t, "/srv/photoprism", c.GetAssetsPath())
assert.Equal(t, "/srv/photoprism/cache", c.CachePath()) assert.Equal(t, "/srv/photoprism/cache", c.CachePath())
assert.Equal(t, "/srv/photoprism/cache/thumbnails", c.GetThumbnailsPath()) assert.Equal(t, "/srv/photoprism/cache/thumbnails", c.ThumbnailsPath())
assert.Equal(t, "/srv/photoprism/photos/originals", c.OriginalsPath()) assert.Equal(t, "/srv/photoprism/photos/originals", c.OriginalsPath())
assert.Equal(t, "/srv/photoprism/photos/import", c.ImportPath()) assert.Equal(t, "/srv/photoprism/photos/import", c.ImportPath())
assert.Equal(t, "/srv/photoprism/photos/export", c.ExportPath()) assert.Equal(t, "/srv/photoprism/photos/export", c.ExportPath())

4
internal/photoprism/thumbnails_slow_test.go
View file

@ -25,7 +25,7 @@ func TestCreateThumbnailsFromOriginals(t *testing.T) {
importer.ImportPhotosFromDirectory(conf.ImportPath()) importer.ImportPhotosFromDirectory(conf.ImportPath())
CreateThumbnailsFromOriginals(conf.OriginalsPath(), conf.GetThumbnailsPath(), 600, false) CreateThumbnailsFromOriginals(conf.OriginalsPath(), conf.ThumbnailsPath(), 600, false)
CreateThumbnailsFromOriginals(conf.OriginalsPath(), conf.GetThumbnailsPath(), 300, true) CreateThumbnailsFromOriginals(conf.OriginalsPath(), conf.ThumbnailsPath(), 300, true)
} }

4
internal/photoprism/thumbnails_test.go
View file

@ -17,7 +17,7 @@ func TestMediaFile_GetThumbnail(t *testing.T) {
image1, err := NewMediaFile(conf.ImportPath() + "/iphone/IMG_6788.JPG") image1, err := NewMediaFile(conf.ImportPath() + "/iphone/IMG_6788.JPG")
assert.Nil(t, err) assert.Nil(t, err)
thumbnail1, err := image1.GetThumbnail(conf.GetThumbnailsPath(), 350) thumbnail1, err := image1.GetThumbnail(conf.ThumbnailsPath(), 350)
assert.Empty(t, err) assert.Empty(t, err)
@ -34,7 +34,7 @@ func TestMediaFile_GetSquareThumbnail(t *testing.T) {
image1, err := NewMediaFile(conf.ImportPath() + "/iphone/IMG_6788.JPG") image1, err := NewMediaFile(conf.ImportPath() + "/iphone/IMG_6788.JPG")
assert.Nil(t, err) assert.Nil(t, err)
thumbnail1, err := image1.GetSquareThumbnail(conf.GetThumbnailsPath(), 350) thumbnail1, err := image1.GetSquareThumbnail(conf.ThumbnailsPath(), 350)
assert.Empty(t, err) assert.Empty(t, err)

6
internal/test/config.go
View file

@ -105,7 +105,7 @@ func (c *Config) CreateDirectories() error {
return err return err
} }
if err := os.MkdirAll(c.GetThumbnailsPath(), os.ModePerm); err != nil { if err := os.MkdirAll(c.ThumbnailsPath(), os.ModePerm); err != nil {
return err return err
} }
@ -238,8 +238,8 @@ func (c *Config) CachePath() string {
return CachePath return CachePath
} }
// GetThumbnailsPath returns the path to the cached thumbnails. // ThumbnailsPath returns the path to the cached thumbnails.
func (c *Config) GetThumbnailsPath() string { func (c *Config) ThumbnailsPath() string {
return c.CachePath() + "/thumbnails" return c.CachePath() + "/thumbnails"
} }