From 29539d25c1bc60db1f0745b969c8a9692eee27a7 Mon Sep 17 00:00:00 2001 From: Nikolaus Gotsche Date: Sun, 31 Mar 2019 03:13:58 +0200 Subject: Prefix of Invoice Files --- config.go | 6 ++++-- texify.go | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config.go b/config.go index 734983d..944bd45 100644 --- a/config.go +++ b/config.go @@ -14,6 +14,7 @@ import ( type Config struct { Database string //`toml:"database"` Folder string //`toml:"folder"` + Prefix string //`toml:"prefix"` Name string //`toml:"name"` Street string //`toml:"street"` Zip string //`toml:"zip"` @@ -86,11 +87,12 @@ func makeNewTOML(gibts bool) { n := "" file, err := homedir.Expand("~/.mywork.db") checkErr(err) - config = Config{file, n, n, n, n, n, n, n, n, n, n, n, n, n, n, n, n} + config = Config{file, n, n, n, n, n, n, n, n, n, n, n, n, n, n, n, n, n} } //fmt.Println("Whats Your Namecount\n") database := getNewInterInput("DB File Path: ", config.Database, nli) folder := getNewInterInput("Template Folder: ", config.Folder, nli) + prefix := getNewInterInput("Invoice File Prefix: ", config.Prefix, nli) name := getNewInterInput("Whats your Name?: ", config.Name, nli) street := getNewInterInput("Street: ", config.Street, nli) zip := getNewInterInput("Zip Code: ", config.Zip, nli) @@ -107,7 +109,7 @@ func makeNewTOML(gibts bool) { iban := getNewInterInput("IBAN: ", config.Iban, nli) bic := getNewInterInput("BIC: ", config.Bic, nli) - conf := Config{database, folder, name, street, zip, city, country, telefon, mobile, mail, url, taxid, bankacc, banklz, bankname, iban, bic} + conf := Config{database, folder, prefix, name, street, zip, city, country, telefon, mobile, mail, url, taxid, bankacc, banklz, bankname, iban, bic} buf := new(bytes.Buffer) err = toml.NewEncoder(buf).Encode(conf) diff --git a/texify.go b/texify.go index d802108..a3a57f8 100644 --- a/texify.go +++ b/texify.go @@ -139,7 +139,7 @@ func billTemplate(billdata bill, cust Customer) Filenames { } func runLatex(inputfilename, outputfilename string) error { - fmt.Printf("Rendering: %s -> Output File: %soutpdf/Rechnung%s.pdf\n", inputfilename, config.Folder,cleanString(outputfilename)) + fmt.Printf("Rendering: %s -> Output File: %soutpdf/%s%s.pdf\n", inputfilename, config.Folder,config.Prefix,cleanString(outputfilename)) pref := strings.TrimSuffix(inputfilename, "_main.tex") //cmdArgs := []string{"-synctex=1", "-interaction=nonstopmode", filename} @@ -148,7 +148,7 @@ func runLatex(inputfilename, outputfilename string) error { //env := os.Environ() mainpdf := strings.Replace(inputfilename, ".tex", ".pdf", 1) - cmd := fmt.Sprintf("cd %souttex; %v -interaction=nonstopmode -output-directory='../outpdf' %s; cd ../outpdf; cp %s 'Rechnung%s.pdf'; rm %s_*", config.Folder,binary, inputfilename, mainpdf, cleanString(outputfilename), pref) + cmd := fmt.Sprintf("cd %souttex; %v -interaction=nonstopmode -output-directory='../outpdf' %s; cd ../outpdf; cp %s '%s%s.pdf'; rm %s_*", config.Folder,binary, inputfilename, mainpdf, config.Prefix, cleanString(outputfilename), pref) //fmt.Println(cmd) //docmd := exec.Command(binary,cmdArgs[0], cmdArgs[1],cmdArgs[2]) docmd := exec.Command("bash", "-c", cmd) -- cgit v1.2.3