mf

Author: ugol

pkg/cmd/run.go

@@ -36,6 +36,7 @@ const TEMPLATEDIR = "$HOME/.jr/templates"
 const DEFAULT_KEY = "null"
 const DEFAULT_OUTPUT = "stdout"
 const DEFAULT_OUTPUT_TEMPLATE = "{{.V}}\n"
+const DEFAULT_OUTPUT_KCAT_TEMPLATE = "{{.K}},{{.V}}\n"
 const DEFAULT_SERIALIZER = "json-schema"
 const KAFKA_CONFIG = "./kafka/config.properties"
 const REGISTRY_CONFIG = "./kafka/registry.properties"
@@ -88,7 +89,7 @@ jr run --templateFileName ~/.jr/templates/net_device.tpl
 		if kcat {
 			oneline = true
 			output = "stdout"
-			outputTemplate = "{{.K}},{{.V}}\n"
+			outputTemplate = DEFAULT_OUTPUT_KCAT_TEMPLATE
 		}
 
 		conf := functions.Configuration{

pkg/functions/context.go

@@ -62,46 +62,48 @@ type Configuration struct {
 
 // Context is the object passed on the templates which contains all the needed details.
 type Context struct {
-	StartTime        time.Time
-	TemplateDir      string
-	TemplateType     []string
-	GeneratedObjects int64
-	GeneratedBytes   int64
-	Num              int
-	NumTemplates     int
-	Range            []int
-	Frequency        time.Duration
-	Duration         time.Duration
-	Locale           string
-	Seed             int64
-	CtxCounters      map[string]int
-	Ctx              map[string]string
-	CtxList          map[string][]string
-	LastIndex        int
-	CountryIndex     int
-	CityIndex        int
+	StartTime           time.Time
+	TemplateDir         string
+	TemplateType        []string
+	PreloadTemplateType []string
+	GeneratedObjects    int64
+	GeneratedBytes      int64
+	Num                 int
+	NumTemplates        int
+	Range               []int
+	Frequency           time.Duration
+	Duration            time.Duration
+	Locale              string
+	Seed                int64
+	CtxCounters         map[string]int
+	Ctx                 map[string]string
+	CtxList             map[string][]string
+	LastIndex           int
+	CountryIndex        int
+	CityIndex           int
 }
 
 func init() {
 
 	JrContext = Context{
-		StartTime:        time.Now(),
-		TemplateDir:      os.ExpandEnv(TEMPLATEDIR),
-		TemplateType:     make([]string, NUM_TEMPLATES),
-		GeneratedBytes:   0,
-		GeneratedObjects: 0,
-		Num:              NUM,
-		NumTemplates:     NUM_TEMPLATES,
-		Range:            make([]int, NUM),
-		Frequency:        FREQUENCY,
-		Duration:         DURATION,
-		Locale:           "us",
-		Seed:             time.Now().UTC().UnixNano(),
-		CtxCounters:      make(map[string]int),
-		Ctx:              make(map[string]string),
-		CtxList:          make(map[string][]string),
-		LastIndex:        -1,
-		CountryIndex:     232,
-		CityIndex:        -1,
+		StartTime:           time.Now(),
+		TemplateDir:         os.ExpandEnv(TEMPLATEDIR),
+		TemplateType:        make([]string, NUM_TEMPLATES),
+		PreloadTemplateType: make([]string, NUM_TEMPLATES),
+		GeneratedBytes:      0,
+		GeneratedObjects:    0,
+		Num:                 NUM,
+		NumTemplates:        NUM_TEMPLATES,
+		Range:               make([]int, NUM),
+		Frequency:           FREQUENCY,
+		Duration:            DURATION,
+		Locale:              "us",
+		Seed:                time.Now().UTC().UnixNano(),
+		CtxCounters:         make(map[string]int),
+		Ctx:                 make(map[string]string),
+		CtxList:             make(map[string][]string),
+		LastIndex:           -1,
+		CountryIndex:        232,
+		CityIndex:           -1,
 	}
 }

pkg/functions/loop.go

@@ -68,7 +68,7 @@ func DoTemplates(conf Configuration) {
 	for i := range conf.Preload {
 		templatePath := fmt.Sprintf("%s/%s.tpl", conf.TemplateDir, conf.Preload[i])
 		preloadTemplate[i], err = os.ReadFile(templatePath)
-		JrContext.TemplateType[i] = conf.TemplateNames[i]
+		JrContext.PreloadTemplateType[i] = conf.Preload[i]
 	}
 
 	if err != nil {

templates/data/fr/movie

@@ -92,7 +92,6 @@ Terminator
 The Truman Show
 Top Gun
 Toy Story
-Toy Story
 Trainspotting
 Un jour sans fin
 Usual Suspects