From 703066682e5c13bbb6902f64f16a4b4600654c3a Mon Sep 17 00:00:00 2001 From: Niklas Fasching Date: Mon, 1 Mar 2021 14:10:13 +0100 Subject: [PATCH] Update to go v1.16 and embed more extensive default blorg.org Instead of the bare bones default config we embedded as a string until now we can use go 1.16 embed to embed the test blorg.org which makes a much better starting config (if only to see what's possible). --- blorg/config.go | 22 +++++----------------- go.mod | 2 +- go.sum | 6 ++++++ main.go | 2 +- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/blorg/config.go b/blorg/config.go index aed59ea..c16c211 100644 --- a/blorg/config.go +++ b/blorg/config.go @@ -16,6 +16,8 @@ import ( "strings" "time" + _ "embed" + "github.com/niklasfasching/go-org/org" ) @@ -31,22 +33,8 @@ type Config struct { var DefaultConfigFile = "blorg.org" -var DefaultConfig = ` -#+CONTENT: content -#+PUBLIC: public - -* templates -** item -#+name: item -#+begin_src html -{{ . }} -#+end_src - -** list -#+name: list -#+begin_src html -{{ . }} -#+end_src` +//go:embed testdata/blorg.org +var DefaultConfig string var TemplateFuncs = map[string]interface{}{ "Slugify": slugify, @@ -195,7 +183,7 @@ func (c *Config) RenderContent() ([]*Page, error) { func (c *Config) RenderLists(pages []*Page) error { ms := toMap(c.OrgConfig.DefaultSettings, nil) ms["Pages"] = pages - lists := map[string]map[string][]interface{}{"": map[string][]interface{}{"": nil}} + lists := map[string]map[string][]interface{}{"": {"": nil}} for _, p := range pages { if p.BufferSettings["DRAFT"] != "" { continue diff --git a/go.mod b/go.mod index 7d57d8f..88850aa 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/niklasfasching/go-org -go 1.15 +go 1.16 require ( github.com/alecthomas/chroma v0.8.2 diff --git a/go.sum b/go.sum index 600d5d7..827d544 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,11 @@ +github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U= github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= github.com/alecthomas/chroma v0.8.2 h1:x3zkuE2lUk/RIekyAJ3XRqSCP4zwWDfcw/YJCuCAACg= github.com/alecthomas/chroma v0.8.2/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM= +github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo= github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0= github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE= +github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 h1:p9Sln00KOTlrYkxI1zYWl1QLnEqAqEARBEYa8FQnQcY= github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= @@ -11,11 +14,13 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk= github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -25,6 +30,7 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/main.go b/main.go index 2e0d548..bfa6fdc 100644 --- a/main.go +++ b/main.go @@ -56,7 +56,7 @@ func runBlorg(args []string) { if err := os.MkdirAll("content", os.ModePerm); err != nil { log.Fatal(err) } - + log.Println("./blorg.org and ./content/ created. Please adapt ./blorg.org") case "build": config, err := blorg.ReadConfig(blorg.DefaultConfigFile) if err != nil {