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

Rename Config.GetDatabasePath() to SqlServerPath(), see #50

Browse source
This commit is contained in:
Michael Mayer 2018-12-21 03:39:10 +01:00
parent a7b6ea8936
commit 3f2156a8fa
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/context/config.go
View file

@ -229,7 +229,7 @@ func (c *Config) CreateDirectories() error {
return err
}
if err := os.MkdirAll(c.GetDatabasePath(), os.ModePerm); err != nil {
if err := os.MkdirAll(c.SqlServerPath(), os.ModePerm); err != nil {
return err
}
@ -263,7 +263,7 @@ func (c *Config) connectToDatabase() error {
if err != nil || db == nil {
if isTiDB {
go tidb.Start(c.GetDatabasePath(), 4000, "", c.Debug())
go tidb.Start(c.SqlServerPath(), 4000, "", c.Debug())
}
for i := 1; i <= 12; i++ {
@ -396,8 +396,8 @@ func (c *Config) TensorFlowModelPath() string {
return c.AssetsPath() + "/tensorflow"
}
// GetDatabasePath returns the database storage path (e.g. for SQLite or Bleve).
func (c *Config) GetDatabasePath() string {
// SqlServerPath returns the database storage path (e.g. for SQLite or Bleve).
func (c *Config) SqlServerPath() string {
return c.AssetsPath() + "/database"
}

2
internal/photoprism/config.go
View file

@ -24,6 +24,7 @@ type Config interface {
SqlServerHost() string
SqlServerPort() uint
SqlServerPath() string
HttpServerHost() string
HttpServerPort() int
@ -42,7 +43,6 @@ type Config interface {
ServerAssetsPath() string
DarktableCli() string
GetDatabasePath() string
GetTemplatesPath() string
GetFaviconsPath() string
GetPublicPath() string

6
internal/test/config.go
View file

@ -109,7 +109,7 @@ func (c *Config) CreateDirectories() error {
return err
}
if err := os.MkdirAll(c.GetDatabasePath(), os.ModePerm); err != nil {
if err := os.MkdirAll(c.SqlServerPath(), os.ModePerm); err != nil {
return err
}
@ -253,8 +253,8 @@ func (c *Config) TensorFlowModelPath() string {
return c.AssetsPath() + "/tensorflow"
}
// GetDatabasePath returns the database storage path (e.g. for SQLite or Bleve).
func (c *Config) GetDatabasePath() string {
// SqlServerPath returns the database storage path (e.g. for SQLite or Bleve).
func (c *Config) SqlServerPath() string {
return c.AssetsPath() + "/database"
}