@@ -13,7 +13,7 @@ require ( | |||
gitea.com/macaron/gzip v0.0.0-20191118033930-0c4c5566a0e5 | |||
gitea.com/macaron/i18n v0.0.0-20190822004228-474e714e2223 | |||
gitea.com/macaron/inject v0.0.0-20190805023432-d4c86e31027a | |||
gitea.com/macaron/macaron v1.3.3-0.20190821202302-9646c0587edb | |||
gitea.com/macaron/macaron v1.4.0 | |||
gitea.com/macaron/session v0.0.0-20190821211443-122c47c5f705 | |||
gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7 | |||
github.com/PuerkitoBio/goquery v1.5.0 | |||
@@ -88,7 +88,7 @@ require ( | |||
github.com/tecbot/gorocksdb v0.0.0-20181010114359-8752a9433481 // indirect | |||
github.com/tstranex/u2f v1.0.0 | |||
github.com/unknwon/cae v0.0.0-20190822084630-55a0b64484a1 | |||
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e | |||
github.com/unknwon/com v1.0.1 | |||
github.com/unknwon/i18n v0.0.0-20190805065654-5c6446a380b6 | |||
github.com/unknwon/paginater v0.0.0-20151104151617-7748a72e0141 | |||
github.com/urfave/cli v1.20.0 | |||
@@ -104,7 +104,7 @@ require ( | |||
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect | |||
gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 // indirect | |||
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df | |||
gopkg.in/ini.v1 v1.48.0 | |||
gopkg.in/ini.v1 v1.51.1 | |||
gopkg.in/ldap.v3 v3.0.2 | |||
gopkg.in/src-d/go-billy.v4 v4.3.2 | |||
gopkg.in/src-d/go-git.v4 v4.13.1 |
@@ -31,6 +31,8 @@ gitea.com/macaron/inject v0.0.0-20190805023432-d4c86e31027a/go.mod h1:h6E4kLao1Y | |||
gitea.com/macaron/macaron v1.3.3-0.20190803174002-53e005ff4827/go.mod h1:/rvxMjIkOq4BM8uPUb+VHuU02ZfAO6R4+wD//tiCiRw= | |||
gitea.com/macaron/macaron v1.3.3-0.20190821202302-9646c0587edb h1:amL0md6orTj1tXY16ANzVU9FmzQB+W7aJwp8pVDbrmA= | |||
gitea.com/macaron/macaron v1.3.3-0.20190821202302-9646c0587edb/go.mod h1:0coI+mSPSwbsyAbOuFllVS38awuk9mevhLD52l50Gjs= | |||
gitea.com/macaron/macaron v1.4.0 h1:FY1QDGqyuUzs21K6ChkbYbRUfwL7v2aUrhNEJ0IgsAw= | |||
gitea.com/macaron/macaron v1.4.0/go.mod h1:P7hfDbQjcW22lkYkXlxdRIfWOXxH2+K4EogN4Q0UlLY= | |||
gitea.com/macaron/session v0.0.0-20190821211443-122c47c5f705 h1:mvkQGAlON1Z6Y8pqa/+FpYIskk54mazuECUfZK5oTg0= | |||
gitea.com/macaron/session v0.0.0-20190821211443-122c47c5f705/go.mod h1:1ujH0jD6Ca4iK9NL0Q2a7fG2chvXx5hVa7hBfABwpkA= | |||
gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7 h1:N9QFoeNsUXLhl14mefLzGluqV7w2mGU3u+iZU+jCeWk= | |||
@@ -532,6 +534,8 @@ github.com/unknwon/cae v0.0.0-20190822084630-55a0b64484a1 h1:SpoCl3+Pta5/ubQyF+F | |||
github.com/unknwon/cae v0.0.0-20190822084630-55a0b64484a1/go.mod h1:QaSeRctcea9fK6piJpAMCCPKxzJ01+xFcr2k1m3WRPU= | |||
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e h1:GSGeB9EAKY2spCABz6xOX5DbxZEXolK+nBSvmsQwRjM= | |||
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= | |||
github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs= | |||
github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= | |||
github.com/unknwon/i18n v0.0.0-20190805065654-5c6446a380b6 h1:sRrkJEHtNoaSvyXMbRgofEOX4/3gMiraevQKJdIBhYE= | |||
github.com/unknwon/i18n v0.0.0-20190805065654-5c6446a380b6/go.mod h1:+5rDk6sDGpl3azws3O+f+GpFSyN9GVr0K8cvQLQM2ZQ= | |||
github.com/unknwon/paginater v0.0.0-20151104151617-7748a72e0141 h1:Z79lyIznnziKADUf0J7EP8Z4ZL7YJDiPuaazlfUBSy4= | |||
@@ -721,8 +725,8 @@ gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= | |||
gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= | |||
gopkg.in/ini.v1 v1.44.2/go.mod h1:M3Cogqpuv0QCi3ExAY5V4uOt4qb/R3xZubo9m8lK5wg= | |||
gopkg.in/ini.v1 v1.46.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= | |||
gopkg.in/ini.v1 v1.48.0 h1:URjZc+8ugRY5mL5uUeQH/a63JcHwdX9xZaWvmNWD7z8= | |||
gopkg.in/ini.v1 v1.48.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= | |||
gopkg.in/ini.v1 v1.51.1 h1:GyboHr4UqMiLUybYjd22ZjQIKEJEpgtLXtuGbR21Oho= | |||
gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= | |||
gopkg.in/ldap.v3 v3.0.2 h1:R6RBtabK6e1GO0eQKtkyOFbAHO73QesLzI2w2DZ6b9w= | |||
gopkg.in/ldap.v3 v3.0.2/go.mod h1:oxD7NyBuxchC+SgJDE1Q5Od05eGt29SDQVBmV+HYbzw= | |||
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= |
@@ -3,9 +3,10 @@ module gitea.com/macaron/macaron | |||
go 1.11 | |||
require ( | |||
gitea.com/macaron/inject v0.0.0-20190803172902-8375ba841591 | |||
gitea.com/macaron/inject v0.0.0-20190805023432-d4c86e31027a | |||
github.com/smartystreets/assertions v1.0.1 // indirect | |||
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 | |||
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e | |||
github.com/unknwon/com v1.0.1 | |||
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 | |||
gopkg.in/ini.v1 v1.44.0 | |||
) |
@@ -1,19 +1,23 @@ | |||
gitea.com/macaron/inject v0.0.0-20190803172902-8375ba841591 h1:UbCTjPcLrNxR9LzKDjQBMT2zoxZuEnca1pZCpgeMuhQ= | |||
gitea.com/macaron/inject v0.0.0-20190803172902-8375ba841591/go.mod h1:h6E4kLao1Yko6DOU6QDnQPcuoNzvbZqzj2mtPcEn1aM= | |||
gitea.com/macaron/inject v0.0.0-20190805023432-d4c86e31027a h1:aOKEXkDTnh4euoH0so/THLXeHtQuqHmDPb1xEk6Ehok= | |||
gitea.com/macaron/inject v0.0.0-20190805023432-d4c86e31027a/go.mod h1:h6E4kLao1Yko6DOU6QDnQPcuoNzvbZqzj2mtPcEn1aM= | |||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= | |||
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= | |||
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= | |||
github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE= | |||
github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= | |||
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= | |||
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= | |||
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= | |||
github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY= | |||
github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= | |||
github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w= | |||
github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= | |||
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w= | |||
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= | |||
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8= | |||
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= | |||
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e h1:GSGeB9EAKY2spCABz6xOX5DbxZEXolK+nBSvmsQwRjM= | |||
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= | |||
github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs= | |||
github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= | |||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | |||
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= | |||
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= |
@@ -1,5 +1,3 @@ | |||
// +build go1.3 | |||
// Copyright 2014 The Macaron Authors | |||
// | |||
// Licensed under the Apache License, Version 2.0 (the "License"): you may | |||
@@ -283,6 +281,7 @@ var ( | |||
envLock sync.Mutex | |||
// Path of work directory. | |||
// You must set this value yourself | |||
Root string | |||
// Flash applies to current request. | |||
@@ -310,12 +309,6 @@ func safeEnv() string { | |||
func init() { | |||
setENV(os.Getenv("MACARON_ENV")) | |||
var err error | |||
Root, err = os.Getwd() | |||
if err != nil { | |||
panic("error getting work directory: " + err.Error()) | |||
} | |||
} | |||
// SetConfig sets data sources for configuration. |
@@ -8,6 +8,7 @@ go: | |||
- 1.10.x | |||
- 1.11.x | |||
- 1.12.x | |||
- 1.13.x | |||
install: skip | |||
script: |
@@ -1,5 +1,6 @@ | |||
INI [![Build Status](https://travis-ci.org/go-ini/ini.svg?branch=master)](https://travis-ci.org/go-ini/ini) [![Sourcegraph](https://img.shields.io/badge/view%20on-Sourcegraph-brightgreen.svg)](https://sourcegraph.com/github.com/go-ini/ini) | |||
=== | |||
# INI | |||
[![Build Status](https://img.shields.io/travis/go-ini/ini/master.svg?style=for-the-badge&logo=travis)](https://travis-ci.org/go-ini/ini) [![Sourcegraph](https://img.shields.io/badge/view%20on-Sourcegraph-brightgreen.svg?style=for-the-badge&logo=sourcegraph)](https://sourcegraph.com/github.com/go-ini/ini) | |||
![](https://avatars0.githubusercontent.com/u/10216035?v=3&s=200) | |||
@@ -29,7 +29,7 @@ const ( | |||
// Maximum allowed depth when recursively substituing variable names. | |||
depthValues = 99 | |||
version = "1.48.0" | |||
version = "1.51.1" | |||
) | |||
// Version returns current package version literal. | |||
@@ -111,8 +111,15 @@ type LoadOptions struct { | |||
KeyValueDelimiters string | |||
// PreserveSurroundedQuote indicates whether to preserve surrounded quote (single and double quotes). | |||
PreserveSurroundedQuote bool | |||
// DebugFunc is called to collect debug information (currently only useful to debug parsing Python-style multiline values). | |||
DebugFunc DebugFunc | |||
// ReaderBufferSize is the buffer size of the reader in bytes. | |||
ReaderBufferSize int | |||
} | |||
// DebugFunc is the type of function called to log parse events. | |||
type DebugFunc func(message string) | |||
// LoadSources allows caller to apply customized options for loading from data source(s). | |||
func LoadSources(opts LoadOptions, source interface{}, others ...interface{}) (_ *File, err error) { | |||
sources := make([]dataSource, len(others)+1) |
@@ -147,10 +147,15 @@ func (k *Key) transformValue(val string) string { | |||
noption := vr[2 : len(vr)-2] | |||
// Search in the same section. | |||
// If not found or found the key itself, then search again in default section. | |||
nk, err := k.s.GetKey(noption) | |||
if err != nil || k == nk { | |||
// Search again in default section. | |||
nk, _ = k.s.f.Section("").GetKey(noption) | |||
if nk == nil { | |||
// Stop when no results found in the default section, | |||
// and returns the value as-is. | |||
break | |||
} | |||
} | |||
// Substitute by new value and take off leading '%(' and trailing ')s'. |
@@ -25,7 +25,9 @@ import ( | |||
"unicode" | |||
) | |||
var pythonMultiline = regexp.MustCompile("^(\\s+)([^\n]+)") | |||
const minReaderBufferSize = 4096 | |||
var pythonMultiline = regexp.MustCompile(`^([\t\f ]+)(.*)`) | |||
type parserOptions struct { | |||
IgnoreContinuation bool | |||
@@ -35,6 +37,8 @@ type parserOptions struct { | |||
UnescapeValueDoubleQuotes bool | |||
UnescapeValueCommentSymbols bool | |||
PreserveSurroundedQuote bool | |||
DebugFunc DebugFunc | |||
ReaderBufferSize int | |||
} | |||
type parser struct { | |||
@@ -46,9 +50,20 @@ type parser struct { | |||
comment *bytes.Buffer | |||
} | |||
func (p *parser) debug(format string, args ...interface{}) { | |||
if p.options.DebugFunc != nil { | |||
p.options.DebugFunc(fmt.Sprintf(format, args...)) | |||
} | |||
} | |||
func newParser(r io.Reader, opts parserOptions) *parser { | |||
size := opts.ReaderBufferSize | |||
if size < minReaderBufferSize { | |||
size = minReaderBufferSize | |||
} | |||
return &parser{ | |||
buf: bufio.NewReader(r), | |||
buf: bufio.NewReaderSize(r, size), | |||
options: opts, | |||
count: 1, | |||
comment: &bytes.Buffer{}, | |||
@@ -285,33 +300,55 @@ func (p *parser) readPythonMultilines(line string, bufferSize int) (string, erro | |||
parserBufferPeekResult, _ := p.buf.Peek(bufferSize) | |||
peekBuffer := bytes.NewBuffer(parserBufferPeekResult) | |||
indentSize := 0 | |||
for { | |||
peekData, peekErr := peekBuffer.ReadBytes('\n') | |||
if peekErr != nil { | |||
if peekErr == io.EOF { | |||
p.debug("readPythonMultilines: io.EOF, peekData: %q, line: %q", string(peekData), line) | |||
return line, nil | |||
} | |||
p.debug("readPythonMultilines: failed to peek with error: %v", peekErr) | |||
return "", peekErr | |||
} | |||
p.debug("readPythonMultilines: parsing %q", string(peekData)) | |||
peekMatches := pythonMultiline.FindStringSubmatch(string(peekData)) | |||
p.debug("readPythonMultilines: matched %d parts", len(peekMatches)) | |||
for n, v := range peekMatches { | |||
p.debug(" %d: %q", n, v) | |||
} | |||
// Return if not a Python multiline value. | |||
if len(peekMatches) != 3 { | |||
p.debug("readPythonMultilines: end of value, got: %q", line) | |||
return line, nil | |||
} | |||
// NOTE: Return if not a python-ini multi-line value. | |||
currentIdentSize := len(peekMatches[1]) | |||
if currentIdentSize <= 0 { | |||
// Determine indent size and line prefix. | |||
currentIndentSize := len(peekMatches[1]) | |||
if indentSize < 1 { | |||
indentSize = currentIndentSize | |||
p.debug("readPythonMultilines: indent size is %d", indentSize) | |||
} | |||
// Make sure each line is indented at least as far as first line. | |||
if currentIndentSize < indentSize { | |||
p.debug("readPythonMultilines: end of value, current indent: %d, expected indent: %d, line: %q", currentIndentSize, indentSize, line) | |||
return line, nil | |||
} | |||
// NOTE: Just advance the parser reader (buffer) in-sync with the peek buffer. | |||
_, err := p.readUntil('\n') | |||
// Advance the parser reader (buffer) in-sync with the peek buffer. | |||
_, err := p.buf.Discard(len(peekData)) | |||
if err != nil { | |||
p.debug("readPythonMultilines: failed to skip to the end, returning error") | |||
return "", err | |||
} | |||
line += fmt.Sprintf("\n%s", peekMatches[2]) | |||
// Handle indented empty line. | |||
line += "\n" + peekMatches[1][indentSize:] + peekMatches[2] | |||
} | |||
} | |||
@@ -325,6 +362,8 @@ func (f *File) parse(reader io.Reader) (err error) { | |||
UnescapeValueDoubleQuotes: f.options.UnescapeValueDoubleQuotes, | |||
UnescapeValueCommentSymbols: f.options.UnescapeValueCommentSymbols, | |||
PreserveSurroundedQuote: f.options.PreserveSurroundedQuote, | |||
DebugFunc: f.options.DebugFunc, | |||
ReaderBufferSize: f.options.ReaderBufferSize, | |||
}) | |||
if err = p.BOM(); err != nil { | |||
return fmt.Errorf("BOM: %v", err) | |||
@@ -348,8 +387,8 @@ func (f *File) parse(reader io.Reader) (err error) { | |||
// the size of the parser buffer is found. | |||
// TODO(unknwon): When Golang 1.10 is the lowest version supported, replace with `parserBufferSize := p.buf.Size()`. | |||
parserBufferSize := 0 | |||
// NOTE: Peek 1kb at a time. | |||
currentPeekSize := 1024 | |||
// NOTE: Peek 4kb at a time. | |||
currentPeekSize := minReaderBufferSize | |||
if f.options.AllowPythonMultilineValues { | |||
for { |
@@ -155,23 +155,45 @@ func wrapStrictError(err error, isStrict bool) error { | |||
// but it does not return error for failing parsing, | |||
// because we want to use default value that is already assigned to struct. | |||
func setWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string, allowShadow, isStrict bool) error { | |||
switch t.Kind() { | |||
vt := t | |||
isPtr := t.Kind() == reflect.Ptr | |||
if isPtr { | |||
vt = t.Elem() | |||
} | |||
switch vt.Kind() { | |||
case reflect.String: | |||
if len(key.String()) == 0 { | |||
return nil | |||
stringVal := key.String() | |||
if isPtr { | |||
field.Set(reflect.ValueOf(&stringVal)) | |||
} else if len(stringVal) > 0 { | |||
field.SetString(key.String()) | |||
} | |||
field.SetString(key.String()) | |||
case reflect.Bool: | |||
boolVal, err := key.Bool() | |||
if err != nil { | |||
return wrapStrictError(err, isStrict) | |||
} | |||
field.SetBool(boolVal) | |||
if isPtr { | |||
field.Set(reflect.ValueOf(&boolVal)) | |||
} else { | |||
field.SetBool(boolVal) | |||
} | |||
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: | |||
durationVal, err := key.Duration() | |||
// Skip zero value | |||
if err == nil && int64(durationVal) > 0 { | |||
field.Set(reflect.ValueOf(durationVal)) | |||
// ParseDuration will not return err for `0`, so check the type name | |||
if vt.Name() == "Duration" { | |||
durationVal, err := key.Duration() | |||
if err != nil { | |||
if intVal, err := key.Int64(); err == nil { | |||
field.SetInt(intVal) | |||
return nil | |||
} | |||
return wrapStrictError(err, isStrict) | |||
} | |||
if isPtr { | |||
field.Set(reflect.ValueOf(&durationVal)) | |||
} else if int64(durationVal) > 0 { | |||
field.Set(reflect.ValueOf(durationVal)) | |||
} | |||
return nil | |||
} | |||
@@ -179,13 +201,23 @@ func setWithProperType(t reflect.Type, key *Key, field reflect.Value, delim stri | |||
if err != nil { | |||
return wrapStrictError(err, isStrict) | |||
} | |||
field.SetInt(intVal) | |||
if isPtr { | |||
pv := reflect.New(t.Elem()) | |||
pv.Elem().SetInt(intVal) | |||
field.Set(pv) | |||
} else { | |||
field.SetInt(intVal) | |||
} | |||
// byte is an alias for uint8, so supporting uint8 breaks support for byte | |||
case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64: | |||
durationVal, err := key.Duration() | |||
// Skip zero value | |||
if err == nil && uint64(durationVal) > 0 { | |||
field.Set(reflect.ValueOf(durationVal)) | |||
if isPtr { | |||
field.Set(reflect.ValueOf(&durationVal)) | |||
} else { | |||
field.Set(reflect.ValueOf(durationVal)) | |||
} | |||
return nil | |||
} | |||
@@ -193,33 +225,38 @@ func setWithProperType(t reflect.Type, key *Key, field reflect.Value, delim stri | |||
if err != nil { | |||
return wrapStrictError(err, isStrict) | |||
} | |||
field.SetUint(uintVal) | |||
if isPtr { | |||
pv := reflect.New(t.Elem()) | |||
pv.Elem().SetUint(uintVal) | |||
field.Set(pv) | |||
} else { | |||
field.SetUint(uintVal) | |||
} | |||
case reflect.Float32, reflect.Float64: | |||
floatVal, err := key.Float64() | |||
if err != nil { | |||
return wrapStrictError(err, isStrict) | |||
} | |||
field.SetFloat(floatVal) | |||
if isPtr { | |||
pv := reflect.New(t.Elem()) | |||
pv.Elem().SetFloat(floatVal) | |||
field.Set(pv) | |||
} else { | |||
field.SetFloat(floatVal) | |||
} | |||
case reflectTime: | |||
timeVal, err := key.Time() | |||
if err != nil { | |||
return wrapStrictError(err, isStrict) | |||
} | |||
field.Set(reflect.ValueOf(timeVal)) | |||
if isPtr { | |||
field.Set(reflect.ValueOf(&timeVal)) | |||
} else { | |||
field.Set(reflect.ValueOf(timeVal)) | |||
} | |||
case reflect.Slice: | |||
return setSliceWithProperType(key, field, delim, allowShadow, isStrict) | |||
case reflect.Ptr: | |||
switch t.Elem().Kind() { | |||
case reflect.Bool: | |||
boolVal, err := key.Bool() | |||
if err != nil { | |||
return wrapStrictError(err, isStrict) | |||
} | |||
field.Set(reflect.ValueOf(&boolVal)) | |||
default: | |||
return fmt.Errorf("unsupported type '%s'", t) | |||
} | |||
default: | |||
return fmt.Errorf("unsupported type '%s'", t) | |||
} | |||
@@ -280,7 +317,6 @@ func (s *Section) mapTo(val reflect.Value, isStrict bool) error { | |||
continue | |||
} | |||
} | |||
if key, err := s.GetKey(fieldName); err == nil { | |||
delim := parseDelim(tpField.Tag.Get("delim")) | |||
if err = setWithProperType(tpField.Type, key, field, delim, allowShadow, isStrict); err != nil { |
@@ -20,7 +20,7 @@ gitea.com/macaron/gzip | |||
gitea.com/macaron/i18n | |||
# gitea.com/macaron/inject v0.0.0-20190805023432-d4c86e31027a | |||
gitea.com/macaron/inject | |||
# gitea.com/macaron/macaron v1.3.3-0.20190821202302-9646c0587edb | |||
# gitea.com/macaron/macaron v1.4.0 | |||
gitea.com/macaron/macaron | |||
# gitea.com/macaron/session v0.0.0-20190821211443-122c47c5f705 | |||
gitea.com/macaron/session | |||
@@ -414,7 +414,7 @@ github.com/tstranex/u2f | |||
# github.com/unknwon/cae v0.0.0-20190822084630-55a0b64484a1 | |||
github.com/unknwon/cae | |||
github.com/unknwon/cae/zip | |||
# github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e | |||
# github.com/unknwon/com v1.0.1 | |||
github.com/unknwon/com | |||
# github.com/unknwon/i18n v0.0.0-20190805065654-5c6446a380b6 | |||
github.com/unknwon/i18n | |||
@@ -547,7 +547,7 @@ gopkg.in/alexcesaro/quotedprintable.v3 | |||
gopkg.in/asn1-ber.v1 | |||
# gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df | |||
gopkg.in/gomail.v2 | |||
# gopkg.in/ini.v1 v1.48.0 | |||
# gopkg.in/ini.v1 v1.51.1 | |||
gopkg.in/ini.v1 | |||
# gopkg.in/ldap.v3 v3.0.2 | |||
gopkg.in/ldap.v3 |