From d2c7b5444d869de670d6271eabb35033059db866 Mon Sep 17 00:00:00 2001 From: yv1ing Date: Thu, 19 Dec 2024 16:27:24 +0800 Subject: [PATCH] new: Add parameters to specify the configuration file --- config/mConfig.go | 26 -------------------------- main.go | 31 ++++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/config/mConfig.go b/config/mConfig.go index f411c2b..8e53654 100644 --- a/config/mConfig.go +++ b/config/mConfig.go @@ -1,13 +1,5 @@ package config -import ( - "io" - "log" - "os" - - "gopkg.in/yaml.v3" -) - type MConfig struct { Host string `yaml:"host"` Port int `yaml:"port"` @@ -21,21 +13,3 @@ type MConfig struct { } var MConfigInstance *MConfig - -func init() { - configFile, err := os.OpenFile("config.yaml", os.O_RDONLY, os.ModePerm) - if err != nil { - log.Fatal(err) - } - defer configFile.Close() - - configByte, err := io.ReadAll(configFile) - if err != nil { - log.Fatal(err) - } - - err = yaml.Unmarshal(configByte, &MConfigInstance) - if err != nil { - log.Fatal(err) - } -} diff --git a/main.go b/main.go index 9a0a0c8..1a6622b 100644 --- a/main.go +++ b/main.go @@ -1,12 +1,41 @@ package main import ( + "flag" + "gopkg.in/yaml.v3" + "io" + "log" + "os" + "MollyBlog/config" "MollyBlog/internal/mApp" "MollyBlog/utils" ) func init() { + // parse arguments + configFilePath := flag.String("c", "config.yaml", "config file") + + flag.Parse() + + // load config + configFile, err := os.OpenFile(*configFilePath, os.O_RDONLY, os.ModePerm) + if err != nil { + log.Fatal(err) + } + defer configFile.Close() + + configByte, err := io.ReadAll(configFile) + if err != nil { + log.Fatal(err) + } + + err = yaml.Unmarshal(configByte, &config.MConfigInstance) + if err != nil { + log.Fatal(err) + } + + // create need files postSrc := config.MConfigInstance.Storage.SRC postDst := config.MConfigInstance.Storage.DST utils.Mkdir(postSrc) @@ -20,5 +49,5 @@ func init() { func main() { mapp := mApp.NewMApp(config.MConfigInstance) - mapp.Run(true) + mapp.Run(false) }