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

Config: Show helpful error message when a path is missing #418

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-08-18 19:09:46 +02:00
parent 7e7b53590a
commit db4749a6f8
3 changed files with 57 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
internal/config/filenames.go
View file

@ -43,19 +43,31 @@ func (c *Config) CreateDirectories() error {
return result
}
if err := os.MkdirAll(c.AssetsPath(), os.ModePerm); err != nil {
notFoundError := func(name string) error {
return fmt.Errorf("%s path not found, run 'photoprism config' to check configuration values", name)
}
if c.AssetsPath() == "" {
return notFoundError("assets")
} else if err := os.MkdirAll(c.AssetsPath(), os.ModePerm); err != nil {
return createError(c.AssetsPath(), err)
}
if err := os.MkdirAll(c.StoragePath(), os.ModePerm); err != nil {
if c.StoragePath() == "" {
return notFoundError("storage")
} else if err := os.MkdirAll(c.StoragePath(), os.ModePerm); err != nil {
return createError(c.StoragePath(), err)
}
if err := os.MkdirAll(c.OriginalsPath(), os.ModePerm); err != nil {
if c.OriginalsPath() == "" {
return notFoundError("originals")
} else if err := os.MkdirAll(c.OriginalsPath(), os.ModePerm); err != nil {
return createError(c.OriginalsPath(), err)
}
if err := os.MkdirAll(c.ImportPath(), os.ModePerm); err != nil {
if c.ImportPath() == "" {
return notFoundError("import")
} else if err := os.MkdirAll(c.ImportPath(), os.ModePerm); err != nil {
return createError(c.ImportPath(), err)
}
@ -65,35 +77,51 @@ func (c *Config) CreateDirectories() error {
}
}
if err := os.MkdirAll(c.CachePath(), os.ModePerm); err != nil {
if c.CachePath() == "" {
return notFoundError("cache")
} else if err := os.MkdirAll(c.CachePath(), os.ModePerm); err != nil {
return createError(c.CachePath(), err)
}
if err := os.MkdirAll(c.ThumbPath(), os.ModePerm); err != nil {
if c.ThumbPath() == "" {
return notFoundError("thumbs")
} else if err := os.MkdirAll(c.ThumbPath(), os.ModePerm); err != nil {
return createError(c.ThumbPath(), err)
}
if err := os.MkdirAll(c.SettingsPath(), os.ModePerm); err != nil {
if c.SettingsPath() == "" {
return notFoundError("settings")
} else if err := os.MkdirAll(c.SettingsPath(), os.ModePerm); err != nil {
return createError(c.SettingsPath(), err)
}
if err := os.MkdirAll(c.TempPath(), os.ModePerm); err != nil {
if c.TempPath() == "" {
return notFoundError("temp")
} else if err := os.MkdirAll(c.TempPath(), os.ModePerm); err != nil {
return createError(c.TempPath(), err)
}
if err := os.MkdirAll(c.TensorFlowModelPath(), os.ModePerm); err != nil {
if c.TensorFlowModelPath() == "" {
return notFoundError("tensorflow model")
} else if err := os.MkdirAll(c.TensorFlowModelPath(), os.ModePerm); err != nil {
return createError(c.TensorFlowModelPath(), err)
}
if err := os.MkdirAll(c.BuildPath(), os.ModePerm); err != nil {
if c.BuildPath() == "" {
return notFoundError("build")
} else if err := os.MkdirAll(c.BuildPath(), os.ModePerm); err != nil {
return createError(c.BuildPath(), err)
}
if err := os.MkdirAll(filepath.Dir(c.PIDFilename()), os.ModePerm); err != nil {
if filepath.Dir(c.PIDFilename()) == "" {
return notFoundError("pid file")
} else if err := os.MkdirAll(filepath.Dir(c.PIDFilename()), os.ModePerm); err != nil {
return createError(filepath.Dir(c.PIDFilename()), err)
}
if err := os.MkdirAll(filepath.Dir(c.LogFilename()), os.ModePerm); err != nil {
if filepath.Dir(c.LogFilename()) == "" {
return notFoundError("log file")
} else if err := os.MkdirAll(filepath.Dir(c.LogFilename()), os.ModePerm); err != nil {
return createError(filepath.Dir(c.LogFilename()), err)
}
@ -265,6 +293,11 @@ func (c *Config) StoragePath() string {
// AssetsPath returns the path to static assets.
func (c *Config) AssetsPath() string {
if c.params.AssetsPath == "" {
// Try to find the right directory by iterating through a list.
c.params.AssetsPath = fs.FindDir(fs.AssetPaths)
}
return fs.Abs(c.params.AssetsPath)
}

2
internal/config/settings.go
View file

@ -157,7 +157,7 @@ func (c *Config) initSettings() {
p := c.SettingsFile()
if err := c.settings.Load(p); err != nil {
log.Info(err)
log.Debugln(err)
}
i18n.SetDir(c.LocalesPath())

11
pkg/fs/dirs.go
View file

@ -63,6 +63,7 @@ var OriginalPaths = []string{
"~/Bilder",
"~/fotos",
"~/Fotos",
"/var/lib/photoprism/originals",
}
var ImportPaths = []string{
@ -86,6 +87,16 @@ var ImportPaths = []string{
"~/Photos/Import",
"~/import",
"~/Import",
"/var/lib/photoprism/import",
}
var AssetPaths = []string{
"/photoprism/assets",
"~/.photoprism/assets",
"~/photoprism/assets",
"photoprism/assets",
"assets",
"/var/lib/photoprism/assets",
}
// Dirs returns a slice of directories in a path, optional recursively and with symlinks.