mirror of
https://github.com/stashapp/stash.git
synced 2025-12-11 19:02:18 +01:00
45f700d6ea
* Upgrade gqlgen to v0.17.2 This enables builds on Go 1.18. github.com/vektah/gqlparser is upgraded to the newest version too. Getting this to work is a bit of a hazzle. I had to first remove vendoring from the repository, perform the upgrade and then re-introduce the vendor directory. I think gqlgens analysis went wrong for some reason on the upgrade. It would seem a clean-room installation fixed it. * Bump project to 1.18 * Update all packages, address gqlgenc breaking changes * Let `go mod tidy` handle the go.mod file * Upgrade linter to 1.45.2 * Introduce v1.45.2 of the linter The linter now correctly warns on `strings.Title` because it isn't unicode-aware. Fix this by using the suggested fix from x/text/cases to produce unicode-aware strings. The mapping isn't entirely 1-1 as this new approach has a larger iface: it spans all of unicode rather than just ASCII. It coincides for ASCII however, so things should be largely the same. * Ready ourselves for errchkjson and contextcheck. * Revert dockerfile golang version changes for now Co-authored-by: Kermie <kermie@isinthe.house> Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
277 lines
6.2 KiB
Go
277 lines
6.2 KiB
Go
package zerolog
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net"
|
|
"sort"
|
|
"time"
|
|
"unsafe"
|
|
)
|
|
|
|
func isNilValue(i interface{}) bool {
|
|
return (*[2]uintptr)(unsafe.Pointer(&i))[1] == 0
|
|
}
|
|
|
|
func appendFields(dst []byte, fields interface{}) []byte {
|
|
switch fields := fields.(type) {
|
|
case []interface{}:
|
|
if n := len(fields); n&0x1 == 1 { // odd number
|
|
fields = fields[:n-1]
|
|
}
|
|
dst = appendFieldList(dst, fields)
|
|
case map[string]interface{}:
|
|
keys := make([]string, 0, len(fields))
|
|
for key := range fields {
|
|
keys = append(keys, key)
|
|
}
|
|
sort.Strings(keys)
|
|
kv := make([]interface{}, 2)
|
|
for _, key := range keys {
|
|
kv[0], kv[1] = key, fields[key]
|
|
dst = appendFieldList(dst, kv)
|
|
}
|
|
}
|
|
return dst
|
|
}
|
|
|
|
func appendFieldList(dst []byte, kvList []interface{}) []byte {
|
|
for i, n := 0, len(kvList); i < n; i += 2 {
|
|
key, val := kvList[i], kvList[i+1]
|
|
if key, ok := key.(string); ok {
|
|
dst = enc.AppendKey(dst, key)
|
|
} else {
|
|
continue
|
|
}
|
|
if val, ok := val.(LogObjectMarshaler); ok {
|
|
e := newEvent(nil, 0)
|
|
e.buf = e.buf[:0]
|
|
e.appendObject(val)
|
|
dst = append(dst, e.buf...)
|
|
putEvent(e)
|
|
continue
|
|
}
|
|
switch val := val.(type) {
|
|
case string:
|
|
dst = enc.AppendString(dst, val)
|
|
case []byte:
|
|
dst = enc.AppendBytes(dst, val)
|
|
case error:
|
|
switch m := ErrorMarshalFunc(val).(type) {
|
|
case LogObjectMarshaler:
|
|
e := newEvent(nil, 0)
|
|
e.buf = e.buf[:0]
|
|
e.appendObject(m)
|
|
dst = append(dst, e.buf...)
|
|
putEvent(e)
|
|
case error:
|
|
if m == nil || isNilValue(m) {
|
|
dst = enc.AppendNil(dst)
|
|
} else {
|
|
dst = enc.AppendString(dst, m.Error())
|
|
}
|
|
case string:
|
|
dst = enc.AppendString(dst, m)
|
|
default:
|
|
dst = enc.AppendInterface(dst, m)
|
|
}
|
|
case []error:
|
|
dst = enc.AppendArrayStart(dst)
|
|
for i, err := range val {
|
|
switch m := ErrorMarshalFunc(err).(type) {
|
|
case LogObjectMarshaler:
|
|
e := newEvent(nil, 0)
|
|
e.buf = e.buf[:0]
|
|
e.appendObject(m)
|
|
dst = append(dst, e.buf...)
|
|
putEvent(e)
|
|
case error:
|
|
if m == nil || isNilValue(m) {
|
|
dst = enc.AppendNil(dst)
|
|
} else {
|
|
dst = enc.AppendString(dst, m.Error())
|
|
}
|
|
case string:
|
|
dst = enc.AppendString(dst, m)
|
|
default:
|
|
dst = enc.AppendInterface(dst, m)
|
|
}
|
|
|
|
if i < (len(val) - 1) {
|
|
enc.AppendArrayDelim(dst)
|
|
}
|
|
}
|
|
dst = enc.AppendArrayEnd(dst)
|
|
case bool:
|
|
dst = enc.AppendBool(dst, val)
|
|
case int:
|
|
dst = enc.AppendInt(dst, val)
|
|
case int8:
|
|
dst = enc.AppendInt8(dst, val)
|
|
case int16:
|
|
dst = enc.AppendInt16(dst, val)
|
|
case int32:
|
|
dst = enc.AppendInt32(dst, val)
|
|
case int64:
|
|
dst = enc.AppendInt64(dst, val)
|
|
case uint:
|
|
dst = enc.AppendUint(dst, val)
|
|
case uint8:
|
|
dst = enc.AppendUint8(dst, val)
|
|
case uint16:
|
|
dst = enc.AppendUint16(dst, val)
|
|
case uint32:
|
|
dst = enc.AppendUint32(dst, val)
|
|
case uint64:
|
|
dst = enc.AppendUint64(dst, val)
|
|
case float32:
|
|
dst = enc.AppendFloat32(dst, val)
|
|
case float64:
|
|
dst = enc.AppendFloat64(dst, val)
|
|
case time.Time:
|
|
dst = enc.AppendTime(dst, val, TimeFieldFormat)
|
|
case time.Duration:
|
|
dst = enc.AppendDuration(dst, val, DurationFieldUnit, DurationFieldInteger)
|
|
case *string:
|
|
if val != nil {
|
|
dst = enc.AppendString(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *bool:
|
|
if val != nil {
|
|
dst = enc.AppendBool(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *int:
|
|
if val != nil {
|
|
dst = enc.AppendInt(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *int8:
|
|
if val != nil {
|
|
dst = enc.AppendInt8(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *int16:
|
|
if val != nil {
|
|
dst = enc.AppendInt16(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *int32:
|
|
if val != nil {
|
|
dst = enc.AppendInt32(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *int64:
|
|
if val != nil {
|
|
dst = enc.AppendInt64(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *uint:
|
|
if val != nil {
|
|
dst = enc.AppendUint(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *uint8:
|
|
if val != nil {
|
|
dst = enc.AppendUint8(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *uint16:
|
|
if val != nil {
|
|
dst = enc.AppendUint16(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *uint32:
|
|
if val != nil {
|
|
dst = enc.AppendUint32(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *uint64:
|
|
if val != nil {
|
|
dst = enc.AppendUint64(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *float32:
|
|
if val != nil {
|
|
dst = enc.AppendFloat32(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *float64:
|
|
if val != nil {
|
|
dst = enc.AppendFloat64(dst, *val)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *time.Time:
|
|
if val != nil {
|
|
dst = enc.AppendTime(dst, *val, TimeFieldFormat)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case *time.Duration:
|
|
if val != nil {
|
|
dst = enc.AppendDuration(dst, *val, DurationFieldUnit, DurationFieldInteger)
|
|
} else {
|
|
dst = enc.AppendNil(dst)
|
|
}
|
|
case []string:
|
|
dst = enc.AppendStrings(dst, val)
|
|
case []bool:
|
|
dst = enc.AppendBools(dst, val)
|
|
case []int:
|
|
dst = enc.AppendInts(dst, val)
|
|
case []int8:
|
|
dst = enc.AppendInts8(dst, val)
|
|
case []int16:
|
|
dst = enc.AppendInts16(dst, val)
|
|
case []int32:
|
|
dst = enc.AppendInts32(dst, val)
|
|
case []int64:
|
|
dst = enc.AppendInts64(dst, val)
|
|
case []uint:
|
|
dst = enc.AppendUints(dst, val)
|
|
// case []uint8:
|
|
// dst = enc.AppendUints8(dst, val)
|
|
case []uint16:
|
|
dst = enc.AppendUints16(dst, val)
|
|
case []uint32:
|
|
dst = enc.AppendUints32(dst, val)
|
|
case []uint64:
|
|
dst = enc.AppendUints64(dst, val)
|
|
case []float32:
|
|
dst = enc.AppendFloats32(dst, val)
|
|
case []float64:
|
|
dst = enc.AppendFloats64(dst, val)
|
|
case []time.Time:
|
|
dst = enc.AppendTimes(dst, val, TimeFieldFormat)
|
|
case []time.Duration:
|
|
dst = enc.AppendDurations(dst, val, DurationFieldUnit, DurationFieldInteger)
|
|
case nil:
|
|
dst = enc.AppendNil(dst)
|
|
case net.IP:
|
|
dst = enc.AppendIPAddr(dst, val)
|
|
case net.IPNet:
|
|
dst = enc.AppendIPPrefix(dst, val)
|
|
case net.HardwareAddr:
|
|
dst = enc.AppendMACAddr(dst, val)
|
|
case json.RawMessage:
|
|
dst = appendJSON(dst, val)
|
|
default:
|
|
dst = enc.AppendInterface(dst, val)
|
|
}
|
|
}
|
|
return dst
|
|
}
|