diff --git a/pkg/input/conf/conf.go b/pkg/input/conf/conf.go index b1f1e3e..fcf134b 100644 --- a/pkg/input/conf/conf.go +++ b/pkg/input/conf/conf.go @@ -2,21 +2,23 @@ package conf import ( "io" - "my/schet/pkg/schet" "os" + "my/schet/pkg/input/config" + "my/schet/pkg/schet" + "github.com/yosuke-furukawa/json5/encoding/json5" ) type Conf struct { path string - config *Config + config *config.Config год *schet.Год } func NewConf(path string) *Conf { c := &Conf{ - config: NewConfig(), + config: config.NewConfig(), path: path, } return c diff --git a/pkg/input/conf/config.go b/pkg/input/config/config.go similarity index 93% rename from pkg/input/conf/config.go rename to pkg/input/config/config.go index f1553aa..9d4e453 100644 --- a/pkg/input/conf/config.go +++ b/pkg/input/config/config.go @@ -1,4 +1,4 @@ -package conf +package config type Config struct { Доходы []Доход `json:"Доходы"`