From 70415372090dadd179940c71655695d6fe7001f8 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Mon, 8 Oct 2018 15:18:32 +0200 Subject: [PATCH] Generate bindata with more recent version of go-bindata Signed-off-by: Knut Ahlers --- bindata.go | 114 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 86 insertions(+), 28 deletions(-) diff --git a/bindata.go b/bindata.go index 0dfe983..cc2ae2b 100644 --- a/bindata.go +++ b/bindata.go @@ -1,10 +1,10 @@ -// Code generated by go-bindata. +// Code generated by go-bindata. DO NOT EDIT. // sources: // help.txt -// DO NOT EDIT! package main + import ( "bytes" "compress/gzip" @@ -37,16 +37,23 @@ func bindataRead(data []byte, name string) ([]byte, error) { return buf.Bytes(), nil } + type asset struct { bytes []byte - info os.FileInfo + info fileInfoEx +} + +type fileInfoEx interface { + os.FileInfo + MD5Checksum() string } type bindataFileInfo struct { - name string - size int64 - mode os.FileMode - modTime time.Time + name string + size int64 + mode os.FileMode + modTime time.Time + md5checksum string } func (fi bindataFileInfo) Name() string { @@ -61,6 +68,9 @@ func (fi bindataFileInfo) Mode() os.FileMode { func (fi bindataFileInfo) ModTime() time.Time { return fi.modTime } +func (fi bindataFileInfo) MD5Checksum() string { + return fi.md5checksum +} func (fi bindataFileInfo) IsDir() bool { return false } @@ -68,29 +78,61 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _helpTxt = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\x94\xb1\x8e\xdb\x30\x0c\x86\x77\x3f\x05\xc7\x76\xf0\xdd\x7e\x5b\x71\x41\xa6\x0e\x45\x8b\xa2\x43\x90\x81\x91\x69\x5b\x38\x45\x32\x28\xea\xae\xc9\xd0\x67\x2f\x65\x29\x89\x2f\xb9\x00\x1d\xca\x2d\x12\xf9\xe9\xcf\x4f\xd2\xbf\x18\xa7\x89\x18\x90\x43\xf2\x1d\x74\x69\x72\xd6\x58\x39\x80\x04\x30\x4c\x28\x04\x3b\x34\x2f\x69\x82\x37\x2b\x23\x38\x8a\x11\x46\x3c\x1e\x1d\x35\xcd\xcf\x88\x03\x3d\x35\x70\xa9\x6a\x6b\xee\xc6\x84\xfd\x1e\x7d\xb7\x6d\x9a\x2f\xaf\x68\x1d\xee\x1c\xc1\x73\x39\x8b\xb9\xa2\xe6\x3d\x82\xf5\x86\xe1\x3a\x9e\xdf\x3d\x8c\xc6\x04\xee\xac\x1f\xb2\x26\x19\xcf\xe7\x9c\x54\x8d\xb2\xfa\xe4\xdc\x0d\xe2\x1c\xeb\xc0\x86\xe2\x5c\x37\xff\x1f\x1b\x3c\x84\x1e\xb0\x94\x15\x94\x42\x8c\x23\xf4\x0a\xfd\x38\x56\xe4\x48\x05\x65\x08\xfd\x16\x46\x4f\x21\xc5\x85\x59\xbd\x2d\x52\x9c\x8d\xd2\x9a\x11\xfd\x40\x5d\x3b\x1f\x2e\x29\x5f\xf5\xb6\x28\x29\x57\x35\x11\xa2\x9a\x40\xe0\x30\xca\x45\x4f\x21\x25\x66\xf2\xf2\x0f\xa4\xe0\x05\xad\x57\x96\xf5\x0b\x8b\x94\xc3\x14\x25\x30\xc1\x26\x27\xc2\x84\x32\x6e\x61\x23\xc8\x03\xc9\x16\xe0\x7b\xb9\x8d\x59\xc2\xe0\x0a\x4d\x9b\xd2\x59\x9e\xbd\x9e\xd3\xf2\x2f\x32\x9a\x76\x58\xe2\xce\x88\x65\x9c\x71\xf4\x4a\x7c\x90\xf1\xd4\xb3\x5b\x4e\x14\x94\x14\xef\xf5\xec\x47\xd2\x49\x61\x7b\x2c\x8e\xd7\x5c\x6d\xda\xb2\xf9\x34\x85\x68\x2b\x4d\x5f\xb3\xfd\xe1\x1e\x4d\xe7\x6e\xc2\xac\xaa\x96\x66\xb3\xd4\xd5\x08\x38\xa8\x67\x6a\xba\x0b\x06\x5d\xed\x61\xb3\x76\x38\xcc\x23\xda\xb6\x9a\xd8\xdb\xa1\xad\xa6\xb4\xfd\x7b\x68\xbe\x4b\x5c\x06\xaa\x0f\x6a\xd8\x68\x97\x23\xf1\x56\x16\xab\xb9\xa7\xea\x14\x9f\x56\xd4\x63\x72\xf2\x04\x7f\x1e\x1f\xca\x8b\x8f\xd7\xfb\xf4\x70\xc0\xbd\xfb\x3c\x6b\x52\xad\x2f\x67\x45\x57\x63\xbf\xce\xc7\xea\xf7\x18\x5c\x37\x7b\x95\x93\x2f\xda\xaa\x22\x9d\x60\x32\x29\xcb\xfe\x3f\xda\xf2\x23\x45\x5b\x47\xbb\x34\x64\x5d\xdd\x2d\xea\x1b\x5b\x2f\x0b\x7b\xea\x07\x22\x66\xbd\x21\xc9\x94\xa4\x20\x58\x5a\x4e\x3e\x43\xfc\x35\x62\x15\x74\x6b\x45\x47\x6c\xce\xc8\x9f\x23\x2d\xac\x4b\x14\xe7\x6a\x9d\x83\x98\xdb\xf1\x51\xcc\x02\xea\x77\xa0\xac\x15\x4c\x1c\x06\xc6\x3d\x9c\xca\x54\x8f\x9a\x63\x25\x36\x7f\x03\x00\x00\xff\xff\x42\x8c\xc7\xe4\x16\x05\x00\x00") +var _bindataHelptxt = []byte( + "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x94\xb1\x72\xdb\x30\x0c\x86\x77\x3d\x05\xc6\x76\x50\xbc\x67\xeb\x25" + + "\x97\xa9\x43\xaf\xbd\x5e\x87\x5c\x06\x84\x82\x24\x5e\x28\x42\x07\x80\x8e\xed\xa1\xcf\xde\xa3\xc8\xd8\xb2\x5d\xdf" + + "\x75\x28\x36\x91\xc0\xc7\x5f\x3f\x40\xfe\x12\x9c\x67\x12\x40\xe1\x14\x3b\xe8\xd2\x1c\xbc\xf3\xb6\x07\x63\x70\x42" + + "\x68\x04\xaf\xe8\xde\xd2\x0c\xef\xde\x46\x08\xa4\x0a\x23\x1e\x0e\x81\x9a\xe6\xa7\xe2\x40\xf7\x0d\x9c\xaa\xda\x9a" + + "\xfb\xec\x78\x9a\x30\x76\x2f\x4d\xf3\x65\x8b\x3e\xe0\x6b\x20\x78\x28\x6b\x9a\x2b\x6a\xde\x06\x7c\x74\x02\x97\xf1" + + "\x70\x76\x30\x3a\xc7\xd2\xf9\x38\x64\x4d\x36\x1e\xd7\x25\x05\xd2\x06\xa0\x4f\x21\x5c\x21\x8e\xf1\xc4\xe2\x48\x97" + + "\xba\xe5\x7f\x3c\x47\xe0\x1e\xb0\x94\x15\x54\x03\xe0\x02\x61\x4c\xf3\x0d\xc8\x23\x05\x32\x5a\x20\xb4\x33\xc1\x48" + + "\x9c\x74\x65\x56\xef\x8b\x94\xe0\xd5\x5a\x37\x62\x1c\xa8\x6b\x97\xc5\x35\xe5\xab\x57\x2b\x4a\xca\x56\x4d\x04\xf5" + + "\xd1\x11\x04\x54\x3b\xe9\x29\xa4\x24\x42\xd1\xfe\x81\xc4\xd1\xd0\x47\xea\xc0\xc7\x95\x45\x0d\x80\x90\x1a\x0b\xc1" + + "\x73\x4e\x84\x19\x6d\x7c\x81\x67\x43\x19\xc8\x5e\x00\xbe\x97\x5d\xcd\x12\x86\x50\x68\xb0\x81\xce\xcb\xe2\xf5\x92" + + "\x96\xbf\xc8\x19\xcb\x7e\x8d\x3b\x22\xd6\x71\xc4\xd1\x96\x64\x6f\xe3\x47\xcf\xae\x39\x6a\x68\x49\x6f\xf5\xec\x47" + + "\x9a\x26\x14\x7f\x28\x8e\xd7\x5c\xee\xcf\x9a\x4f\x33\xab\xaf\xb4\x2d\x89\xef\xf7\xb7\x68\x0f\x3c\xcd\x98\x55\xd5" + + "\xd2\x6c\x16\x45\x53\xc0\x01\x7d\x54\x83\xc0\x0e\x43\xed\x61\xf3\x14\x70\x58\x46\xb4\x6d\x1d\xc7\xde\x0f\x6d\x35" + + "\xa5\xed\xcf\xa1\x79\x2f\x49\x19\xa8\x9e\x05\x6c\xf4\xeb\x91\x78\x2f\x17\xab\xb9\x3d\x99\x25\x3e\x3d\x52\x8f\x29" + + "\xd8\x3d\xfc\xde\xdc\x95\x13\x37\x97\xf7\xe9\x6e\x8f\x53\xf8\xbc\x68\x0a\xec\xde\x8e\x8a\x2e\xc6\xfe\x29\x2f\x1b" + + "\xc3\xc8\xa1\x5b\xbc\xca\xc9\x27\x6d\x55\x11\xd0\x8e\x5c\xca\xb2\xff\x8f\xb6\x7c\x48\xd1\xd6\xd1\x6b\x1a\xb2\xae" + + "\xee\x1a\xf5\x4d\x7c\xb4\x95\x3d\xf5\x81\xd0\xac\x97\x93\xcd\xc9\x0a\x42\xac\x95\x14\x33\x24\x5e\x22\x1e\x19\x10" + + "\x8c\xb4\x64\xe4\xe7\x88\x93\xd5\x4b\xa4\x4b\xf5\x96\x44\x73\x3b\xfe\x16\x8b\x80\xfa\x0e\x94\x6b\x05\xb3\xf0\x20" + + "\x38\xc1\x47\x19\xc6\x0e\x68\xe7\x4d\x9b\x3f\x01\x00\x00\xff\xff\x42\x8c\xc7\xe4\x16\x05\x00\x00") -func helpTxtBytes() ([]byte, error) { +func bindataHelptxtBytes() ([]byte, error) { return bindataRead( - _helpTxt, + _bindataHelptxt, "help.txt", ) } -func helpTxt() (*asset, error) { - bytes, err := helpTxtBytes() + + +func bindataHelptxt() (*asset, error) { + bytes, err := bindataHelptxtBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "help.txt", size: 1302, mode: os.FileMode(420), modTime: time.Unix(1466894900, 0)} + info := bindataFileInfo{ + name: "help.txt", + size: 1302, + md5checksum: "", + mode: os.FileMode(420), + modTime: time.Unix(1466894900, 0), + } + a := &asset{bytes: bytes, info: info} + return a, nil } + +// // Asset loads and returns the asset for the given name. // It returns an error if the asset could not be found or // could not be loaded. +// func Asset(name string) ([]byte, error) { cannonicalName := strings.Replace(name, "\\", "/", -1) if f, ok := _bindata[cannonicalName]; ok { @@ -100,11 +142,14 @@ func Asset(name string) ([]byte, error) { } return a.bytes, nil } - return nil, fmt.Errorf("Asset %s not found", name) + return nil, &os.PathError{Op: "open", Path: name, Err: os.ErrNotExist} } +// // MustAsset is like Asset but panics when Asset would return an error. // It simplifies safe initialization of global variables. +// nolint: deadcode +// func MustAsset(name string) []byte { a, err := Asset(name) if err != nil { @@ -114,9 +159,10 @@ func MustAsset(name string) []byte { return a } +// // AssetInfo loads and returns the asset info for the given name. -// It returns an error if the asset could not be found or -// could not be loaded. +// It returns an error if the asset could not be found or could not be loaded. +// func AssetInfo(name string) (os.FileInfo, error) { cannonicalName := strings.Replace(name, "\\", "/", -1) if f, ok := _bindata[cannonicalName]; ok { @@ -126,10 +172,13 @@ func AssetInfo(name string) (os.FileInfo, error) { } return a.info, nil } - return nil, fmt.Errorf("AssetInfo %s not found", name) + return nil, &os.PathError{Op: "open", Path: name, Err: os.ErrNotExist} } +// // AssetNames returns the names of the assets. +// nolint: deadcode +// func AssetNames() []string { names := make([]string, 0, len(_bindata)) for name := range _bindata { @@ -138,11 +187,14 @@ func AssetNames() []string { return names } +// // _bindata is a table, holding each asset generator, mapped to its name. +// var _bindata = map[string]func() (*asset, error){ - "help.txt": helpTxt, + "help.txt": bindataHelptxt, } +// // AssetDir returns the file names below a certain // directory embedded in the file by go-bindata. // For example if you run go-bindata on data/... and data contains the @@ -156,6 +208,7 @@ var _bindata = map[string]func() (*asset, error){ // AssetDir("data/img") would return []string{"a.png", "b.png"} // AssetDir("foo.txt") and AssetDir("notexist") would return an error // AssetDir("") will return []string{"data"}. +// func AssetDir(name string) ([]string, error) { node := _bintree if len(name) != 0 { @@ -164,12 +217,20 @@ func AssetDir(name string) ([]string, error) { for _, p := range pathList { node = node.Children[p] if node == nil { - return nil, fmt.Errorf("Asset %s not found", name) + return nil, &os.PathError{ + Op: "open", + Path: name, + Err: os.ErrNotExist, + } } } } if node.Func != nil { - return nil, fmt.Errorf("Asset %s not found", name) + return nil, &os.PathError{ + Op: "open", + Path: name, + Err: os.ErrNotExist, + } } rv := make([]string, 0, len(node.Children)) for childName := range node.Children { @@ -178,12 +239,14 @@ func AssetDir(name string) ([]string, error) { return rv, nil } + type bintree struct { Func func() (*asset, error) Children map[string]*bintree } -var _bintree = &bintree{nil, map[string]*bintree{ - "help.txt": &bintree{helpTxt, map[string]*bintree{}}, + +var _bintree = &bintree{Func: nil, Children: map[string]*bintree{ + "help.txt": {Func: bindataHelptxt, Children: map[string]*bintree{}}, }} // RestoreAsset restores an asset under the given directory @@ -204,11 +267,7 @@ func RestoreAsset(dir, name string) error { if err != nil { return err } - err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) - if err != nil { - return err - } - return nil + return os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) } // RestoreAssets restores an asset under the given directory recursively @@ -232,4 +291,3 @@ func _filePath(dir, name string) string { cannonicalName := strings.Replace(name, "\\", "/", -1) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } -