OrgWiki/go-org-orgwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor main cmd: Improve error messages and code layout

Browse source
This commit is contained in:
Niklas Fasching 2021-01-23 20:50:02 +01:00
parent 5dadf8c4c2
commit 02df432d76
1 changed files with 51 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

93
main.go
View file

@ -16,86 +16,95 @@ import (
"github.com/niklasfasching/go-org/org" "github.com/niklasfasching/go-org/org"
) )
func main() { var usage = `Usage: go-org COMMAND [ARGS]...
log := log.New(os.Stderr, "", 0) Commands:
if len(os.Args) < 2 { - render FILE FORMAT
log.Println("USAGE: org COMMAND [ARGS]") FORMAT: org, html, html-chroma
log.Println("- org render FILE OUTPUT_FORMAT") - blorg
log.Println(" OUTPUT_FORMAT: org, html, html-chroma") - blorg init
log.Println("- org blorg init") - blorg build
log.Println("- org blorg build") - blorg serve
log.Println("- org blorg serve") `
os.Exit(1)
}
switch cmd := strings.ToLower(os.Args[1]); cmd { func main() {
log.SetFlags(0)
if len(os.Args) < 2 {
log.Fatal(usage)
}
switch cmd, args := os.Args[1], os.Args[2:]; cmd {
case "render": case "render":
if len(os.Args) < 4 { render(args)
log.Fatal("USAGE: org render FILE OUTPUT_FORMAT")
}
out, err := render(os.Args[2], os.Args[3])
if err != nil {
log.Fatalf("Error: %v", err)
}
fmt.Fprint(os.Stdout, out)
case "blorg": case "blorg":
if err := runBlorg(os.Args[2]); err != nil { runBlorg(args)
log.Fatalf("Error: %v", err)
}
default: default:
log.Fatalf("Unsupported command: %s", cmd) log.Fatal(usage)
} }
} }
func runBlorg(cmd string) error { func runBlorg(args []string) {
switch strings.ToLower(cmd) { if len(args) == 0 {
log.Fatal(usage)
}
switch strings.ToLower(args[0]) {
case "init": case "init":
if _, err := os.Stat(blorg.DefaultConfigFile); !os.IsNotExist(err) { if _, err := os.Stat(blorg.DefaultConfigFile); !os.IsNotExist(err) {
return err log.Fatalf("%s already exists", blorg.DefaultConfigFile)
} }
if err := ioutil.WriteFile(blorg.DefaultConfigFile, []byte(blorg.DefaultConfig), os.ModePerm); err != nil { if err := ioutil.WriteFile(blorg.DefaultConfigFile, []byte(blorg.DefaultConfig), os.ModePerm); err != nil {
return err log.Fatal(err)
} }
log.Printf("blorg init finished: Wrote ./%s", blorg.DefaultConfigFile) if err := os.MkdirAll("content", os.ModePerm); err != nil {
return nil log.Fatal(err)
}
case "build": case "build":
config, err := blorg.ReadConfig(blorg.DefaultConfigFile) config, err := blorg.ReadConfig(blorg.DefaultConfigFile)
if err != nil { if err != nil {
return err log.Fatal(err)
} }
if err := config.Render(); err != nil { if err := config.Render(); err != nil {
return err log.Fatal(err)
} }
log.Println("blorg build finished") log.Println("blorg build finished")
return nil
case "serve": case "serve":
config, err := blorg.ReadConfig(blorg.DefaultConfigFile) config, err := blorg.ReadConfig(blorg.DefaultConfigFile)
if err != nil { if err != nil {
return err log.Fatal(err)
} }
return config.Serve() log.Fatal(config.Serve())
default: default:
return fmt.Errorf("Supported commands: init build serve") log.Fatal(usage)
} }
} }
func render(path, format string) (string, error) { func render(args []string) {
if len(args) < 2 {
log.Fatal(usage)
}
path, format := args[0], args[1]
bs, err := ioutil.ReadFile(path) bs, err := ioutil.ReadFile(path)
if err != nil { if err != nil {
return "", err log.Fatal(err)
} }
d := org.New().Parse(bytes.NewReader(bs), path) d := org.New().Parse(bytes.NewReader(bs), path)
write := func(w org.Writer) {
out, err := d.Write(w)
if err != nil {
log.Fatal(err)
}
fmt.Fprint(os.Stdout, out)
}
switch strings.ToLower(format) { switch strings.ToLower(format) {
case "org": case "org":
return d.Write(org.NewOrgWriter()) write(org.NewOrgWriter())
case "html": case "html":
return d.Write(org.NewHTMLWriter()) write(org.NewHTMLWriter())
case "html-chroma": case "html-chroma":
writer := org.NewHTMLWriter() writer := org.NewHTMLWriter()
writer.HighlightCodeBlock = highlightCodeBlock writer.HighlightCodeBlock = highlightCodeBlock
return d.Write(writer) write(writer)
default: default:
return "", fmt.Errorf("unsupported output format: %s", format) log.Fatal(usage)
} }
} }