config: Use TOML

TOML is simple for users, and it is used in notably projects like
rustlang.  It also provides comments!

7 files changed, 64 insertions, 120 deletions

diff --git a/internal/service/config.go b/internal/service/config.go
index bcb9efc..8105cd5 100644
--- a/internal/service/config.go
+++ b/internal/service/config.go
@@ -1,30 +1,25 @@
 package service
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 	"time"
 
 	"dario.cat/mergo"
+	"git.server.ky/slackcoder/mirror/internal"
+	"github.com/BurntSushi/toml"
 )
 
 type Duration struct {
 	time.Duration
 }
 
-func (s Duration) MarshalJSON() ([]byte, error) {
-	return json.Marshal(s.Duration.String())
+func (s Duration) MarshalText() ([]byte, error) {
+	return []byte(s.Duration.String()), nil
 }
 
-func (s *Duration) UnmarshalJSON(data []byte) error {
-	var str string
-	err := json.Unmarshal(data, &str)
-	if err != nil {
-		return err
-	}
-
-	v, err := time.ParseDuration(str)
+func (s *Duration) UnmarshalText(text []byte) error {
+	v, err := time.ParseDuration(string(text))
 	if err != nil {
 		return err
 	}
@@ -33,15 +28,26 @@ func (s *Duration) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+// Global parameters
+type GlobalConfig struct {
+	MaxInterval Duration `toml:"max-interval"`
+	MinInterval Duration `toml:"min-interval"`
+}
+
 type Config struct {
-	MaxInterval Duration  `json:"max-interval,omitempty"`
-	MinInterval Duration  `json:"min-interval,omitempty"`
-	Mirrors     []*Mirror `json:"mirrors,omitempty"`
+	*GlobalConfig `toml:"global"`
+	Mirrors       []*Mirror `toml:"mirrors,omitempty"`
+}
+
+func (c *Config) String() string {
+	return internal.MustTOML(c)
 }
 
 var DefaultConfig = Config{
-	MaxInterval: Duration{24 * time.Hour},
-	MinInterval: Duration{time.Hour},
+	GlobalConfig: &GlobalConfig{
+		MaxInterval: Duration{24 * time.Hour},
+		MinInterval: Duration{time.Hour},
+	},
 }
 
 func (c *Config) Apply(arg Config) {
@@ -63,11 +69,12 @@ func ApplyFileConfig(cfg *Config, filePath string) error {
 	}
 	defer f.Close()
 
-	err = json.NewDecoder(f).Decode(&ret)
+	_, err = toml.NewDecoder(f).Decode(&ret)
 	if err != nil {
 		return fmt.Errorf("loading configuration file: %w", err)
 	}
 
 	cfg.Apply(ret)
+
 	return nil
 }
diff --git a/internal/service/git.go b/internal/service/git.go
index ad3a653..b61e332 100644
--- a/internal/service/git.go
+++ b/internal/service/git.go
@@ -3,11 +3,12 @@ package service
 import (
 	"errors"
 	"fmt"
-	"net/url"
 	"os"
 	"os/exec"
 	"path"
 	"strings"
+
+	"git.server.ky/slackcoder/mirror/internal"
 )
 
 const gitDescriptionFile = "description"
@@ -44,7 +45,7 @@ func setDescription(repo string, desc string) error {
 }
 
 // Set the remote origin's URL  for the projects repository.
-func setRemoteOrigin(repo string, origin *url.URL) error {
+func setRemoteOrigin(repo string, origin *internal.URL) error {
 	cmd := exec.Command("git", "remote", "get-url", "origin")
 	cmd.Dir = repo
 	buf, err := cmd.Output()
@@ -87,7 +88,7 @@ func getRemoteHeadReference(repo string) (string, error) {
 	return "", errors.New("not found")
 }
 
-func MirrorGit(dst *url.URL, src *url.URL, description string) error {
+func MirrorGit(dst *internal.URL, src *internal.URL, description string) error {
 	if dst.Scheme != "" && dst.Scheme != "file://" {
 		return fmt.Errorf("'%s' scheme not supported", dst.Scheme)
 	}
diff --git a/internal/service/mirror.go b/internal/service/mirror.go
new file mode 100644
index 0000000..12aaa79
--- /dev/null
+++ b/internal/service/mirror.go
@@ -0,0 +1,27 @@
+package service
+
+import (
+	"bytes"
+
+	"git.server.ky/slackcoder/mirror/internal"
+	"github.com/BurntSushi/toml"
+)
+
+type Mirror struct {
+	Method      string        `toml:"method,omitempty"`
+	From        *internal.URL `toml:"from,omitempty"`
+	To          *internal.URL `toml:"to,omitempty"`
+	Description string        `toml:"description,omitempty"`
+}
+
+func (m *Mirror) Equal(arg *Mirror) bool {
+	return m.Method == arg.Method && m.From.String() == arg.From.String() && m.To.String() == arg.To.String()
+}
+
+func (m *Mirror) String() string {
+	var buf bytes.Buffer
+
+	toml.NewEncoder(&buf).Encode(m)
+
+	return buf.String()
+}
diff --git a/internal/service/service_json_test.go b/internal/service/mirror_test.go
index c8e073a..f9411e2 100644
--- a/internal/service/service_json_test.go
+++ b/internal/service/mirror_test.go
@@ -1,24 +1,15 @@
 package service
 
 import (
-	"encoding/json"
 	"testing"
 
 	"git.server.ky/slackcoder/mirror/internal"
+	"github.com/BurntSushi/toml"
 	"github.com/stretchr/testify/require"
 )
 
-func mustJSON(arg interface{}) string {
-	buf, err := json.Marshal(arg)
-	if err != nil {
-		panic(err)
-	}
-
-	return string(buf)
-}
-
-func TestMirrorUnmarshalJSON(t *testing.T) {
-	str := mustJSON(map[string]interface{}{
+func TestMirrorUnmarshalTOML(t *testing.T) {
+	str := internal.MustTOML(map[string]interface{}{
 		"method": "git",
 		"from":   "https://git.taler.net/merchant.git",
 		"to":     "/mirror/merchant",
@@ -31,7 +22,9 @@ func TestMirrorUnmarshalJSON(t *testing.T) {
 	}
 
 	var s Mirror
-	err := json.Unmarshal([]byte(str), &s)
+
+	err := toml.Unmarshal([]byte(str), &s)
+
 	require.NoError(t, err)
 	require.Equal(t, exp.String(), s.String())
 }
diff --git a/internal/service/rsync.go b/internal/service/rsync.go
index 8298589..c9c7e92 100644
--- a/internal/service/rsync.go
+++ b/internal/service/rsync.go
@@ -3,9 +3,10 @@ package service
 import (
 	"bytes"
 	"errors"
-	"net/url"
 	"os/exec"
 	"strings"
+
+	"git.server.ky/slackcoder/mirror/internal"
 )
 
 var rsyncOpts = []string{
@@ -19,7 +20,7 @@ var rsyncOpts = []string{
 	"--times",
 }
 
-func Rsync(dst *url.URL, src *url.URL) error {
+func Rsync(dst *internal.URL, src *internal.URL) error {
 	src2 := *src
 	if !strings.HasSuffix(src2.Path, "/.") {
 		src2.Path = src2.Path + "/."
diff --git a/internal/service/service.go b/internal/service/service.go
index c34bcd3..38cabf8 100644
--- a/internal/service/service.go
+++ b/internal/service/service.go
@@ -1,11 +1,9 @@
 package service
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"math/rand"
-	"net/url"
 	"os"
 	"strconv"
 	"strings"
@@ -15,25 +13,6 @@ import (
 	"git.server.ky/slackcoder/mirror/internal/github"
 )
 
-type Mirror struct {
-	Method      string   `json:"method"`
-	From        *url.URL `json:"-"`
-	To          *url.URL `json:"-"`
-	Description string   `json:"description,omitempty"`
-}
-
-func (m *Mirror) Equal(arg *Mirror) bool {
-	return m.Method == arg.Method && m.From.String() == arg.From.String() && m.To.String() == arg.To.String()
-}
-
-func (m *Mirror) String() string {
-	buf, err := json.Marshal(m)
-	if err != nil {
-		panic(err)
-	}
-	return string(buf)
-}
-
 type Service struct {
 	cfg *Config
 
diff --git a/internal/service/service_json.go b/internal/service/service_json.go
deleted file mode 100644
index 571eb30..0000000
--- a/internal/service/service_json.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-	"net/url"
-)
-
-type JsonURL struct {
-	*url.URL
-}
-
-func (m JsonURL) MarshalJSON() ([]byte, error) {
-	str := m.String()
-	return json.Marshal(str)
-}
-
-func (m *JsonURL) UnmarshalJSON(buf []byte) error {
-	var str string
-
-	err := json.Unmarshal(buf, &str)
-	if err != nil {
-		return err
-	}
-
-	m.URL, err = url.Parse(str)
-	return err
-}
-
-func (m Mirror) MarshalJSON() ([]byte, error) {
-	type Alias Mirror
-
-	m2 := struct {
-		*Alias
-		From JsonURL `json:"from"`
-		To   JsonURL `json:"to"`
-	}{
-		Alias: (*Alias)(&m),
-		From:  JsonURL{m.From},
-		To:    JsonURL{m.To},
-	}
-
-	return json.Marshal(m2)
-}
-
-func (m *Mirror) UnmarshalJSON(buf []byte) error {
-	type Alias Mirror
-
-	var m2 struct {
-		*Alias
-		From JsonURL `json:"from"`
-		To   JsonURL `json:"to"`
-	}
-
-	m2.Alias = (*Alias)(m)
-	err := json.Unmarshal(buf, &m2)
-	if err != nil {
-		return err
-	}
-
-	m.From = m2.From.URL
-	m.To = m2.To.URL
-
-	return nil
-}