apps/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-10-05 00:43:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Refactor tests and config initialization

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/commands/commands.go
View File

@@ -34,7 +34,6 @@ import (
"github.com/photoprism/photoprism/internal/config"
"github.com/photoprism/photoprism/internal/event"
"github.com/photoprism/photoprism/internal/service"
"github.com/photoprism/photoprism/pkg/fs"
)
@@ -94,13 +93,12 @@ func childAlreadyRunning(filePath string) (pid int, running bool) {
// CallWithDependencies calls a command action with initialized dependencies.
func CallWithDependencies(ctx *cli.Context, action func(conf *config.Config) error) (err 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
}