script: Don't base64 encode the assets (#4874)

We did this to minimize source size and make it compile faster. Nowadays
byte slice literals compile as fast as anything, and the source isn't
checked in so it doesn't matter how big it is.

Not using base64 avoids a decode step at startup and makes the binary
about 400k smaller.
This commit is contained in:
Jakob Borg 2018-04-11 23:02:14 +02:00 committed by Audrius Butkevicius
parent fa367e92b0
commit 5fa9237a62

View File

@ -11,8 +11,8 @@ package main
import ( import (
"bytes" "bytes"
"compress/gzip" "compress/gzip"
"encoding/base64"
"flag" "flag"
"fmt"
"go/format" "go/format"
"io" "io"
"os" "os"
@ -23,14 +23,10 @@ import (
var tpl = template.Must(template.New("assets").Parse(`package auto var tpl = template.Must(template.New("assets").Parse(`package auto
import (
"encoding/base64"
)
func Assets() map[string][]byte { func Assets() map[string][]byte {
var assets = make(map[string][]byte, {{.Assets | len}}) var assets = make(map[string][]byte, {{.Assets | len}})
{{range $asset := .Assets}} {{range $asset := .Assets}}
assets["{{$asset.Name}}"], _ = base64.StdEncoding.DecodeString("{{$asset.Data}}"){{end}} assets["{{$asset.Name}}"] = {{$asset.Data}}{{end}}
return assets return assets
} }
@ -70,7 +66,7 @@ func walkerFor(basePath string) filepath.WalkFunc {
name, _ = filepath.Rel(basePath, name) name, _ = filepath.Rel(basePath, name)
assets = append(assets, asset{ assets = append(assets, asset{
Name: filepath.ToSlash(name), Name: filepath.ToSlash(name),
Data: base64.StdEncoding.EncodeToString(buf.Bytes()), Data: fmt.Sprintf("%#v", buf.Bytes()), // "[]byte{0x00, 0x01, ...}"
}) })
} }