Simplify config read and arguments parsing

[sgblog.git] / cmd / sgblog / gopher.go

diff --git a/cmd/sgblog/gopher.go b/cmd/sgblog/gopher.go
index 183914c8c582399b621c2506e5c01c42eb836b2c..b12a2b893e1e1c02e180f70f8368f742d54d157b 100644 (file)
--- a/cmd/sgblog/gopher.go
+++ b/cmd/sgblog/gopher.go
@@ -19,11 +19,9 @@ package main
 
 import (
        "bufio"
-       "encoding/json"
        "errors"
        "fmt"
        "io"
-       "io/ioutil"
        "log"
        "net/url"
        "os"
@@ -34,7 +32,6 @@ import (
        "github.com/go-git/go-git/v5"
        "github.com/go-git/go-git/v5/plumbing"
        "github.com/go-git/go-git/v5/plumbing/object"
-       "github.com/hjson/hjson-go"
        "go.stargrave.org/sgblog"
 )
 
@@ -86,24 +83,11 @@ type TableMenuEntry struct {
        Topics      []string
 }
 
-func serveGopher() {
-       cfgPath := os.Args[2]
-       cfgRaw, err := ioutil.ReadFile(cfgPath)
+func serveGopher(cfgPath string) {
+       cfg, err := readCfg(cfgPath)
        if err != nil {
                log.Fatalln(err)
        }
-       var cfgGeneral map[string]interface{}
-       if err = hjson.Unmarshal(cfgRaw, &cfgGeneral); err != nil {
-               log.Fatalln(err)
-       }
-       cfgRaw, err = json.Marshal(cfgGeneral)
-       if err != nil {
-               log.Fatalln(err)
-       }
-       var cfg *Cfg
-       if err = json.Unmarshal(cfgRaw, &cfg); err != nil {
-               log.Fatalln(err)
-       }
        if cfg.GopherDomain == "" {
                log.Fatalln("GopherDomain is not configured")
        }