CLI: Refactor tests and config initialization

Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2022-10-04 12:27:40 +02:00
parent e2b315d79d
commit c7be7c43eb
22 changed files with 85 additions and 84 deletions

View File

@@ -12,9 +12,7 @@ import (
"github.com/urfave/cli"
"github.com/photoprism/photoprism/internal/config"
"github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/service"
"github.com/photoprism/photoprism/pkg/clean"
)
@@ -27,13 +25,12 @@ var PasswdCommand = cli.Command{
// passwdAction updates a password.
func passwdAction(ctx *cli.Context) error {
conf := config.NewConfig(ctx)
service.SetConfig(conf)
conf, err := InitConfig(ctx)
_, cancel := context.WithCancel(context.Background())
defer cancel()
if err := conf.Init(); err != nil {
if err != nil {
return err
}