Fix permalink functionality, which was broken in 62dd1d4.

Viper stores Permalinks as a map[string]interface{}, so the type assertion
to PermalinkOverrides (map[string]PathPattern) will always fail.

We can, however, get Permalinks as a map[string]string, and convert each
value to a PathPattern.

diff --git a/hugolib/site.go b/hugolib/site.go
index 1a4f785db86758395e1e04bd8e7bb240d8dbaa39..3813699490ee369960051f5e8e3b3aadde19af78 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -265,9 +265,9 @@ func (s *Site) initializeSiteInfo() {
                params = make(map[string]interface{})
        }
 
-       permalinks, ok := viper.Get("Permalinks").(PermalinkOverrides)
-       if !ok {
-               permalinks = make(PermalinkOverrides)
+       permalinks := make(PermalinkOverrides)
+       for k, v := range viper.GetStringMapString("Permalinks") {
+               permalinks[k] = PathPattern(v)
        }
 
        s.Info = SiteInfo{

diff --git a/hugolib/siteinfo_test.go b/hugolib/siteinfo_test.go
index 7d765e5802bbe2003461bb4564c602c930396c05..562cfa0dd98d5465422b61d19a62a682ba33d36d 100644 (file)
--- a/hugolib/siteinfo_test.go
+++ b/hugolib/siteinfo_test.go
@@ -30,3 +30,15 @@ func TestSiteInfoParams(t *testing.T) {
                t.Errorf("Expected FOOBAR_PARAM: got %s", buf.String())
        }
 }
+
+func TestSiteInfoPermalinks (t *testing.T) {
+       viper.Set("Permalinks", map[string]interface{}{"section": "/:title"})
+       s := &Site{}
+
+       s.initialize()
+       permalink := s.Info.Permalinks["section"]
+
+       if permalink != "/:title" {
+               t.Errorf("Could not set permalink (%#v)", permalink)
+       }
+}