feat: run once

Author: ljcbaby

.gitignore

@@ -26,5 +26,6 @@ vendor/
 # Dependency directories
 Godeps/
 
-# Test output
+# output
 convert/test_output/
+build/

cmd/root.go

@@ -12,13 +12,8 @@ var rootCmd = &cobra.Command{
 	Use:   "provider2domainset",
 	Short: "p2d, convert domain list form clash provider to mosdns domainset.",
 	Long:  `p2d, convert domain list form clash provider to mosdns domainset.`,
-	// Uncomment the following line if your bare application
-	// has an action associated with it:
-	// Run: func(cmd *cobra.Command, args []string) { },
 }
 
-// Execute adds all child commands to the root command and sets flags appropriately.
-// This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
 	err := rootCmd.Execute()
 	if err != nil {

cmd/run.go

@@ -0,0 +1,24 @@
+package cmd
+
+import (
+	"github.com/dn-11/provider2domainset/conf"
+	"github.com/dn-11/provider2domainset/convert"
+	"github.com/spf13/cobra"
+)
+
+var (
+	config string
+)
+var runCmd = &cobra.Command{
+	Use:   "run",
+	Short: "run convert once",
+	Run: func(cmd *cobra.Command, args []string) {
+		conf.Init(config)
+		convert.RunOnce()
+	},
+}
+
+func init() {
+	runCmd.PersistentFlags().StringVarP(&config, "config", "c", "config.yaml", "config file path")
+	rootCmd.AddCommand(runCmd)
+}

conf/config.go

@@ -33,14 +33,15 @@ func Init(file string) {
 		if !os.IsNotExist(err) {
 			log.L().Sugar().With(err).Errorf("get stat of %s failed", file)
 		}
-		log.L().Sugar().Fatalf("config not existed, creating at %s", file)
+		log.L().Sugar().Errorf("config not existed, creating at %s", file)
 		created, err := os.Create(file)
 		if err != nil {
 			log.L().Sugar().With(err).Errorf("create config at %s failed", file)
 		}
 		if _, err := created.Write(configSample); err != nil {
 			log.L().Sugar().With(err).Errorf("write config at %s failed", file)
 		}
+		log.L().Fatal("config created, please edit it.")
 	}
 
 	viper.SetConfigFile(file)
@@ -90,6 +91,9 @@ func update() {
 	Service.Delay = viper.GetInt("service.delay")
 
 	if level, err := zapcore.ParseLevel(viper.GetString("log.level")); err == nil {
-		Log.Level = level
+		if log.L().Level.Level() == zapcore.InfoLevel {
+			Log.Level = level
+			log.L().SetLogLevel(level)
+		}
 	}
 }

convert/run.go

@@ -0,0 +1,23 @@
+package convert
+
+import (
+	"github.com/dn-11/provider2domainset/conf"
+	"github.com/dn-11/provider2domainset/log"
+)
+
+func RunOnce() {
+	log.L().Info("start convert now")
+
+	for _, f := range conf.Convert.ProcessFiles {
+		err := Convert(Task{
+			Source: conf.Convert.Source,
+			Target: conf.Convert.Target,
+			File:   f,
+		})
+		if err != nil {
+			log.L().Sugar().With(err).Error("convert failed")
+		}
+	}
+
+	log.L().Info("convert done")
+}