From e2e4e7f748b4accf18950e0731248ed4ace63869 Mon Sep 17 00:00:00 2001
From: Máximo Cuadros <mcuadros@gmail.com>
Date: Thu, 26 Jan 2017 20:53:32 +0100
Subject: config: marshal and unmarshal implementation

---
 storage/filesystem/config.go | 105 +++++--------------------------------------
 1 file changed, 12 insertions(+), 93 deletions(-)

(limited to 'storage/filesystem/config.go')

diff --git a/storage/filesystem/config.go b/storage/filesystem/config.go
index 07e0433..7693fd4 100644
--- a/storage/filesystem/config.go
+++ b/storage/filesystem/config.go
@@ -1,22 +1,14 @@
 package filesystem
 
 import (
-	"fmt"
 	"os"
 
+	"io/ioutil"
+
 	"gopkg.in/src-d/go-git.v4/config"
-	gitconfig "gopkg.in/src-d/go-git.v4/plumbing/format/config"
 	"gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit"
 )
 
-const (
-	remoteSection = "remote"
-	coreSection   = "core"
-	fetchKey      = "fetch"
-	urlKey        = "url"
-	bareKey       = "bare"
-)
-
 type ConfigStorage struct {
 	dir *dotgit.DotGit
 }
@@ -24,20 +16,6 @@ type ConfigStorage struct {
 func (c *ConfigStorage) Config() (*config.Config, error) {
 	cfg := config.NewConfig()
 
-	ini, err := c.unmarshal()
-	if err != nil {
-		return nil, err
-	}
-
-	c.unmarshalCore(cfg, ini)
-	c.unmarshalRemotes(cfg, ini)
-
-	return cfg, nil
-}
-
-func (c *ConfigStorage) unmarshal() (*gitconfig.Config, error) {
-	cfg := gitconfig.New()
-
 	f, err := c.dir.Config()
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -49,43 +27,16 @@ func (c *ConfigStorage) unmarshal() (*gitconfig.Config, error) {
 
 	defer f.Close()
 
-	d := gitconfig.NewDecoder(f)
-	if err := d.Decode(cfg); err != nil {
+	b, err := ioutil.ReadAll(f)
+	if err != nil {
 		return nil, err
 	}
 
-	return cfg, nil
-}
-
-func (c *ConfigStorage) unmarshalCore(cfg *config.Config, ini *gitconfig.Config) {
-	s := ini.Section(coreSection)
-	if s.Options.Get(bareKey) == "true" {
-		cfg.Core.IsBare = true
-	}
-}
-
-func (c *ConfigStorage) unmarshalRemotes(cfg *config.Config, ini *gitconfig.Config) {
-	s := ini.Section(remoteSection)
-	for _, sub := range s.Subsections {
-		r := c.unmarshalRemote(sub)
-		cfg.Remotes[r.Name] = r
-	}
-}
-
-func (c *ConfigStorage) unmarshalRemote(s *gitconfig.Subsection) *config.RemoteConfig {
-	fetch := []config.RefSpec{}
-	for _, f := range s.Options.GetAll(fetchKey) {
-		rs := config.RefSpec(f)
-		if rs.IsValid() {
-			fetch = append(fetch, rs)
-		}
+	if err := cfg.Unmarshal(b); err != nil {
+		return nil, err
 	}
 
-	return &config.RemoteConfig{
-		Name:  s.Name,
-		URL:   s.Option(urlKey),
-		Fetch: fetch,
-	}
+	return cfg, nil
 }
 
 func (c *ConfigStorage) SetConfig(cfg *config.Config) error {
@@ -93,50 +44,18 @@ func (c *ConfigStorage) SetConfig(cfg *config.Config) error {
 		return err
 	}
 
-	ini, err := c.unmarshal()
+	f, err := c.dir.ConfigWriter()
 	if err != nil {
 		return err
 	}
 
-	c.marshalCore(cfg, ini)
-	c.marshalRemotes(cfg, ini)
-	return c.marshal(ini)
-}
-
-func (c *ConfigStorage) marshalCore(cfg *config.Config, ini *gitconfig.Config) {
-	s := ini.Section(coreSection)
-	s.AddOption(bareKey, fmt.Sprintf("%t", cfg.Core.IsBare))
-}
-
-func (c *ConfigStorage) marshalRemotes(cfg *config.Config, ini *gitconfig.Config) {
-	s := ini.Section(remoteSection)
-	s.Subsections = make(gitconfig.Subsections, len(cfg.Remotes))
-
-	var i int
-	for _, r := range cfg.Remotes {
-		s.Subsections[i] = c.marshalRemote(r)
-		i++
-	}
-}
-
-func (c *ConfigStorage) marshalRemote(r *config.RemoteConfig) *gitconfig.Subsection {
-	s := &gitconfig.Subsection{Name: r.Name}
-	s.AddOption(urlKey, r.URL)
-	for _, rs := range r.Fetch {
-		s.AddOption(fetchKey, rs.String())
-	}
-
-	return s
-}
+	defer f.Close()
 
-func (c *ConfigStorage) marshal(ini *gitconfig.Config) error {
-	f, err := c.dir.ConfigWriter()
+	b, err := cfg.Marshal()
 	if err != nil {
 		return err
 	}
 
-	defer f.Close()
-
-	e := gitconfig.NewEncoder(f)
-	return e.Encode(ini)
+	_, err = f.Write(b)
+	return err
 }
-- 
cgit 


From 7581d7f76a08869ed1ad1384dea1880c635af58b Mon Sep 17 00:00:00 2001
From: Máximo Cuadros <mcuadros@gmail.com>
Date: Thu, 26 Jan 2017 23:53:15 +0100
Subject: config: documentation improvements

---
 storage/filesystem/config.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'storage/filesystem/config.go')

diff --git a/storage/filesystem/config.go b/storage/filesystem/config.go
index 7693fd4..cad698a 100644
--- a/storage/filesystem/config.go
+++ b/storage/filesystem/config.go
@@ -1,9 +1,8 @@
 package filesystem
 
 import (
-	"os"
-
 	"io/ioutil"
+	"os"
 
 	"gopkg.in/src-d/go-git.v4/config"
 	"gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit"
-- 
cgit