From 44b6932202f73b6fea74530303e5e578c64e006a Mon Sep 17 00:00:00 2001 From: Dan Sosedoff Date: Mon, 28 Jan 2019 16:45:41 -0600 Subject: [PATCH] Regenerate bindata --- pkg/data/bindata.go | 259 +++++++++++++++++--------------------------- 1 file changed, 101 insertions(+), 158 deletions(-) diff --git a/pkg/data/bindata.go b/pkg/data/bindata.go index 8cabca2..9015af1 100644 --- a/pkg/data/bindata.go +++ b/pkg/data/bindata.go @@ -1,32 +1,30 @@ -// Code generated by go-bindata. DO NOT EDIT. +// Code generated by go-bindata. (@generated) DO NOT EDIT. // sources: -// static/css/app.css (11.842kB) -// static/css/bootstrap.css (109.518kB) -// static/css/font-awesome.css (21.984kB) -// static/fonts/FontAwesome.otf (85.908kB) -// static/fonts/fontawesome-webfont.eot (56.006kB) -// static/fonts/fontawesome-webfont.svg (287.007kB) -// static/fonts/fontawesome-webfont.ttf (112.16kB) -// static/fonts/fontawesome-webfont.woff (65.452kB) -// static/img/icon.ico (104.736kB) -// static/img/icon.png (7.945kB) -// static/index.html (12.713kB) -// static/js/ace-pgsql.js (53.342kB) -// static/js/ace.js (327.872kB) -// static/js/app.js (37.869kB) -// static/js/base64.js (3.517kB) -// static/js/bootstrap-contextmenu.js (5.3kB) -// static/js/bootstrap3-typeahead.min.js (9.335kB) -// static/js/jquery.js (84.245kB) -// static/js/theme-tomorrow.js (2.556kB) -// static/js/utils.js (831B) - +// static/css/app.css +// static/css/bootstrap.css +// static/css/font-awesome.css +// static/fonts/FontAwesome.otf +// static/fonts/fontawesome-webfont.eot +// static/fonts/fontawesome-webfont.svg +// static/fonts/fontawesome-webfont.ttf +// static/fonts/fontawesome-webfont.woff +// static/img/icon.ico +// static/img/icon.png +// static/index.html +// static/js/ace-pgsql.js +// static/js/ace.js +// static/js/app.js +// static/js/base64.js +// static/js/bootstrap-contextmenu.js +// static/js/bootstrap3-typeahead.min.js +// static/js/jquery.js +// static/js/theme-tomorrow.js +// static/js/utils.js package data import ( "bytes" "compress/gzip" - "crypto/sha256" "fmt" "io" "io/ioutil" @@ -39,7 +37,7 @@ import ( func bindataRead(data []byte, name string) ([]byte, error) { gz, err := gzip.NewReader(bytes.NewBuffer(data)) if err != nil { - return nil, fmt.Errorf("read %q: %v", name, err) + return nil, fmt.Errorf("Read %q: %v", name, err) } var buf bytes.Buffer @@ -47,7 +45,7 @@ func bindataRead(data []byte, name string) ([]byte, error) { clErr := gz.Close() if err != nil { - return nil, fmt.Errorf("read %q: %v", name, err) + return nil, fmt.Errorf("Read %q: %v", name, err) } if clErr != nil { return nil, err @@ -57,9 +55,8 @@ func bindataRead(data []byte, name string) ([]byte, error) { } type asset struct { - bytes []byte - info os.FileInfo - digest [sha256.Size]byte + bytes []byte + info os.FileInfo } type bindataFileInfo struct { @@ -103,8 +100,8 @@ func staticCssAppCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/css/app.css", size: 11842, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf7, 0x47, 0xac, 0xd6, 0xa6, 0xad, 0x4d, 0x77, 0x99, 0xee, 0x94, 0xc3, 0x65, 0xce, 0x69, 0x68, 0x18, 0x96, 0xef, 0xa8, 0x99, 0xb8, 0x64, 0x89, 0xfa, 0xf4, 0x65, 0x86, 0x7f, 0xf3, 0x94, 0x4b}} + info := bindataFileInfo{name: "static/css/app.css", size: 11842, mode: os.FileMode(420), modTime: time.Unix(1548628718, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -123,8 +120,8 @@ func staticCssBootstrapCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/css/bootstrap.css", size: 109518, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xb5, 0xfd, 0x72, 0x37, 0x50, 0x76, 0x3e, 0xbb, 0x73, 0x1f, 0x92, 0x21, 0xe4, 0x13, 0xe7, 0xd6, 0x4d, 0x58, 0xd5, 0x19, 0x2d, 0xc0, 0x40, 0xe4, 0x22, 0x92, 0xed, 0x3d, 0xcc, 0xcc, 0xa7, 0x32}} + info := bindataFileInfo{name: "static/css/bootstrap.css", size: 109518, mode: os.FileMode(420), modTime: time.Unix(1467073917, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -143,8 +140,8 @@ func staticCssFontAwesomeCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/css/font-awesome.css", size: 21984, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf, 0xb1, 0xbb, 0xca, 0x73, 0x64, 0x6e, 0x8e, 0x2b, 0x93, 0xc8, 0x2e, 0x8d, 0x8b, 0x21, 0x96, 0x47, 0xb1, 0x3d, 0x4b, 0x44, 0xc, 0x48, 0xe3, 0x38, 0x29, 0xb, 0x9a, 0x68, 0x5b, 0x8d, 0xe1}} + info := bindataFileInfo{name: "static/css/font-awesome.css", size: 21984, mode: os.FileMode(420), modTime: time.Unix(1502760883, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -163,8 +160,8 @@ func staticFontsFontawesomeOtf() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/fonts/FontAwesome.otf", size: 85908, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xd, 0x34, 0xda, 0x7, 0xe5, 0xcb, 0xcb, 0x4f, 0xf0, 0x87, 0xb3, 0x97, 0x96, 0x6a, 0x9f, 0x9f, 0xfb, 0x4d, 0x6e, 0xd7, 0xc7, 0x6, 0x5, 0x68, 0x56, 0x52, 0x3, 0xc0, 0x2f, 0x3f, 0xee, 0x11}} + info := bindataFileInfo{name: "static/fonts/FontAwesome.otf", size: 85908, mode: os.FileMode(420), modTime: time.Unix(1502760883, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -183,8 +180,8 @@ func staticFontsFontawesomeWebfontEot() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/fonts/fontawesome-webfont.eot", size: 56006, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xe5, 0x11, 0x89, 0x1d, 0x3e, 0x1, 0xb0, 0xb2, 0x7a, 0xed, 0x51, 0xa2, 0x19, 0xce, 0xd5, 0x11, 0x9e, 0x2c, 0x3d, 0x4, 0x60, 0x46, 0x5a, 0xf8, 0x24, 0x2e, 0x9b, 0xff, 0x4c, 0xb6, 0x1b, 0x77}} + info := bindataFileInfo{name: "static/fonts/fontawesome-webfont.eot", size: 56006, mode: os.FileMode(420), modTime: time.Unix(1502760883, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -203,8 +200,8 @@ func staticFontsFontawesomeWebfontSvg() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/fonts/fontawesome-webfont.svg", size: 287007, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xd5, 0xb5, 0x63, 0x6e, 0xbb, 0x2e, 0x12, 0x48, 0x10, 0x43, 0x62, 0x0, 0x8, 0x6b, 0x74, 0xa6, 0xd, 0xff, 0x9e, 0x8a, 0x8b, 0xe7, 0xf4, 0xa1, 0x8, 0x8b, 0xf5, 0xd3, 0x45, 0x8b, 0xc3, 0xc8}} + info := bindataFileInfo{name: "static/fonts/fontawesome-webfont.svg", size: 287007, mode: os.FileMode(420), modTime: time.Unix(1502760883, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -223,8 +220,8 @@ func staticFontsFontawesomeWebfontTtf() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/fonts/fontawesome-webfont.ttf", size: 112160, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x4d, 0x6e, 0xb9, 0xe9, 0xd8, 0x52, 0xa2, 0xa6, 0xf7, 0x4e, 0x7c, 0x42, 0x84, 0x56, 0xa2, 0xf0, 0x7f, 0xc6, 0x3a, 0x16, 0x13, 0xd1, 0x1, 0x92, 0xd8, 0xed, 0x34, 0x1, 0xd9, 0xda, 0x5f, 0xfa}} + info := bindataFileInfo{name: "static/fonts/fontawesome-webfont.ttf", size: 112160, mode: os.FileMode(420), modTime: time.Unix(1502760883, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -243,8 +240,8 @@ func staticFontsFontawesomeWebfontWoff() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/fonts/fontawesome-webfont.woff", size: 65452, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x19, 0x94, 0x11, 0xf6, 0x59, 0xf4, 0x1a, 0xac, 0xcb, 0x95, 0x9b, 0xac, 0xb1, 0xb0, 0xde, 0x30, 0xe5, 0x4f, 0x24, 0x43, 0x52, 0xa4, 0x8c, 0x6f, 0x98, 0x94, 0xe6, 0x5a, 0xe0, 0xf8, 0xa9, 0xa1}} + info := bindataFileInfo{name: "static/fonts/fontawesome-webfont.woff", size: 65452, mode: os.FileMode(420), modTime: time.Unix(1502760883, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -263,8 +260,8 @@ func staticImgIconIco() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/img/icon.ico", size: 104736, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xe9, 0xf0, 0xf1, 0xdd, 0x9b, 0xb0, 0xc0, 0xdc, 0x4, 0xb1, 0x63, 0x10, 0x28, 0x0, 0x39, 0xc9, 0x76, 0x8e, 0xfd, 0x37, 0x77, 0x94, 0x18, 0xc6, 0xcc, 0x1c, 0xb3, 0x9e, 0x8a, 0x4c, 0x81, 0x82}} + info := bindataFileInfo{name: "static/img/icon.ico", size: 104736, mode: os.FileMode(420), modTime: time.Unix(1502760883, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -283,8 +280,8 @@ func staticImgIconPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/img/icon.png", size: 7945, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x39, 0x37, 0xea, 0x6e, 0x72, 0xc7, 0x82, 0x3a, 0x90, 0x14, 0x40, 0x81, 0x62, 0xa4, 0xb, 0xa5, 0x2b, 0xf8, 0x1b, 0xa3, 0x7a, 0x5e, 0x87, 0xbd, 0x24, 0x1e, 0x69, 0x88, 0x51, 0xb3, 0x9d, 0xa4}} + info := bindataFileInfo{name: "static/img/icon.png", size: 7945, mode: os.FileMode(420), modTime: time.Unix(1502760883, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -303,8 +300,8 @@ func staticIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/index.html", size: 12713, mode: os.FileMode(0644), modTime: time.Unix(1548388025, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x9a, 0x47, 0x36, 0x52, 0x6f, 0xfa, 0x8f, 0x97, 0x61, 0x64, 0xf4, 0x84, 0x2d, 0x69, 0xc1, 0xc3, 0x92, 0x25, 0x50, 0x8, 0xd3, 0xe8, 0xbb, 0x1, 0xbc, 0xd2, 0x82, 0xed, 0xea, 0x5, 0xd4, 0xee}} + info := bindataFileInfo{name: "static/index.html", size: 12713, mode: os.FileMode(420), modTime: time.Unix(1548697670, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -323,8 +320,8 @@ func staticJsAcePgsqlJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/ace-pgsql.js", size: 53342, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x4e, 0x5d, 0x6a, 0x52, 0xd2, 0x68, 0x62, 0x20, 0x7c, 0xb, 0x94, 0x4a, 0x4d, 0xb, 0x7e, 0xb3, 0xdb, 0x71, 0x87, 0xda, 0xa0, 0xa1, 0xfa, 0xc3, 0xbc, 0xae, 0x80, 0xf9, 0x89, 0xce, 0x25, 0xf9}} + info := bindataFileInfo{name: "static/js/ace-pgsql.js", size: 53342, mode: os.FileMode(420), modTime: time.Unix(1544759791, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -343,8 +340,8 @@ func staticJsAceJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/ace.js", size: 327872, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xc7, 0xd9, 0xf6, 0xd5, 0x54, 0x74, 0x96, 0x5c, 0xa4, 0x23, 0xf9, 0xf7, 0x1b, 0x43, 0x3a, 0x8e, 0xb0, 0x74, 0x31, 0x55, 0xab, 0x58, 0xe0, 0x69, 0xf6, 0x47, 0xd4, 0x3d, 0x17, 0x20, 0x5f, 0x93}} + info := bindataFileInfo{name: "static/js/ace.js", size: 327872, mode: os.FileMode(420), modTime: time.Unix(1544759791, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -363,8 +360,8 @@ func staticJsAppJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/app.js", size: 37869, mode: os.FileMode(0644), modTime: time.Unix(1548387665, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf8, 0x33, 0x3, 0x71, 0x99, 0xf7, 0x8e, 0x2b, 0xce, 0xb8, 0x85, 0xf0, 0x45, 0x4, 0x14, 0xbb, 0x82, 0xfb, 0xdb, 0x21, 0xc3, 0xf, 0xba, 0x55, 0xff, 0x3, 0x56, 0xed, 0xb, 0xf0, 0x0, 0x2a}} + info := bindataFileInfo{name: "static/js/app.js", size: 37869, mode: os.FileMode(420), modTime: time.Unix(1548697670, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -383,8 +380,8 @@ func staticJsBase64Js() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/base64.js", size: 3517, mode: os.FileMode(0644), modTime: time.Unix(1548388021, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xea, 0xb5, 0x65, 0xce, 0x8e, 0x97, 0xd3, 0xea, 0xba, 0xce, 0xc9, 0x6c, 0xee, 0x24, 0x8c, 0x9d, 0xd1, 0x3b, 0x3e, 0x75, 0xa1, 0x61, 0xe6, 0xdb, 0xed, 0x9b, 0x7c, 0x2, 0x88, 0xc7, 0x74, 0xcd}} + info := bindataFileInfo{name: "static/js/base64.js", size: 3517, mode: os.FileMode(420), modTime: time.Unix(1548697670, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -403,8 +400,8 @@ func staticJsBootstrapContextmenuJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/bootstrap-contextmenu.js", size: 5300, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf2, 0x60, 0x1f, 0x8b, 0x44, 0x4c, 0x50, 0x52, 0x7f, 0x6b, 0xe4, 0x1c, 0xce, 0x22, 0xb7, 0x3, 0x7, 0xb0, 0x28, 0xe4, 0x8f, 0x8f, 0x87, 0xe3, 0x1a, 0x37, 0x41, 0xa6, 0xcc, 0xd9, 0x1e, 0x5a}} + info := bindataFileInfo{name: "static/js/bootstrap-contextmenu.js", size: 5300, mode: os.FileMode(420), modTime: time.Unix(1502760883, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -423,8 +420,8 @@ func staticJsBootstrap3TypeaheadMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/bootstrap3-typeahead.min.js", size: 9335, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x62, 0x1c, 0xd9, 0x22, 0xdd, 0xc5, 0x3d, 0x28, 0x77, 0x64, 0x36, 0x45, 0x94, 0xa9, 0xb9, 0xc0, 0x55, 0x13, 0xf1, 0x29, 0x8a, 0x93, 0x7f, 0xa, 0x44, 0x81, 0x68, 0xcf, 0xae, 0x67, 0x77, 0x17}} + info := bindataFileInfo{name: "static/js/bootstrap3-typeahead.min.js", size: 9335, mode: os.FileMode(420), modTime: time.Unix(1509762282, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -443,8 +440,8 @@ func staticJsJqueryJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/jquery.js", size: 84245, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x87, 0x47, 0x6, 0xb2, 0xb1, 0x31, 0x1a, 0x7, 0x19, 0xb5, 0x26, 0x7f, 0x7d, 0x1c, 0xf8, 0x3, 0x5, 0x7e, 0x36, 0x7e, 0x94, 0xae, 0x1f, 0xf7, 0xbf, 0x78, 0xc5, 0x45, 0xd, 0x30, 0xf5, 0xd4}} + info := bindataFileInfo{name: "static/js/jquery.js", size: 84245, mode: os.FileMode(420), modTime: time.Unix(1467073917, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -463,8 +460,8 @@ func staticJsThemeTomorrowJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/theme-tomorrow.js", size: 2556, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xaf, 0xb6, 0x90, 0x87, 0xbd, 0xf7, 0x90, 0x2f, 0xe8, 0x54, 0x22, 0x62, 0x13, 0x2, 0x71, 0x40, 0xd1, 0x54, 0x19, 0x8b, 0x8, 0x71, 0x82, 0xa6, 0x87, 0x5d, 0x14, 0x6b, 0xfb, 0x10, 0x41, 0x69}} + info := bindataFileInfo{name: "static/js/theme-tomorrow.js", size: 2556, mode: os.FileMode(420), modTime: time.Unix(1512708940, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -483,8 +480,8 @@ func staticJsUtilsJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/utils.js", size: 831, mode: os.FileMode(0644), modTime: time.Unix(1548387577, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x89, 0x40, 0x16, 0x6a, 0x65, 0xd3, 0x18, 0x6d, 0x52, 0x8f, 0x73, 0x15, 0xcb, 0x5d, 0x41, 0xb9, 0x8a, 0x8a, 0x47, 0x27, 0xe7, 0x5e, 0x25, 0xc7, 0x78, 0xa9, 0x1c, 0x62, 0x58, 0xbd, 0xcf, 0x49}} + info := bindataFileInfo{name: "static/js/utils.js", size: 831, mode: os.FileMode(420), modTime: time.Unix(1509582243, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -492,8 +489,8 @@ func staticJsUtilsJs() (*asset, error) { // It returns an error if the asset could not be found or // could not be loaded. func Asset(name string) ([]byte, error) { - canonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[canonicalName]; ok { + cannonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[cannonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) @@ -503,12 +500,6 @@ func Asset(name string) ([]byte, error) { return nil, fmt.Errorf("Asset %s not found", name) } -// AssetString returns the asset contents as a string (instead of a []byte). -func AssetString(name string) (string, error) { - data, err := Asset(name) - return string(data), err -} - // MustAsset is like Asset but panics when Asset would return an error. // It simplifies safe initialization of global variables. func MustAsset(name string) []byte { @@ -520,18 +511,12 @@ func MustAsset(name string) []byte { return a } -// MustAssetString is like AssetString but panics when Asset would return an -// error. It simplifies safe initialization of global variables. -func MustAssetString(name string) string { - return string(MustAsset(name)) -} - // 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. func AssetInfo(name string) (os.FileInfo, error) { - canonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[canonicalName]; ok { + cannonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[cannonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) @@ -541,33 +526,6 @@ func AssetInfo(name string) (os.FileInfo, error) { return nil, fmt.Errorf("AssetInfo %s not found", name) } -// AssetDigest returns the digest of the file with the given name. It returns an -// error if the asset could not be found or the digest could not be loaded. -func AssetDigest(name string) ([sha256.Size]byte, error) { - canonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[canonicalName]; ok { - a, err := f() - if err != nil { - return [sha256.Size]byte{}, fmt.Errorf("AssetDigest %s can't read by error: %v", name, err) - } - return a.digest, nil - } - return [sha256.Size]byte{}, fmt.Errorf("AssetDigest %s not found", name) -} - -// Digests returns a map of all known files and their checksums. -func Digests() (map[string][sha256.Size]byte, error) { - mp := make(map[string][sha256.Size]byte, len(_bindata)) - for name := range _bindata { - a, err := _bindata[name]() - if err != nil { - return nil, err - } - mp[name] = a.digest - } - return mp, nil -} - // AssetNames returns the names of the assets. func AssetNames() []string { names := make([]string, 0, len(_bindata)) @@ -579,45 +537,26 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "static/css/app.css": staticCssAppCss, - - "static/css/bootstrap.css": staticCssBootstrapCss, - - "static/css/font-awesome.css": staticCssFontAwesomeCss, - - "static/fonts/FontAwesome.otf": staticFontsFontawesomeOtf, - - "static/fonts/fontawesome-webfont.eot": staticFontsFontawesomeWebfontEot, - - "static/fonts/fontawesome-webfont.svg": staticFontsFontawesomeWebfontSvg, - - "static/fonts/fontawesome-webfont.ttf": staticFontsFontawesomeWebfontTtf, - + "static/css/app.css": staticCssAppCss, + "static/css/bootstrap.css": staticCssBootstrapCss, + "static/css/font-awesome.css": staticCssFontAwesomeCss, + "static/fonts/FontAwesome.otf": staticFontsFontawesomeOtf, + "static/fonts/fontawesome-webfont.eot": staticFontsFontawesomeWebfontEot, + "static/fonts/fontawesome-webfont.svg": staticFontsFontawesomeWebfontSvg, + "static/fonts/fontawesome-webfont.ttf": staticFontsFontawesomeWebfontTtf, "static/fonts/fontawesome-webfont.woff": staticFontsFontawesomeWebfontWoff, - - "static/img/icon.ico": staticImgIconIco, - - "static/img/icon.png": staticImgIconPng, - - "static/index.html": staticIndexHtml, - - "static/js/ace-pgsql.js": staticJsAcePgsqlJs, - - "static/js/ace.js": staticJsAceJs, - - "static/js/app.js": staticJsAppJs, - - "static/js/base64.js": staticJsBase64Js, - - "static/js/bootstrap-contextmenu.js": staticJsBootstrapContextmenuJs, - + "static/img/icon.ico": staticImgIconIco, + "static/img/icon.png": staticImgIconPng, + "static/index.html": staticIndexHtml, + "static/js/ace-pgsql.js": staticJsAcePgsqlJs, + "static/js/ace.js": staticJsAceJs, + "static/js/app.js": staticJsAppJs, + "static/js/base64.js": staticJsBase64Js, + "static/js/bootstrap-contextmenu.js": staticJsBootstrapContextmenuJs, "static/js/bootstrap3-typeahead.min.js": staticJsBootstrap3TypeaheadMinJs, - - "static/js/jquery.js": staticJsJqueryJs, - - "static/js/theme-tomorrow.js": staticJsThemeTomorrowJs, - - "static/js/utils.js": staticJsUtilsJs, + "static/js/jquery.js": staticJsJqueryJs, + "static/js/theme-tomorrow.js": staticJsThemeTomorrowJs, + "static/js/utils.js": staticJsUtilsJs, } // AssetDir returns the file names below a certain @@ -629,15 +568,15 @@ var _bindata = map[string]func() (*asset, error){ // img/ // a.png // b.png -// then AssetDir("data") would return []string{"foo.txt", "img"}, -// AssetDir("data/img") would return []string{"a.png", "b.png"}, -// AssetDir("foo.txt") and AssetDir("notexist") would return an error, and +// then AssetDir("data") would return []string{"foo.txt", "img"} +// 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 { - canonicalName := strings.Replace(name, "\\", "/", -1) - pathList := strings.Split(canonicalName, "/") + cannonicalName := strings.Replace(name, "\\", "/", -1) + pathList := strings.Split(cannonicalName, "/") for _, p := range pathList { node = node.Children[p] if node == nil { @@ -693,7 +632,7 @@ var _bintree = &bintree{nil, map[string]*bintree{ }}, }} -// RestoreAsset restores an asset under the given directory. +// RestoreAsset restores an asset under the given directory func RestoreAsset(dir, name string) error { data, err := Asset(name) if err != nil { @@ -711,10 +650,14 @@ func RestoreAsset(dir, name string) error { if err != nil { return err } - return os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) + err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) + if err != nil { + return err + } + return nil } -// RestoreAssets restores an asset under the given directory recursively. +// RestoreAssets restores an asset under the given directory recursively func RestoreAssets(dir, name string) error { children, err := AssetDir(name) // File @@ -732,6 +675,6 @@ func RestoreAssets(dir, name string) error { } func _filePath(dir, name string) string { - canonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(canonicalName, "/")...)...) + cannonicalName := strings.Replace(name, "\\", "/", -1) + return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) }