commit 00c7d16aba50aec5f23426d322c9faddc3729e4f
parent d10076f7080262aa05109234d3d6958a66af7e4c
Author: Jack Mordaunt <jackmordaunt@gmail.com>
Date: Sat, 1 May 2021 11:03:37 +0800
feat(ui): gio frontend sketch
Signed-off-by: Jack Mordaunt <jackmordaunt@gmail.com>
Diffstat:
| A | cmd/gio/giffer.go | | | 128 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | cmd/gio/main.go | | | 291 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | cmd/gio/store.go | | | 192 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | engine.go | | | 10 | ++++++++-- |
| M | go.mod | | | 12 | +++++++++--- |
| M | go.sum | | | 52 | ++++++++++++++++++++++++++++++++++++++++++++-------- |
6 files changed, 672 insertions(+), 13 deletions(-)
diff --git a/cmd/gio/giffer.go b/cmd/gio/giffer.go
@@ -0,0 +1,128 @@
+package main
+
+import (
+ "bytes"
+ "fmt"
+ "io"
+ "io/ioutil"
+ "path/filepath"
+ "strings"
+
+ "github.com/OneOfOne/xxhash"
+ "github.com/jackmordaunt/giffer"
+ "github.com/pkg/errors"
+)
+
+// Giffer wraps the giffer business logic.
+type Giffer struct {
+ giffer.Downloader
+ giffer.Engine
+ Store GifStore
+}
+
+// GifStore contains Gif files.
+type GifStore interface {
+ Lookup(key string) (*RenderedGif, bool, error)
+ Insert(key string, img *RenderedGif) error
+}
+
+// GififyURL downloads the video at url and creates a .gif based on the spcified
+// parameters.
+func (g *Giffer) GififyURL(
+ url string,
+ start, end, fps float64,
+ width, height, fuzz int,
+ q giffer.Quality,
+) (*RenderedGif, error) {
+ if g.Store == nil {
+ return g.make(url, start, end, fps, width, height, fuzz, q)
+ }
+ key, err := hash(fmt.Sprintf("%s_%f_%f_%f_%d_%d_%d", url, start, end, fps, width, height, q))
+ if err != nil {
+ return nil, err
+ }
+ if g.Store != nil {
+ img, ok, err := g.Store.Lookup(key)
+ if err != nil {
+ return nil, errors.Wrap(err, "store lookup")
+ }
+ if ok && img != nil {
+ return img, nil
+ }
+ }
+ img, err := g.make(url, start, end, fps, width, height, fuzz, q)
+ if err != nil {
+ return nil, err
+ }
+ dup := &RenderedGif{
+ // Trying to copy the data.
+ Reader: bytes.NewBuffer([]byte(img.Reader.(*bytes.Buffer).String())),
+ FileName: img.FileName,
+ }
+ if err := g.Store.Insert(key, dup); err != nil {
+ return nil, errors.Wrap(err, "inserting gif into store")
+ }
+ return img, nil
+}
+
+func (g *Giffer) make(
+ url string,
+ start, end, fps float64,
+ width, height, fuzz int,
+ q giffer.Quality,
+) (*RenderedGif, error) {
+ video, err := g.Download(url, start, end, q)
+ if err != nil {
+ return nil, errors.Wrap(err, "downloading")
+ }
+ gif, err := g.Transcode(video, start, end, width, height, fps)
+ if err != nil {
+ return nil, errors.Wrap(err, "transcoding video to gif")
+ }
+ if err := g.Crush(gif, fuzz); err != nil {
+ return nil, errors.Wrap(err, "optimising gif image")
+ }
+ defer g.Clean()
+ gifdata, err := ioutil.ReadFile(gif)
+ if err != nil {
+ return nil, errors.Wrap(err, "buffering gif")
+ }
+ img := &RenderedGif{
+ Reader: bytes.NewBuffer(gifdata),
+ FileName: sanitiseFilepath(strings.Split(filepath.Base(video), ".")[0] + ".gif"),
+ }
+ return img, nil
+}
+
+// RenderedGif wraps the gif data with some metadata.
+type RenderedGif struct {
+ io.Reader
+ // FileName is <title>.<ext>
+ FileName string
+}
+
+func hash(input string) (string, error) {
+ hasher := xxhash.New64()
+ _, err := hasher.WriteString(input)
+ if err != nil {
+ return "", errors.Wrap(err, "hashing input")
+ }
+ h := fmt.Sprintf("%d", hasher.Sum64())
+ return h, nil
+}
+
+func sanitiseFilepath(p string) string {
+ r := strings.NewReplacer(
+ "(", "",
+ ")", "",
+ "!", "",
+ "+", "",
+ "?", "",
+ "*", "",
+ "&", "",
+ "^", "",
+ "=", "",
+ " ", "",
+ )
+ return r.Replace(p)
+}
diff --git a/cmd/gio/main.go b/cmd/gio/main.go
@@ -0,0 +1,291 @@
+package main
+
+import (
+ "image"
+ "image/color"
+ "image/gif"
+ "log"
+ "os"
+ "path/filepath"
+ "strconv"
+ "time"
+
+ "gioui.org/app"
+ "gioui.org/font/gofont"
+ "gioui.org/io/system"
+ "gioui.org/layout"
+ l "gioui.org/layout"
+ "gioui.org/op"
+ "gioui.org/op/paint"
+ "gioui.org/unit"
+ "gioui.org/widget"
+ "gioui.org/widget/material"
+ m "gioui.org/widget/material"
+ c "gioui.org/x/component"
+ "github.com/jackmordaunt/giffer"
+)
+
+func main() {
+ go func() {
+ ui := UI{
+ Window: app.NewWindow(
+ app.Title("Giffer"),
+ app.MinSize(unit.Dp(800), unit.Dp(425)),
+ ),
+ Th: material.NewTheme(gofont.Collection()),
+ Giffer: Giffer{
+ Store: &gifdb{
+ Dir: filepath.Join(os.TempDir(), "giffer"),
+ },
+ },
+ }
+ if err := ui.Loop(); err != nil {
+ log.Fatalf("error: %v", err)
+ }
+ os.Exit(0)
+ }()
+ app.Main()
+}
+
+type (
+ C = layout.Context
+ D = layout.Dimensions
+)
+
+type UI struct {
+ *app.Window
+ Giffer Giffer
+ Th *m.Theme
+ Form Form
+ Video Gif
+}
+
+// Loop runs the event loop until terminated.
+func (ui *UI) Loop() error {
+ var (
+ ops op.Ops
+ events = ui.Window.Events()
+ )
+ for event := range events {
+ switch event := (event).(type) {
+ case system.DestroyEvent:
+ return event.Err
+ case system.FrameEvent:
+ gtx := layout.NewContext(&ops, event)
+ ui.Update(gtx)
+ ui.Layout(gtx)
+ event.Frame(gtx.Ops)
+ }
+ }
+ return nil
+}
+
+func (ui *UI) Update(gtx C) {
+ if ui.Form.SubmitBtn.Clicked() {
+ var (
+ url = ui.Form.URL.Text()
+ fuzz = 0
+ quality = giffer.Low
+ )
+ start, err := strconv.ParseFloat(ui.Form.Start.Text(), 64)
+ if err != nil {
+ log.Printf("error: start must be a floating point number")
+ }
+ end, err := strconv.ParseFloat(ui.Form.End.Text(), 64)
+ if err != nil {
+ log.Printf("error: end must be a floating point number")
+ }
+ fps, err := strconv.ParseFloat(ui.Form.FPS.Text(), 64)
+ if err != nil {
+ log.Printf("error: fps must be a floating point number")
+ }
+ width, err := strconv.Atoi(ui.Form.Width.Text())
+ if err != nil {
+ log.Printf("error: width must be an integer number")
+ }
+ height, err := strconv.Atoi(ui.Form.Height.Text())
+ if err != nil {
+ log.Printf("error: height must be an integer number")
+ }
+ g, err := ui.Giffer.GififyURL(
+ url,
+ start,
+ end,
+ fps,
+ width,
+ height,
+ fuzz,
+ quality,
+ )
+ if err != nil {
+ log.Printf("error: fetching gif: %v", err)
+ }
+ img, err := gif.DecodeAll(g)
+ if err != nil {
+ log.Printf("error: decoding gif: %v", err)
+ }
+ ui.Video.Src = img
+ }
+}
+
+func (ui *UI) Layout(gtx C) {
+ l.UniformInset(unit.Dp(10)).Layout(gtx, func(gtx C) D {
+ return l.Flex{
+ Axis: l.Horizontal,
+ }.Layout(
+ gtx,
+ l.Flexed(1, func(gtx C) D {
+ return l.Center.Layout(gtx, func(gtx C) D {
+ var (
+ cs = >x.Constraints
+ max = gtx.Px(unit.Dp(400))
+ )
+ if cs.Max.X > max {
+ cs.Max.X = max
+ }
+ return ui.Form.Layout(gtx, ui.Th)
+ })
+ }),
+ l.Flexed(1, func(gtx C) D {
+ return layout.Center.Layout(gtx, func(gtx C) D {
+ var (
+ cs = >x.Constraints
+ width = gtx.Px(unit.Dp(350))
+ height = gtx.Px(unit.Dp(250))
+ )
+ cs.Max.X /= 2
+ cs.Max.Y /= 2
+ if cs.Max.X > width {
+ cs.Max.X = width
+ }
+ if cs.Max.Y > height {
+ cs.Max.Y = height
+ }
+ return ui.Video.Layout(gtx)
+ })
+ }),
+ )
+ })
+}
+
+// Form holds state for form inputs.
+type Form struct {
+ URL c.TextField
+ Start c.TextField
+ End c.TextField
+ Quality c.TextField
+ Width c.TextField
+ Height c.TextField
+ FPS c.TextField
+ Loading bool
+ SubmitBtn widget.Clickable
+}
+
+func (f *Form) Layout(gtx C, th *m.Theme) D {
+ return l.Stack{}.Layout(
+ gtx,
+ l.Stacked(func(gtx C) D {
+ return l.Flex{
+ Axis: l.Vertical,
+ }.Layout(
+ gtx,
+ l.Rigid(func(gtx C) D {
+ return f.URL.Layout(gtx, th, "url")
+ }),
+ l.Rigid(func(gtx C) D {
+ return f.Start.Layout(gtx, th, "start")
+ }),
+ l.Rigid(func(gtx C) D {
+ return f.End.Layout(gtx, th, "end")
+ }),
+ l.Rigid(func(gtx C) D {
+ return f.Quality.Layout(gtx, th, "quality")
+ }),
+ l.Rigid(func(gtx C) D {
+ return f.Width.Layout(gtx, th, "width")
+ }),
+ l.Rigid(func(gtx C) D {
+ return f.Height.Layout(gtx, th, "height")
+ }),
+ l.Rigid(func(gtx C) D {
+ return f.FPS.Layout(gtx, th, "fps")
+ }),
+ l.Rigid(func(gtx C) D {
+ return D{Size: image.Point{Y: gtx.Px(unit.Dp(10))}}
+ }),
+ l.Rigid(func(gtx C) D {
+ return m.Button(th, &f.SubmitBtn, "Create").Layout(gtx)
+ }),
+ )
+ }),
+ l.Expanded(func(gtx C) D {
+ if !f.Loading {
+ return D{}
+ }
+ return c.Rect{
+ Color: color.NRGBA{A: 100},
+ Size: image.Point{
+ X: gtx.Constraints.Max.X,
+ Y: gtx.Constraints.Max.Y,
+ },
+ }.Layout(gtx)
+ }),
+ )
+}
+
+// Gif animates through a series of frames.
+type Gif struct {
+ Src *gif.GIF
+ Cursor int
+
+ since time.Time
+ img widget.Image
+}
+
+// Ready if the next frame is ready to be displayed.
+func (g *Gif) Ready(gtx C) bool {
+ var (
+ now = gtx.Now
+ since = g.since
+ latency = time.Duration(g.Src.Delay[g.Cursor]) * time.Second / 100
+ )
+ return now.Sub(since).Milliseconds() >= latency.Milliseconds()
+}
+
+// Next returns the next frame in the series.
+func (g *Gif) Next(gtx C) {
+ defer func() {
+ g.Cursor++
+ if g.Cursor > len(g.Src.Image)-1 {
+ g.Cursor = 0
+ }
+ g.since = gtx.Now
+ }()
+ op.InvalidateOp{
+ At: gtx.Now.Add(time.Duration(g.Src.Delay[g.Cursor]) * time.Second / 100),
+ }.Add(
+ gtx.Ops,
+ )
+ g.img.Src = paint.NewImageOp(g.Src.Image[g.Cursor])
+}
+
+// Current returns the current frame.
+func (g *Gif) Current() *image.Paletted {
+ return g.Src.Image[g.Cursor]
+}
+
+func (g *Gif) Layout(gtx C) D {
+ if g.Src == nil || len(g.Src.Image) == 0 {
+ return c.Rect{
+ Size: image.Point{
+ X: gtx.Constraints.Max.X,
+ Y: gtx.Constraints.Max.Y,
+ },
+ Color: color.NRGBA{A: 100},
+ }.Layout(gtx)
+ }
+ if g.Ready(gtx) {
+ g.Next(gtx)
+ }
+ return g.img.Layout(gtx)
+}
diff --git a/cmd/gio/store.go b/cmd/gio/store.go
@@ -0,0 +1,192 @@
+package main
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "io"
+ "os"
+ "path/filepath"
+ "sync"
+
+ "github.com/hashicorp/go-multierror"
+
+ "github.com/pkg/errors"
+)
+
+// Gif images are stored as-is on disk with a corresponding json file that
+// contains the metadata. Why did I use goroutines to parellelise writing just
+// two files? Don't ask me that, man.
+type gifdb struct {
+ Dir string
+ init sync.Once
+}
+
+// Lookup loads the rendered gif from disk.
+func (db *gifdb) Lookup(key string) (*RenderedGif, bool, error) {
+ var (
+ info os.FileInfo
+ err error
+ )
+ db.init.Do(func() {
+ err = os.MkdirAll(db.Dir, 0755)
+ })
+ if err != nil && !os.IsExist(err) {
+ return nil, false, errors.Wrap(err, "initialising")
+ }
+ meta := filepath.Join(db.Dir, key+".json")
+ info, err = os.Stat(meta)
+ if os.IsNotExist(err) {
+ return nil, false, nil
+ }
+ if err != nil {
+ return nil, false, err
+ }
+ if info.IsDir() {
+ return nil, false, fmt.Errorf("key leads to a directory, not a json file")
+ }
+ img := filepath.Join(db.Dir, key+".gif")
+ info, err = os.Stat(img)
+ if os.IsNotExist(err) {
+ return nil, false, nil
+ }
+ if err != nil {
+ return nil, false, err
+ }
+ if info.IsDir() {
+ return nil, false, fmt.Errorf("key leads to a directory, not a gif file")
+ }
+ var (
+ failed = make(chan error)
+ done = make(chan interface{})
+ wg = sync.WaitGroup{}
+ )
+ wg.Add(2)
+ go func() {
+ defer wg.Done()
+ if name, err := func() (string, error) {
+ metaf, err := os.Open(meta)
+ if err != nil {
+ return "", errors.Wrap(err, "opening metadata file")
+ }
+ defer metaf.Close()
+ type metadata struct {
+ FileName string `json:"filename"`
+ }
+ var md metadata
+ if err := json.NewDecoder(metaf).Decode(&md); err != nil {
+ return "", errors.Wrap(err, "decoding metadata")
+ }
+ return md.FileName, nil
+ }(); err != nil {
+ failed <- err
+ } else {
+ done <- name
+ }
+ }()
+ go func() {
+ defer wg.Done()
+ if buf, err := func() (*bytes.Buffer, error) {
+ buf := bytes.NewBuffer(nil)
+ file, err := os.Open(img)
+ if err != nil {
+ return nil, errors.Wrap(err, "opening gif file")
+ }
+ defer file.Close()
+ if _, err := io.Copy(buf, file); err != nil {
+ return nil, errors.Wrap(err, "reading gif file")
+ }
+ return buf, nil
+ }(); err != nil {
+ failed <- err
+ } else {
+ done <- buf
+ }
+ }()
+ go func() {
+ wg.Wait()
+ close(failed)
+ }()
+ var failure error
+ go func() {
+ for err := range failed {
+ failure = multierror.Append(failure, err)
+ }
+ close(done)
+ }()
+ r := &RenderedGif{}
+ for v := range done {
+ switch v := v.(type) {
+ case string:
+ r.FileName = v
+ case *bytes.Buffer:
+ r.Reader = v
+ }
+ }
+ if failure != nil {
+ return nil, false, failure
+ }
+ return r, true, nil
+}
+
+// Insert stores the rendered gif on disk.
+func (db *gifdb) Insert(key string, img *RenderedGif) (err error) {
+ db.init.Do(func() {
+ err = os.MkdirAll(db.Dir, 0755)
+ })
+ if err != nil && !os.IsExist(err) {
+ return errors.Wrap(err, "initialising")
+ }
+ var (
+ failed = make(chan error)
+ wg = sync.WaitGroup{}
+ )
+ wg.Add(2)
+ go func() {
+ defer wg.Done()
+ if err := func() error {
+ imgpath := filepath.Join(db.Dir, key+".gif")
+ imgf, err := os.Create(imgpath)
+ if err != nil {
+ return errors.Wrap(err, "creating gif file")
+ }
+ defer imgf.Close()
+ if _, err := io.Copy(imgf, img); err != nil {
+ return errors.Wrap(err, "persisting gif to disk")
+ }
+ return nil
+ }(); err != nil {
+ failed <- err
+ }
+ }()
+ go func() {
+ defer wg.Done()
+ if err := func() error {
+ meta := filepath.Join(db.Dir, key+".json")
+ metaf, err := os.Create(meta)
+ if err != nil {
+ return errors.Wrap(err, "creating metadata file")
+ }
+ defer metaf.Close()
+ type metadata struct {
+ FileName string `json:"filename"`
+ }
+ if err := json.NewEncoder(metaf).Encode(metadata{
+ FileName: img.FileName,
+ }); err != nil {
+ return errors.Wrap(err, "writing to metadata file")
+ }
+ return nil
+ }(); err != nil {
+ failed <- err
+ }
+ }()
+ go func() {
+ wg.Wait()
+ close(failed)
+ }()
+ for failure := range failed {
+ err = multierror.Append(err, failure)
+ }
+ return err
+}
diff --git a/engine.go b/engine.go
@@ -32,7 +32,7 @@ type Engine struct {
// Returns a filepath to the merged file.
func (eng *Engine) Cut(video string, cuts ...[2]int) (string, error) {
if err := eng.init(); err != nil {
- return "", err
+ return "", fmt.Errorf("initializing engine: %w", err)
}
var (
cutfiles []string
@@ -93,7 +93,7 @@ func (eng *Engine) Transcode(
fps float64,
) (string, error) {
if err := eng.init(); err != nil {
- return "", err
+ return "", fmt.Errorf("initializing engine: %w", err)
}
var (
duration = end - start
@@ -237,6 +237,12 @@ func (eng *Engine) path(s ...string) string {
func (eng *Engine) init() (err error) {
eng.once.Do(func() {
+ if eng.FFmpeg == "" {
+ eng.FFmpeg = "ffmpeg"
+ }
+ if eng.Dir == "" {
+ return
+ }
err = os.MkdirAll(eng.Dir, 0755)
if err != nil && !os.IsExist(err) {
err = errors.Wrap(err, "preparing directories")
diff --git a/go.mod b/go.mod
@@ -3,8 +3,11 @@ module github.com/jackmordaunt/giffer
go 1.16
require (
+ gioui.org v0.0.0-20210427144906-23a839a29d27
+ gioui.org/x v0.0.0-20210423015942-6eca3d6e9fe4
github.com/GeertJohan/go.rice v0.0.0-20170420135705-c02ca9a983da
- github.com/OneOfOne/xxhash v1.2.2
+ github.com/OneOfOne/xxhash v1.2.8
+ github.com/VividCortex/ewma v1.2.0 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/daaku/go.zipexe v0.0.0-20150329023125-a5fe2436ffcb // indirect
github.com/gonutz/ide v0.0.0-20180502124734-e9fc8c14ed56
@@ -15,11 +18,14 @@ require (
github.com/jackmordaunt/icns v1.0.0
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
github.com/kkdai/youtube/v2 v2.6.1
+ github.com/mattn/go-runewidth v0.0.12 // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
- github.com/pkg/errors v0.8.1
+ github.com/pkg/errors v0.9.1
+ github.com/rivo/uniseg v0.2.0 // indirect
+ github.com/vbauerster/mpb/v5 v5.4.0 // indirect
github.com/zserge/lorca v0.1.2
github.com/zserge/webview v0.0.0-20181018084947-f390a2df9ec5
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
- golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a // indirect
+ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 // indirect
)
diff --git a/go.sum b/go.sum
@@ -11,14 +11,22 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+gioui.org v0.0.0-20210402191542-ce7f0da06ee3/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
+gioui.org v0.0.0-20210427144906-23a839a29d27 h1:gnju9OjD+N3C4bUrQj2rEaWSimlpuzBcnp8r5J07Bgc=
+gioui.org v0.0.0-20210427144906-23a839a29d27/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
+gioui.org/x v0.0.0-20210423015942-6eca3d6e9fe4 h1:DnT107I6VQ/j0HcyZDkBwVc11TXLkscBKW6xTTx0Zzk=
+gioui.org/x v0.0.0-20210423015942-6eca3d6e9fe4/go.mod h1:qsAS5EBzGhn3sJ98FJdA+ae+E5/DgmxjySERjjR1Zvg=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/GeertJohan/go.rice v0.0.0-20170420135705-c02ca9a983da h1:UVU3a9pRUyLdnBtn60WjRl0s4SEyJc2ChCY56OAR6wI=
github.com/GeertJohan/go.rice v0.0.0-20170420135705-c02ca9a983da/go.mod h1:DgrzXonpdQbfN3uYaGz1EG4Sbhyum/MMIn6Cphlh2bw=
-github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM=
+github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
+github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
+github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
+github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -34,7 +42,6 @@ github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngE
github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -54,6 +61,7 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
@@ -137,8 +145,9 @@ github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow=
+github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
@@ -159,8 +168,9 @@ github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FW
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
@@ -173,6 +183,9 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -199,8 +212,9 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/vbauerster/mpb/v5 v5.3.0 h1:vgrEJjUzHaSZKDRRxul5Oh4C72Yy/5VEMb0em+9M0mQ=
github.com/vbauerster/mpb/v5 v5.3.0/go.mod h1:4yTkvAb8Cm4eylAp6t0JRq6pXDkFJ4krUlDqWYkakAs=
+github.com/vbauerster/mpb/v5 v5.4.0 h1:n8JPunifvQvh6P1D1HAl2Ur9YcmKT1tpoUuiea5mlmg=
+github.com/vbauerster/mpb/v5 v5.4.0/go.mod h1:fi4wVo7BVQ22QcvFObm+VwliQXlV1eBT8JDaKXR4JGI=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/zserge/lorca v0.1.2 h1:SiJb/LyJ7muJP155cznSzZFUCIczJcnXuQCmugNn1ms=
github.com/zserge/lorca v0.1.2/go.mod h1:gTrVdXKyWxNhc8aUb1Uu3s0mY343arR1T6jUtxmBxR8=
@@ -217,15 +231,23 @@ golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnf
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE=
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20201229011636-eab1b5eb1a03 h1:XlAInxBYX5nBofPaY51uv/x9xmRgZGr/lDOsePd2AcE=
+golang.org/x/exp v0.0.0-20201229011636-eab1b5eb1a03/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 h1:QelT11PB4FXiDEXucrfNckHoFxwt8USGY1ajP1ZF5lM=
+golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -235,8 +257,12 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -252,8 +278,8 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a h1:njMmldwFTyDLqonHMagNXKBWptTBeDZOdblgaDsNEGQ=
-golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -275,8 +301,11 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 h1:dXfMednGJh/SUUFjTLsWJz3P+TQt9qnR11GgeI3vWKs=
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -284,6 +313,8 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -302,9 +333,14 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=