Ver código fonte

Working on generator main executable

Andrea Fazzi 5 anos atrás
pai
commit
75266fb1ec

+ 26 - 14
generator/generators/list/list.go

@@ -159,15 +159,19 @@ func (generator *ListGenerator) Run() {
 		log.Println(err)
 	}
 
-	job, err := client.GetJob(generator.JobID)
-	if err != nil {
-		panic(err)
-	}
+	var job *orm.Job
 
-	job.Start = time.Now()
-	err = client.UpdateJob(job)
-	if err != nil {
-		panic(err)
+	if generator.JobID > 0 {
+		job, err := client.GetJob(generator.JobID)
+		if err != nil {
+			panic(err)
+		}
+
+		job.Start = time.Now()
+		err = client.UpdateJob(job)
+		if err != nil {
+			panic(err)
+		}
 	}
 
 	teachers, err := client.GetTeachers()
@@ -175,7 +179,13 @@ func (generator *ListGenerator) Run() {
 		panic(err)
 	}
 
-	outputPath := filepath.Join(generator.Config.Documents.OutputPath, fmt.Sprintf("%d/%d", job.DocumentID, job.ID))
+	var outputPath string
+
+	if generator.JobID > 0 {
+		outputPath = filepath.Join(generator.Config.Documents.OutputPath, fmt.Sprintf("%d/%d", job.DocumentID, job.ID))
+	} else {
+		outputPath = "output"
+	}
 
 	if err := os.MkdirAll(outputPath, 0777); err != nil {
 		panic(err)
@@ -183,13 +193,15 @@ func (generator *ListGenerator) Run() {
 
 	generator.generate(outputPath, teachers, funcMap)
 
-	job.End = time.Now()
+	if generator.JobID > 0 {
+		job.End = time.Now()
 
-	job.Files = append(job.Files, &orm.File{Path: "elenco_docenti.pdf"})
+		job.Files = append(job.Files, &orm.File{Path: "elenco_docenti.pdf"})
 
-	err = client.UpdateJob(job)
-	if err != nil {
-		panic(err)
+		err = client.UpdateJob(job)
+		if err != nil {
+			panic(err)
+		}
 	}
 
 	log.Println("Uploading files to the cloud...")

+ 4 - 0
generator/generators/list/main/config.yaml

@@ -3,6 +3,10 @@ url: "http://localhost:3000"
 domain: "foo.org"
 log_level: 2
 
+admin:
+  username: admin
+  password: admin
+  
 cloud:
   username: admin
   password: password

BIN
generator/generators/list/main/main


+ 7 - 5
generator/generators/list/main/main.go

@@ -6,16 +6,18 @@ import (
 )
 
 type Config struct {
-	*config.ConfigT
+	config.ConfigT
 
 	DocumentName string `yaml:"document_name"`
 }
 
 func main() {
-	var conf *Config
+	conf := new(Config)
 
-	err := config.ReadFile("config.yaml", conf.ConfigT)
-
-	gen := list.NewListGenerator(conf)
+	err := config.ReadFile("config.yaml", &conf.ConfigT)
+	if err != nil {
+		panic(err)
+	}
+	gen := list.NewListGenerator(&conf.ConfigT)
 	gen.Run()
 }