From 3eb61dff47d33d35df9b6053fa84d39a17cf4c03 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Fri, 21 Dec 2018 03:18:43 +0100 Subject: [PATCH] Rename Config.GetDatabaseDriver() to DatabaseDriver, see #50 --- internal/commands/config.go | 2 +- internal/context/config.go | 6 +++--- internal/context/config_test.go | 2 +- internal/photoprism/config.go | 2 +- internal/photoprism/config_test.go | 2 +- internal/test/config.go | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/commands/config.go b/internal/commands/config.go index e1c03a7c7..85925f74f 100644 --- a/internal/commands/config.go +++ b/internal/commands/config.go @@ -26,7 +26,7 @@ func configAction(ctx *cli.Context) error { fmt.Printf("export-path %s\n", conf.GetExportPath()) fmt.Printf("cache-path %s\n", conf.GetCachePath()) fmt.Printf("assets-path %s\n", conf.GetAssetsPath()) - fmt.Printf("database-driver %s\n", conf.GetDatabaseDriver()) + fmt.Printf("database-driver %s\n", conf.DatabaseDriver()) fmt.Printf("database-dsn %s\n", conf.GetDatabaseDsn()) return nil diff --git a/internal/context/config.go b/internal/context/config.go index 02cf2f2a5..d39cfb4f7 100644 --- a/internal/context/config.go +++ b/internal/context/config.go @@ -248,7 +248,7 @@ func (c *Config) CreateDirectories() error { // When used with the tidb driver, it may create a new database server instance. // It tries to do this 12 times with a 5 second sleep interval in between. func (c *Config) connectToDatabase() error { - dbDriver := c.GetDatabaseDriver() + dbDriver := c.DatabaseDriver() dbDsn := c.GetDatabaseDsn() isTiDB := false @@ -366,8 +366,8 @@ func (c *Config) GetDarktableCli() string { return c.darktableCli } -// GetDatabaseDriver returns the database driver name. -func (c *Config) GetDatabaseDriver() string { +// DatabaseDriver returns the database driver name. +func (c *Config) DatabaseDriver() string { return c.databaseDriver } diff --git a/internal/context/config_test.go b/internal/context/config_test.go index ca2f61896..383d2ee22 100644 --- a/internal/context/config_test.go +++ b/internal/context/config_test.go @@ -34,6 +34,6 @@ func TestConfig_SetValuesFromFile(t *testing.T) { assert.Equal(t, "/srv/photoprism/photos/originals", c.GetOriginalsPath()) assert.Equal(t, "/srv/photoprism/photos/import", c.GetImportPath()) assert.Equal(t, "/srv/photoprism/photos/export", c.GetExportPath()) - assert.Equal(t, "tidb", c.GetDatabaseDriver()) + assert.Equal(t, "tidb", c.DatabaseDriver()) assert.Equal(t, "root:@tcp(localhost:4000)/photoprism?parseTime=true", c.GetDatabaseDsn()) } diff --git a/internal/photoprism/config.go b/internal/photoprism/config.go index d84ec3e02..a0ea302a1 100644 --- a/internal/photoprism/config.go +++ b/internal/photoprism/config.go @@ -29,7 +29,7 @@ type Config interface { HttpServerPort() int HttpServerMode() string - GetDatabaseDriver() string + DatabaseDriver() string GetDatabaseDsn() string GetOriginalsPath() string GetImportPath() string diff --git a/internal/photoprism/config_test.go b/internal/photoprism/config_test.go index 311b659aa..a8a641969 100644 --- a/internal/photoprism/config_test.go +++ b/internal/photoprism/config_test.go @@ -58,7 +58,7 @@ func TestContextConfig_SetValuesFromFile(t *testing.T) { assert.Equal(t, "/srv/photoprism/photos/originals", c.GetOriginalsPath()) assert.Equal(t, "/srv/photoprism/photos/import", c.GetImportPath()) assert.Equal(t, "/srv/photoprism/photos/export", c.GetExportPath()) - assert.Equal(t, "tidb", c.GetDatabaseDriver()) + assert.Equal(t, "tidb", c.DatabaseDriver()) assert.Equal(t, "root:@tcp(localhost:4000)/photoprism?parseTime=true", c.GetDatabaseDsn()) } diff --git a/internal/test/config.go b/internal/test/config.go index 7ca63c309..b51c07528 100644 --- a/internal/test/config.go +++ b/internal/test/config.go @@ -127,7 +127,7 @@ func (c *Config) CreateDirectories() error { // connectToDatabase estabilishes a connection to a database given a driver. // It tries to do this 12 times with a 5 second sleep intervall in between. func (c *Config) connectToDatabase() error { - dbDriver := c.GetDatabaseDriver() + dbDriver := c.DatabaseDriver() dbDsn := c.GetDatabaseDsn() db, err := gorm.Open(dbDriver, dbDsn) @@ -223,8 +223,8 @@ func (c *Config) GetDarktableCli() string { return DarktableCli } -// GetDatabaseDriver returns the database driver name. -func (c *Config) GetDatabaseDriver() string { +// DatabaseDriver returns the database driver name. +func (c *Config) DatabaseDriver() string { return DatabaseDriver }