Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
9f883b458f
|
|||
1f456c5134
|
@@ -38,6 +38,13 @@ func (ee *ExErr) Error() string {
|
|||||||
// Unwrap must be implemented so that some error.XXX methods work
|
// Unwrap must be implemented so that some error.XXX methods work
|
||||||
func (ee *ExErr) Unwrap() error {
|
func (ee *ExErr) Unwrap() error {
|
||||||
if ee.OriginalError == nil {
|
if ee.OriginalError == nil {
|
||||||
|
|
||||||
|
if ee.WrappedErr != nil {
|
||||||
|
if werr, ok := ee.WrappedErr.(error); ok {
|
||||||
|
return werr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil // this is neccessary - otherwise we return a wrapped nil and the `x == nil` comparison fails (= panic in errors.Is and other failures)
|
return nil // this is neccessary - otherwise we return a wrapped nil and the `x == nil` comparison fails (= panic in errors.Is and other failures)
|
||||||
}
|
}
|
||||||
return ee.OriginalError
|
return ee.OriginalError
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package goext
|
package goext
|
||||||
|
|
||||||
const GoextVersion = "0.0.511"
|
const GoextVersion = "0.0.513"
|
||||||
|
|
||||||
const GoextVersionTimestamp = "2024-09-15T18:22:07+0200"
|
const GoextVersionTimestamp = "2024-09-16T15:27:32+0200"
|
||||||
|
@@ -788,7 +788,7 @@ FieldLoop:
|
|||||||
|
|
||||||
if f.omitEmpty && isEmptyValue(fv) {
|
if f.omitEmpty && isEmptyValue(fv) {
|
||||||
continue
|
continue
|
||||||
} else if opts.filter != nil && !matchesJSONFilter(f.jsonfilter, *opts.filter) {
|
} else if !matchesJSONFilter(f.jsonfilter, opts.filter) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
e.WriteByte(next)
|
e.WriteByte(next)
|
||||||
@@ -808,16 +808,20 @@ FieldLoop:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func matchesJSONFilter(filter jsonfilter, value string) bool {
|
func matchesJSONFilter(filter jsonfilter, value *string) bool {
|
||||||
if len(filter) == 0 {
|
if len(filter) == 0 {
|
||||||
return true
|
return true // no filter in struct
|
||||||
|
}
|
||||||
|
|
||||||
|
if value == nil || *value == "" {
|
||||||
|
return false // no filter set, but struct has filter, return false
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(filter) == 1 && filter[0] == "-" {
|
if len(filter) == 1 && filter[0] == "-" {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
if filter.Contains(value) {
|
if filter.Contains(*value) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user