Compare commits
35 Commits
Author | SHA1 | Date | |
---|---|---|---|
bdb181cb3a
|
|||
3552acd38b
|
|||
c42324c58f
|
|||
3a9c3f4e9e
|
|||
becd8f1ebc
|
|||
e733f30c38
|
|||
1a9e5c70fc
|
|||
f3700a772d
|
|||
2c69b33547
|
|||
6a304b875a
|
|||
d12bf23b46
|
|||
52f7f6e690
|
|||
b1e3891256
|
|||
bdf5b53c20
|
|||
496c4e4f59
|
|||
deab986caf
|
|||
9d9a6f1c6e
|
|||
06a37f37b7
|
|||
b35d6ca0b0
|
|||
b643bded8a
|
|||
93be4f9fdd
|
|||
85b6d17df0
|
|||
c7924cd9ff
|
|||
07712aa08c
|
|||
f5243503db
|
|||
21ae9c70d2
|
|||
c223e2f0fa
|
|||
a694f36f46
|
|||
e61682b24c
|
|||
5dc9e98f6b
|
|||
4dd1c08e77
|
|||
c9e459edac
|
|||
3717eeb515
|
|||
0eaeb5ac4f
|
|||
c921e542eb
|
9
Makefile
Normal file
9
Makefile
Normal file
@@ -0,0 +1,9 @@
|
||||
|
||||
run:
|
||||
echo "This is a library - can't be run" && false
|
||||
|
||||
test:
|
||||
go test ./...
|
||||
|
||||
version:
|
||||
_data/version.sh
|
@@ -3,5 +3,6 @@ BFB goext library
|
||||
|
||||
A collection of general & useful library methods
|
||||
|
||||
Every subfolder is a seperate dependency and can be imported individually
|
||||
This should not have any heavy dependencies (gin, mongo, etc) and add missing basic language features...
|
||||
|
||||
Potentially needs `export GOPRIVATE="gogs.mikescher.com"`
|
27
_data/version.sh
Executable file
27
_data/version.sh
Executable file
@@ -0,0 +1,27 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -o nounset # disallow usage of unset vars ( set -u )
|
||||
set -o errexit # Exit immediately if a pipeline returns non-zero. ( set -e )
|
||||
set -o errtrace # Allow the above trap be inherited by all functions in the script. ( set -E )
|
||||
set -o pipefail # Return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
|
||||
IFS=$'\n\t' # Set $IFS to only newline and tab.
|
||||
|
||||
|
||||
curr_vers=$(git describe --tags --abbrev=0 | sed 's/v//g')
|
||||
|
||||
next_ver=$(echo "$curr_vers" | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{if(length($NF+1)>length($NF))$(NF-1)++; $NF=sprintf("%0*d", length($NF), ($NF+1)%(10^length($NF))); print}')
|
||||
|
||||
echo ""
|
||||
echo "> Current Version: ${curr_vers}"
|
||||
echo "> Next Version: ${next_ver}"
|
||||
echo ""
|
||||
|
||||
git add --verbose .
|
||||
|
||||
git commit -a -m "v${next_ver}"
|
||||
|
||||
git tag "v${next_ver}"
|
||||
|
||||
git push
|
||||
git push --tags
|
||||
|
136
confext/confParser.go
Normal file
136
confext/confParser.go
Normal file
@@ -0,0 +1,136 @@
|
||||
package confext
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/timeext"
|
||||
"math/bits"
|
||||
"os"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
// ApplyEnvOverrides overrides field values from environment variables
|
||||
//
|
||||
// fields must be tagged with `env:"env_key"`
|
||||
func ApplyEnvOverrides[T any](c *T) error {
|
||||
|
||||
rval := reflect.ValueOf(c).Elem()
|
||||
rtyp := rval.Type()
|
||||
|
||||
for i := 0; i < rtyp.NumField(); i++ {
|
||||
|
||||
rsfield := rtyp.Field(i)
|
||||
rvfield := rval.Field(i)
|
||||
|
||||
envkey := rsfield.Tag.Get("env")
|
||||
if envkey == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
envval, efound := os.LookupEnv(envkey)
|
||||
if !efound {
|
||||
continue
|
||||
}
|
||||
|
||||
if rvfield.Type() == reflect.TypeOf("") {
|
||||
|
||||
rvfield.Set(reflect.ValueOf(envval))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, envval)
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(int(0)) {
|
||||
|
||||
envint, err := strconv.ParseInt(envval, 10, bits.UintSize)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int (value := '%s')", envkey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(int(envint)))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, envval)
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(int64(0)) {
|
||||
|
||||
envint, err := strconv.ParseInt(envval, 10, 64)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int64 (value := '%s')", envkey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(int64(envint)))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, envval)
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(int32(0)) {
|
||||
|
||||
envint, err := strconv.ParseInt(envval, 10, 32)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int32 (value := '%s')", envkey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(int32(envint)))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, envval)
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(int8(0)) {
|
||||
|
||||
envint, err := strconv.ParseInt(envval, 10, 8)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int32 (value := '%s')", envkey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(int8(envint)))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, envval)
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(time.Duration(0)) {
|
||||
|
||||
dur, err := timeext.ParseDurationShortString(envval)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to duration (value := '%s')", envkey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(dur))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, dur.String())
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(time.UnixMilli(0)) {
|
||||
|
||||
tim, err := time.Parse(time.RFC3339Nano, envval)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to time.time (value := '%s')", envkey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(tim))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, tim.String())
|
||||
|
||||
} else if rvfield.Type().ConvertibleTo(reflect.TypeOf(int(0))) {
|
||||
|
||||
envint, err := strconv.ParseInt(envval, 10, 8)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to <%s, ,int> (value := '%s')", rvfield.Type().Name(), envkey, envval))
|
||||
}
|
||||
|
||||
envcvl := reflect.ValueOf(envint).Convert(rvfield.Type())
|
||||
|
||||
rvfield.Set(envcvl)
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%v'\n", envkey, envcvl.Interface())
|
||||
|
||||
} else if rvfield.Type().ConvertibleTo(reflect.TypeOf("")) {
|
||||
|
||||
envcvl := reflect.ValueOf(envval).Convert(rvfield.Type())
|
||||
|
||||
rvfield.Set(envcvl)
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%v'\n", envkey, envcvl.Interface())
|
||||
|
||||
} else {
|
||||
return errors.New(fmt.Sprintf("Unknown kind/type in config: [ %s | %s ]", rvfield.Kind().String(), rvfield.Type().String()))
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
116
confext/confParser_test.go
Normal file
116
confext/confParser_test.go
Normal file
@@ -0,0 +1,116 @@
|
||||
package confext
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestApplyEnvOverridesNoop(t *testing.T) {
|
||||
|
||||
type aliasint int
|
||||
type aliasstring string
|
||||
|
||||
type testdata struct {
|
||||
V1 int `env:"TEST_V1"`
|
||||
VX string ``
|
||||
V2 string `env:"TEST_V2"`
|
||||
V3 int8 `env:"TEST_V3"`
|
||||
V4 int32 `env:"TEST_V4"`
|
||||
V5 int64 `env:"TEST_V5"`
|
||||
V6 aliasint `env:"TEST_V6"`
|
||||
VY aliasint ``
|
||||
V7 aliasstring `env:"TEST_V7"`
|
||||
V8 time.Duration `env:"TEST_V8"`
|
||||
V9 time.Time `env:"TEST_V9"`
|
||||
}
|
||||
|
||||
input := testdata{
|
||||
V1: 1,
|
||||
VX: "X",
|
||||
V2: "2",
|
||||
V3: 3,
|
||||
V4: 4,
|
||||
V5: 5,
|
||||
V6: 6,
|
||||
VY: 99,
|
||||
V7: "7",
|
||||
V8: 9,
|
||||
V9: time.Unix(1671102873, 0),
|
||||
}
|
||||
|
||||
output := input
|
||||
|
||||
err := ApplyEnvOverrides(&output)
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
t.FailNow()
|
||||
}
|
||||
|
||||
assertEqual(t, input, output)
|
||||
}
|
||||
|
||||
func TestApplyEnvOverridesSimple(t *testing.T) {
|
||||
|
||||
type aliasint int
|
||||
type aliasstring string
|
||||
|
||||
type testdata struct {
|
||||
V1 int `env:"TEST_V1"`
|
||||
VX string ``
|
||||
V2 string `env:"TEST_V2"`
|
||||
V3 int8 `env:"TEST_V3"`
|
||||
V4 int32 `env:"TEST_V4"`
|
||||
V5 int64 `env:"TEST_V5"`
|
||||
V6 aliasint `env:"TEST_V6"`
|
||||
VY aliasint ``
|
||||
V7 aliasstring `env:"TEST_V7"`
|
||||
V8 time.Duration `env:"TEST_V8"`
|
||||
V9 time.Time `env:"TEST_V9"`
|
||||
}
|
||||
|
||||
data := testdata{
|
||||
V1: 1,
|
||||
VX: "X",
|
||||
V2: "2",
|
||||
V3: 3,
|
||||
V4: 4,
|
||||
V5: 5,
|
||||
V6: 6,
|
||||
VY: 99,
|
||||
V7: "7",
|
||||
V8: 9,
|
||||
V9: time.Unix(1671102873, 0),
|
||||
}
|
||||
|
||||
t.Setenv("TEST_V1", "846")
|
||||
t.Setenv("TEST_V2", "hello_world")
|
||||
t.Setenv("TEST_V3", "6")
|
||||
t.Setenv("TEST_V4", "333")
|
||||
t.Setenv("TEST_V5", "-937")
|
||||
t.Setenv("TEST_V6", "070")
|
||||
t.Setenv("TEST_V7", "AAAAAA")
|
||||
t.Setenv("TEST_V8", "1min4s")
|
||||
t.Setenv("TEST_V9", "2009-11-10T23:00:00Z")
|
||||
|
||||
err := ApplyEnvOverrides(&data)
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
t.FailNow()
|
||||
}
|
||||
|
||||
assertEqual(t, data.V1, 846)
|
||||
assertEqual(t, data.V2, "hello_world")
|
||||
assertEqual(t, data.V3, 6)
|
||||
assertEqual(t, data.V4, 333)
|
||||
assertEqual(t, data.V5, -937)
|
||||
assertEqual(t, data.V6, 70)
|
||||
assertEqual(t, data.V7, "AAAAAA")
|
||||
assertEqual(t, data.V8, time.Second*64)
|
||||
assertEqual(t, data.V9, time.Unix(1257894000, 0).UTC())
|
||||
}
|
||||
|
||||
func assertEqual[T comparable](t *testing.T, actual T, expected T) {
|
||||
if actual != expected {
|
||||
t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected)
|
||||
}
|
||||
}
|
@@ -1,56 +1,157 @@
|
||||
package dataext
|
||||
|
||||
import "io"
|
||||
import (
|
||||
"errors"
|
||||
"io"
|
||||
)
|
||||
|
||||
type brcMode int
|
||||
|
||||
const (
|
||||
modeSourceReading = 0
|
||||
modeSourceFinished = 1
|
||||
modeBufferReading = 2
|
||||
modeBufferFinished = 3
|
||||
)
|
||||
|
||||
type BufferedReadCloser interface {
|
||||
io.ReadCloser
|
||||
BufferedAll() ([]byte, error)
|
||||
Reset() error
|
||||
}
|
||||
|
||||
type bufferedReadCloser struct {
|
||||
buffer []byte
|
||||
inner io.ReadCloser
|
||||
finished bool
|
||||
}
|
||||
|
||||
func (b *bufferedReadCloser) Read(p []byte) (int, error) {
|
||||
|
||||
n, err := b.inner.Read(p)
|
||||
if n > 0 {
|
||||
b.buffer = append(b.buffer, p[0:n]...)
|
||||
}
|
||||
|
||||
if err == io.EOF {
|
||||
b.finished = true
|
||||
}
|
||||
|
||||
return n, err
|
||||
mode brcMode
|
||||
off int
|
||||
}
|
||||
|
||||
func NewBufferedReadCloser(sub io.ReadCloser) BufferedReadCloser {
|
||||
return &bufferedReadCloser{
|
||||
buffer: make([]byte, 0, 1024),
|
||||
inner: sub,
|
||||
finished: false,
|
||||
mode: modeSourceReading,
|
||||
off: 0,
|
||||
}
|
||||
}
|
||||
|
||||
func (b *bufferedReadCloser) Read(p []byte) (int, error) {
|
||||
switch b.mode {
|
||||
case modeSourceReading:
|
||||
n, err := b.inner.Read(p)
|
||||
if n > 0 {
|
||||
b.buffer = append(b.buffer, p[0:n]...)
|
||||
}
|
||||
|
||||
if err == io.EOF {
|
||||
b.mode = modeSourceFinished
|
||||
}
|
||||
|
||||
return n, err
|
||||
|
||||
case modeSourceFinished:
|
||||
return 0, io.EOF
|
||||
|
||||
case modeBufferReading:
|
||||
|
||||
if len(b.buffer) <= b.off {
|
||||
b.mode = modeBufferFinished
|
||||
if len(p) == 0 {
|
||||
return 0, nil
|
||||
}
|
||||
return 0, io.EOF
|
||||
}
|
||||
|
||||
n := copy(p, b.buffer[b.off:])
|
||||
b.off += n
|
||||
return n, nil
|
||||
|
||||
case modeBufferFinished:
|
||||
return 0, io.EOF
|
||||
|
||||
default:
|
||||
return 0, errors.New("object in undefined status")
|
||||
}
|
||||
}
|
||||
|
||||
func (b *bufferedReadCloser) Close() error {
|
||||
err := b.inner.Close()
|
||||
switch b.mode {
|
||||
case modeSourceReading:
|
||||
_, err := b.BufferedAll()
|
||||
if err != nil {
|
||||
b.finished = true
|
||||
}
|
||||
return err
|
||||
}
|
||||
err = b.inner.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
b.mode = modeSourceFinished
|
||||
return nil
|
||||
|
||||
case modeSourceFinished:
|
||||
return nil
|
||||
|
||||
case modeBufferReading:
|
||||
b.mode = modeBufferFinished
|
||||
return nil
|
||||
|
||||
case modeBufferFinished:
|
||||
return nil
|
||||
|
||||
default:
|
||||
return errors.New("object in undefined status")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (b *bufferedReadCloser) BufferedAll() ([]byte, error) {
|
||||
switch b.mode {
|
||||
case modeSourceReading:
|
||||
arr := make([]byte, 1024)
|
||||
for !b.finished {
|
||||
for b.mode == modeSourceReading {
|
||||
_, err := b.Read(arr)
|
||||
if err != nil && err != io.EOF {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
return b.buffer, nil
|
||||
|
||||
case modeSourceFinished:
|
||||
return b.buffer, nil
|
||||
|
||||
case modeBufferReading:
|
||||
return b.buffer, nil
|
||||
|
||||
case modeBufferFinished:
|
||||
return b.buffer, nil
|
||||
|
||||
default:
|
||||
return nil, errors.New("object in undefined status")
|
||||
}
|
||||
}
|
||||
|
||||
func (b *bufferedReadCloser) Reset() error {
|
||||
switch b.mode {
|
||||
case modeSourceReading:
|
||||
fallthrough
|
||||
case modeSourceFinished:
|
||||
err := b.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
b.mode = modeBufferReading
|
||||
b.off = 0
|
||||
return nil
|
||||
|
||||
case modeBufferReading:
|
||||
fallthrough
|
||||
case modeBufferFinished:
|
||||
b.mode = modeBufferReading
|
||||
b.off = 0
|
||||
return nil
|
||||
|
||||
default:
|
||||
return errors.New("object in undefined status")
|
||||
}
|
||||
}
|
||||
|
@@ -1,7 +1,7 @@
|
||||
package dataext
|
||||
|
||||
import (
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"math/rand"
|
||||
"strconv"
|
||||
"testing"
|
||||
@@ -251,18 +251,21 @@ func randomKey() string {
|
||||
}
|
||||
|
||||
func randomVal() LRUData {
|
||||
v := primitive.NewObjectID()
|
||||
v, err := langext.NewHexUUID()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return &v
|
||||
}
|
||||
|
||||
func eq(a LRUData, b LRUData) bool {
|
||||
v1, ok1 := a.(*primitive.ObjectID)
|
||||
v2, ok2 := b.(*primitive.ObjectID)
|
||||
v1, ok1 := a.(*string)
|
||||
v2, ok2 := b.(*string)
|
||||
if ok1 && ok2 {
|
||||
if v1 == nil || v2 == nil {
|
||||
return false
|
||||
}
|
||||
return v1.Hex() == v2.Hex()
|
||||
return v1 == v2
|
||||
}
|
||||
|
||||
return false
|
||||
|
35
dataext/merge.go
Normal file
35
dataext/merge.go
Normal file
@@ -0,0 +1,35 @@
|
||||
package dataext
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
)
|
||||
|
||||
func ObjectMerge[T1 any, T2 any](base T1, override T2) T1 {
|
||||
|
||||
reflBase := reflect.ValueOf(&base).Elem()
|
||||
reflOvrd := reflect.ValueOf(&override).Elem()
|
||||
|
||||
for i := 0; i < reflBase.NumField(); i++ {
|
||||
|
||||
fieldBase := reflBase.Field(i)
|
||||
fieldOvrd := reflOvrd.Field(i)
|
||||
|
||||
if fieldBase.Kind() != reflect.Ptr || fieldOvrd.Kind() != reflect.Ptr {
|
||||
continue
|
||||
}
|
||||
|
||||
kindBase := fieldBase.Type().Elem().Kind()
|
||||
kindOvrd := fieldOvrd.Type().Elem().Kind()
|
||||
|
||||
if kindBase != kindOvrd {
|
||||
continue
|
||||
}
|
||||
|
||||
if !fieldOvrd.IsNil() {
|
||||
fieldBase.Set(fieldOvrd.Elem().Addr())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return base
|
||||
}
|
70
dataext/merge_test.go
Normal file
70
dataext/merge_test.go
Normal file
@@ -0,0 +1,70 @@
|
||||
package dataext
|
||||
|
||||
import (
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestObjectMerge(t *testing.T) {
|
||||
type A struct {
|
||||
Field1 *int
|
||||
Field2 *string
|
||||
Field3 *float64
|
||||
Field4 *bool
|
||||
OnlyA int64
|
||||
DiffType int
|
||||
}
|
||||
type B struct {
|
||||
Field1 *int
|
||||
Field2 *string
|
||||
Field3 *float64
|
||||
Field4 *bool
|
||||
OnlyB int64
|
||||
DiffType string
|
||||
}
|
||||
|
||||
valueA := A{
|
||||
Field1: nil,
|
||||
Field2: langext.Ptr("99"),
|
||||
Field3: langext.Ptr(12.2),
|
||||
Field4: nil,
|
||||
OnlyA: 1,
|
||||
DiffType: 2,
|
||||
}
|
||||
|
||||
valueB := B{
|
||||
Field1: langext.Ptr(12),
|
||||
Field2: nil,
|
||||
Field3: langext.Ptr(13.2),
|
||||
Field4: nil,
|
||||
OnlyB: 1,
|
||||
DiffType: "X",
|
||||
}
|
||||
|
||||
valueMerge := ObjectMerge(valueA, valueB)
|
||||
|
||||
assertPtrEqual(t, "Field1", valueMerge.Field1, valueB.Field1)
|
||||
assertPtrEqual(t, "Field2", valueMerge.Field2, valueA.Field2)
|
||||
assertPtrEqual(t, "Field3", valueMerge.Field3, valueB.Field3)
|
||||
assertPtrEqual(t, "Field4", valueMerge.Field4, nil)
|
||||
|
||||
}
|
||||
|
||||
func assertPtrEqual[T1 comparable](t *testing.T, ident string, actual *T1, expected *T1) {
|
||||
if actual == nil && expected == nil {
|
||||
return
|
||||
}
|
||||
if actual != nil && expected != nil {
|
||||
if *actual != *expected {
|
||||
t.Errorf("[%s] values differ: Actual: '%v', Expected: '%v'", ident, *actual, *expected)
|
||||
} else {
|
||||
return
|
||||
}
|
||||
}
|
||||
if actual == nil && expected != nil {
|
||||
t.Errorf("[%s] values differ: Actual: nil, Expected: not-nil", ident)
|
||||
}
|
||||
if actual != nil && expected == nil {
|
||||
t.Errorf("[%s] values differ: Actual: not-nil, Expected: nil", ident)
|
||||
}
|
||||
}
|
254
dataext/structHash.go
Normal file
254
dataext/structHash.go
Normal file
@@ -0,0 +1,254 @@
|
||||
package dataext
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/sha256"
|
||||
"encoding/binary"
|
||||
"errors"
|
||||
"fmt"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"hash"
|
||||
"io"
|
||||
"reflect"
|
||||
"sort"
|
||||
)
|
||||
|
||||
type StructHashOptions struct {
|
||||
HashAlgo hash.Hash
|
||||
Tag *string
|
||||
SkipChannel bool
|
||||
SkipFunc bool
|
||||
}
|
||||
|
||||
func StructHash(dat any, opt ...StructHashOptions) (r []byte, err error) {
|
||||
defer func() {
|
||||
if rec := recover(); rec != nil {
|
||||
r = nil
|
||||
err = errors.New(fmt.Sprintf("recovered panic: %v", rec))
|
||||
}
|
||||
}()
|
||||
|
||||
shopt := StructHashOptions{}
|
||||
if len(opt) > 1 {
|
||||
return nil, errors.New("multiple options supplied")
|
||||
} else if len(opt) == 1 {
|
||||
shopt = opt[0]
|
||||
}
|
||||
|
||||
if shopt.HashAlgo == nil {
|
||||
shopt.HashAlgo = sha256.New()
|
||||
}
|
||||
|
||||
writer := new(bytes.Buffer)
|
||||
|
||||
if langext.IsNil(dat) {
|
||||
shopt.HashAlgo.Reset()
|
||||
shopt.HashAlgo.Write(writer.Bytes())
|
||||
res := shopt.HashAlgo.Sum(nil)
|
||||
return res, nil
|
||||
}
|
||||
|
||||
err = binarize(writer, reflect.ValueOf(dat), shopt)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
shopt.HashAlgo.Reset()
|
||||
shopt.HashAlgo.Write(writer.Bytes())
|
||||
res := shopt.HashAlgo.Sum(nil)
|
||||
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func writeBinarized(writer io.Writer, dat any) error {
|
||||
tmp := bytes.Buffer{}
|
||||
err := binary.Write(&tmp, binary.LittleEndian, dat)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = binary.Write(writer, binary.LittleEndian, uint64(tmp.Len()))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = writer.Write(tmp.Bytes())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func binarize(writer io.Writer, dat reflect.Value, opt StructHashOptions) error {
|
||||
var err error
|
||||
|
||||
err = binary.Write(writer, binary.LittleEndian, uint8(dat.Kind()))
|
||||
switch dat.Kind() {
|
||||
case reflect.Ptr, reflect.Map, reflect.Array, reflect.Chan, reflect.Slice, reflect.Interface:
|
||||
if dat.IsNil() {
|
||||
err = binary.Write(writer, binary.LittleEndian, uint64(0))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
err = binary.Write(writer, binary.LittleEndian, uint64(len(dat.Type().String())))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = writer.Write([]byte(dat.Type().String()))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
switch dat.Type().Kind() {
|
||||
case reflect.Invalid:
|
||||
return errors.New("cannot binarize value of kind <Invalid>")
|
||||
case reflect.Bool:
|
||||
return writeBinarized(writer, dat.Bool())
|
||||
case reflect.Int:
|
||||
return writeBinarized(writer, int64(dat.Int()))
|
||||
case reflect.Int8:
|
||||
fallthrough
|
||||
case reflect.Int16:
|
||||
fallthrough
|
||||
case reflect.Int32:
|
||||
fallthrough
|
||||
case reflect.Int64:
|
||||
return writeBinarized(writer, dat.Interface())
|
||||
case reflect.Uint:
|
||||
return writeBinarized(writer, uint64(dat.Int()))
|
||||
case reflect.Uint8:
|
||||
fallthrough
|
||||
case reflect.Uint16:
|
||||
fallthrough
|
||||
case reflect.Uint32:
|
||||
fallthrough
|
||||
case reflect.Uint64:
|
||||
return writeBinarized(writer, dat.Interface())
|
||||
case reflect.Uintptr:
|
||||
return errors.New("cannot binarize value of kind <Uintptr>")
|
||||
case reflect.Float32:
|
||||
fallthrough
|
||||
case reflect.Float64:
|
||||
return writeBinarized(writer, dat.Interface())
|
||||
case reflect.Complex64:
|
||||
return errors.New("cannot binarize value of kind <Complex64>")
|
||||
case reflect.Complex128:
|
||||
return errors.New("cannot binarize value of kind <Complex128>")
|
||||
case reflect.Slice:
|
||||
fallthrough
|
||||
case reflect.Array:
|
||||
return binarizeArrayOrSlice(writer, dat, opt)
|
||||
case reflect.Chan:
|
||||
if opt.SkipChannel {
|
||||
return nil
|
||||
}
|
||||
return errors.New("cannot binarize value of kind <Chan>")
|
||||
case reflect.Func:
|
||||
if opt.SkipFunc {
|
||||
return nil
|
||||
}
|
||||
return errors.New("cannot binarize value of kind <Func>")
|
||||
case reflect.Interface:
|
||||
return binarize(writer, dat.Elem(), opt)
|
||||
case reflect.Map:
|
||||
return binarizeMap(writer, dat, opt)
|
||||
case reflect.Pointer:
|
||||
return binarize(writer, dat.Elem(), opt)
|
||||
case reflect.String:
|
||||
v := dat.String()
|
||||
err = binary.Write(writer, binary.LittleEndian, uint64(len(v)))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = writer.Write([]byte(v))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
case reflect.Struct:
|
||||
return binarizeStruct(writer, dat, opt)
|
||||
case reflect.UnsafePointer:
|
||||
return errors.New("cannot binarize value of kind <UnsafePointer>")
|
||||
default:
|
||||
return errors.New("cannot binarize value of unknown kind <" + dat.Type().Kind().String() + ">")
|
||||
}
|
||||
}
|
||||
|
||||
func binarizeStruct(writer io.Writer, dat reflect.Value, opt StructHashOptions) error {
|
||||
err := binary.Write(writer, binary.LittleEndian, uint64(dat.NumField()))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for i := 0; i < dat.NumField(); i++ {
|
||||
|
||||
if opt.Tag != nil {
|
||||
if _, ok := dat.Type().Field(i).Tag.Lookup(*opt.Tag); !ok {
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
err = binary.Write(writer, binary.LittleEndian, uint64(len(dat.Type().Field(i).Name)))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = writer.Write([]byte(dat.Type().Field(i).Name))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = binarize(writer, dat.Field(i), opt)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func binarizeArrayOrSlice(writer io.Writer, dat reflect.Value, opt StructHashOptions) error {
|
||||
err := binary.Write(writer, binary.LittleEndian, uint64(dat.Len()))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for i := 0; i < dat.Len(); i++ {
|
||||
err := binarize(writer, dat.Index(i), opt)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func binarizeMap(writer io.Writer, dat reflect.Value, opt StructHashOptions) error {
|
||||
err := binary.Write(writer, binary.LittleEndian, uint64(dat.Len()))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
sub := make([][]byte, 0, dat.Len())
|
||||
|
||||
for _, k := range dat.MapKeys() {
|
||||
tmp := bytes.Buffer{}
|
||||
err = binarize(&tmp, dat.MapIndex(k), opt)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
sub = append(sub, tmp.Bytes())
|
||||
}
|
||||
|
||||
sort.Slice(sub, func(i1, i2 int) bool { return bytes.Compare(sub[i1], sub[i2]) < 0 })
|
||||
|
||||
for _, v := range sub {
|
||||
_, err = writer.Write(v)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
143
dataext/structHash_test.go
Normal file
143
dataext/structHash_test.go
Normal file
@@ -0,0 +1,143 @@
|
||||
package dataext
|
||||
|
||||
import (
|
||||
"encoding/hex"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func noErrStructHash(t *testing.T, dat any, opt ...StructHashOptions) []byte {
|
||||
res, err := StructHash(dat, opt...)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
t.FailNow()
|
||||
return nil
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
func TestStructHashSimple(t *testing.T) {
|
||||
|
||||
assertEqual(t, "209bf774af36cc3a045c152d9f1269ef3684ad819c1359ee73ff0283a308fefa", noErrStructHash(t, "Hello"))
|
||||
assertEqual(t, "c32f3626b981ae2997db656f3acad3f1dc9d30ef6b6d14296c023e391b25f71a", noErrStructHash(t, 0))
|
||||
assertEqual(t, "01b781b03e9586b257d387057dfc70d9f06051e7d3c1e709a57e13cc8daf3e35", noErrStructHash(t, []byte{}))
|
||||
assertEqual(t, "93e1dcd45c732fe0079b0fb3204c7c803f0921835f6bfee2e6ff263e73eed53c", noErrStructHash(t, []int{}))
|
||||
assertEqual(t, "54f637a376aad55b3160d98ebbcae8099b70d91b9400df23fb3709855d59800a", noErrStructHash(t, []int{1, 2, 3}))
|
||||
assertEqual(t, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", noErrStructHash(t, nil))
|
||||
assertEqual(t, "349a7db91aa78fd30bbaa7c7f9c7bfb2fcfe72869b4861162a96713a852f60d3", noErrStructHash(t, []any{1, "", nil}))
|
||||
assertEqual(t, "ca51aab87808bf0062a4a024de6aac0c2bad54275cc857a4944569f89fd245ad", noErrStructHash(t, struct{}{}))
|
||||
|
||||
}
|
||||
|
||||
func TestStructHashSimpleStruct(t *testing.T) {
|
||||
|
||||
type t0 struct {
|
||||
F1 int
|
||||
F2 []string
|
||||
F3 *int
|
||||
}
|
||||
|
||||
assertEqual(t, "a90bff751c70c738bb5cfc9b108e783fa9c19c0bc9273458e0aaee6e74aa1b92", noErrStructHash(t, t0{
|
||||
F1: 10,
|
||||
F2: []string{"1", "2", "3"},
|
||||
F3: nil,
|
||||
}))
|
||||
|
||||
assertEqual(t, "5d09090dc34ac59dd645f197a255f653387723de3afa1b614721ea5a081c675f", noErrStructHash(t, t0{
|
||||
F1: 10,
|
||||
F2: []string{"1", "2", "3"},
|
||||
F3: langext.Ptr(99),
|
||||
}))
|
||||
|
||||
}
|
||||
|
||||
func TestStructHashLayeredStruct(t *testing.T) {
|
||||
|
||||
type t1_1 struct {
|
||||
F10 float32
|
||||
F12 float64
|
||||
F15 bool
|
||||
}
|
||||
type t1_2 struct {
|
||||
SV1 *t1_1
|
||||
SV2 *t1_1
|
||||
SV3 t1_1
|
||||
}
|
||||
|
||||
assertEqual(t, "fd4ca071fb40a288fee4b7a3dfdaab577b30cb8f80f81ec511e7afd72dc3b469", noErrStructHash(t, t1_2{
|
||||
SV1: nil,
|
||||
SV2: nil,
|
||||
SV3: t1_1{
|
||||
F10: 1,
|
||||
F12: 2,
|
||||
F15: false,
|
||||
},
|
||||
}))
|
||||
assertEqual(t, "3fbf7c67d8121deda075cc86319a4e32d71744feb2cebf89b43bc682f072a029", noErrStructHash(t, t1_2{
|
||||
SV1: nil,
|
||||
SV2: &t1_1{},
|
||||
SV3: t1_1{
|
||||
F10: 3,
|
||||
F12: 4,
|
||||
F15: true,
|
||||
},
|
||||
}))
|
||||
assertEqual(t, "b1791ccd1b346c3ede5bbffda85555adcd8216b93ffca23f14fe175ec47c5104", noErrStructHash(t, t1_2{
|
||||
SV1: &t1_1{},
|
||||
SV2: &t1_1{},
|
||||
SV3: t1_1{
|
||||
F10: 5,
|
||||
F12: 6,
|
||||
F15: false,
|
||||
},
|
||||
}))
|
||||
|
||||
}
|
||||
|
||||
func TestStructHashMap(t *testing.T) {
|
||||
|
||||
type t0 struct {
|
||||
F1 int
|
||||
F2 map[string]int
|
||||
}
|
||||
|
||||
assertEqual(t, "d50c53ad1fafb448c33fddd5aca01a86a2edf669ce2ecab07ba6fe877951d824", noErrStructHash(t, t0{
|
||||
F1: 10,
|
||||
F2: map[string]int{
|
||||
"x": 1,
|
||||
"0": 2,
|
||||
"a": 99,
|
||||
},
|
||||
}))
|
||||
|
||||
assertEqual(t, "d50c53ad1fafb448c33fddd5aca01a86a2edf669ce2ecab07ba6fe877951d824", noErrStructHash(t, t0{
|
||||
F1: 10,
|
||||
F2: map[string]int{
|
||||
"a": 99,
|
||||
"x": 1,
|
||||
"0": 2,
|
||||
},
|
||||
}))
|
||||
|
||||
m3 := make(map[string]int, 99)
|
||||
m3["a"] = 0
|
||||
m3["x"] = 0
|
||||
m3["0"] = 0
|
||||
|
||||
m3["0"] = 99
|
||||
m3["x"] = 1
|
||||
m3["a"] = 2
|
||||
|
||||
assertEqual(t, "d50c53ad1fafb448c33fddd5aca01a86a2edf669ce2ecab07ba6fe877951d824", noErrStructHash(t, t0{
|
||||
F1: 10,
|
||||
F2: m3,
|
||||
}))
|
||||
|
||||
}
|
||||
|
||||
func assertEqual(t *testing.T, expected string, actual []byte) {
|
||||
actualStr := hex.EncodeToString(actual)
|
||||
if actualStr != expected {
|
||||
t.Errorf("values differ: Actual: '%v', Expected: '%v'", actualStr, expected)
|
||||
}
|
||||
}
|
9
go.mod
9
go.mod
@@ -1,3 +1,10 @@
|
||||
module blackforestbytes.com/goext/lang
|
||||
module gogs.mikescher.com/BlackForestBytes/goext
|
||||
|
||||
go 1.19
|
||||
|
||||
require (
|
||||
golang.org/x/sys v0.1.0
|
||||
golang.org/x/term v0.1.0
|
||||
)
|
||||
|
||||
require github.com/jmoiron/sqlx v1.3.5 // indirect
|
||||
|
9
go.sum
Normal file
9
go.sum
Normal file
@@ -0,0 +1,9 @@
|
||||
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||
github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
|
||||
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
|
||||
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
|
||||
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
|
||||
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
|
||||
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
152
langext/array.go
152
langext/array.go
@@ -4,6 +4,24 @@ import (
|
||||
"reflect"
|
||||
)
|
||||
|
||||
func BoolCount(arr ...bool) int {
|
||||
c := 0
|
||||
for _, v := range arr {
|
||||
if v {
|
||||
c++
|
||||
}
|
||||
}
|
||||
return c
|
||||
}
|
||||
|
||||
func Range[T IntegerConstraint](start T, end T) []T {
|
||||
r := make([]T, 0, end-start)
|
||||
for i := start; i < end; i++ {
|
||||
r = append(r, i)
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func ForceArray[T any](v []T) []T {
|
||||
if v == nil {
|
||||
return make([]T, 0)
|
||||
@@ -52,7 +70,73 @@ func ArrEqualsExact[T comparable](arr1 []T, arr2 []T) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func ArrAll(arr interface{}, fn func(int) bool) bool {
|
||||
func ArrAll[T any](arr []T, fn func(T) bool) bool {
|
||||
for _, av := range arr {
|
||||
if !fn(av) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func ArrAllErr[T any](arr []T, fn func(T) (bool, error)) (bool, error) {
|
||||
for _, av := range arr {
|
||||
v, err := fn(av)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if !v {
|
||||
return false, nil
|
||||
}
|
||||
}
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func ArrNone[T any](arr []T, fn func(T) bool) bool {
|
||||
for _, av := range arr {
|
||||
if fn(av) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func ArrNoneErr[T any](arr []T, fn func(T) (bool, error)) (bool, error) {
|
||||
for _, av := range arr {
|
||||
v, err := fn(av)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if v {
|
||||
return false, nil
|
||||
}
|
||||
}
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func ArrAny[T any](arr []T, fn func(T) bool) bool {
|
||||
for _, av := range arr {
|
||||
if fn(av) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func ArrAnyErr[T any](arr []T, fn func(T) (bool, error)) (bool, error) {
|
||||
for _, av := range arr {
|
||||
v, err := fn(av)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if v {
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func ArrIdxAll(arr any, fn func(int) bool) bool {
|
||||
av := reflect.ValueOf(arr)
|
||||
for i := 0; i < av.Len(); i++ {
|
||||
if !fn(i) {
|
||||
@@ -62,7 +146,7 @@ func ArrAll(arr interface{}, fn func(int) bool) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func ArrAllErr(arr interface{}, fn func(int) (bool, error)) (bool, error) {
|
||||
func ArrIdxAllErr(arr any, fn func(int) (bool, error)) (bool, error) {
|
||||
av := reflect.ValueOf(arr)
|
||||
for i := 0; i < av.Len(); i++ {
|
||||
v, err := fn(i)
|
||||
@@ -76,7 +160,7 @@ func ArrAllErr(arr interface{}, fn func(int) (bool, error)) (bool, error) {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func ArrNone(arr interface{}, fn func(int) bool) bool {
|
||||
func ArrIdxNone(arr any, fn func(int) bool) bool {
|
||||
av := reflect.ValueOf(arr)
|
||||
for i := 0; i < av.Len(); i++ {
|
||||
if fn(i) {
|
||||
@@ -86,7 +170,7 @@ func ArrNone(arr interface{}, fn func(int) bool) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func ArrNoneErr(arr interface{}, fn func(int) (bool, error)) (bool, error) {
|
||||
func ArrIdxNoneErr(arr any, fn func(int) (bool, error)) (bool, error) {
|
||||
av := reflect.ValueOf(arr)
|
||||
for i := 0; i < av.Len(); i++ {
|
||||
v, err := fn(i)
|
||||
@@ -100,7 +184,7 @@ func ArrNoneErr(arr interface{}, fn func(int) (bool, error)) (bool, error) {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func ArrAny(arr interface{}, fn func(int) bool) bool {
|
||||
func ArrIdxAny(arr any, fn func(int) bool) bool {
|
||||
av := reflect.ValueOf(arr)
|
||||
for i := 0; i < av.Len(); i++ {
|
||||
if fn(i) {
|
||||
@@ -110,7 +194,7 @@ func ArrAny(arr interface{}, fn func(int) bool) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func ArrAnyErr(arr interface{}, fn func(int) (bool, error)) (bool, error) {
|
||||
func ArrIdxAnyErr(arr any, fn func(int) (bool, error)) (bool, error) {
|
||||
av := reflect.ValueOf(arr)
|
||||
for i := 0; i < av.Len(); i++ {
|
||||
v, err := fn(i)
|
||||
@@ -124,6 +208,46 @@ func ArrAnyErr(arr interface{}, fn func(int) (bool, error)) (bool, error) {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func ArrFirst[T any](arr []T, comp func(v T) bool) (T, bool) {
|
||||
for _, v := range arr {
|
||||
if comp(v) {
|
||||
return v, true
|
||||
}
|
||||
}
|
||||
return *new(T), false
|
||||
}
|
||||
|
||||
func ArrLast[T any](arr []T, comp func(v T) bool) (T, bool) {
|
||||
found := false
|
||||
result := *new(T)
|
||||
for _, v := range arr {
|
||||
if comp(v) {
|
||||
found = true
|
||||
result = v
|
||||
}
|
||||
}
|
||||
return result, found
|
||||
}
|
||||
|
||||
func ArrFirstIndex[T comparable](arr []T, needle T) int {
|
||||
for i, v := range arr {
|
||||
if v == needle {
|
||||
return i
|
||||
}
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
func ArrLastIndex[T comparable](arr []T, needle T) int {
|
||||
result := -1
|
||||
for i, v := range arr {
|
||||
if v == needle {
|
||||
result = i
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func AddToSet[T comparable](set []T, add T) []T {
|
||||
for _, v := range set {
|
||||
if v == add {
|
||||
@@ -132,3 +256,19 @@ func AddToSet[T comparable](set []T, add T) []T {
|
||||
}
|
||||
return append(set, add)
|
||||
}
|
||||
|
||||
func ArrMap[T1 any, T2 any](arr []T1, conv func(v T1) T2) []T2 {
|
||||
r := make([]T2, len(arr))
|
||||
for i, v := range arr {
|
||||
r[i] = conv(v)
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func ArrSum[T NumberConstraint](arr []T) T {
|
||||
var r T = 0
|
||||
for _, v := range arr {
|
||||
r += v
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
74
langext/base62.go
Normal file
74
langext/base62.go
Normal file
@@ -0,0 +1,74 @@
|
||||
package langext
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"errors"
|
||||
"math"
|
||||
"math/big"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var (
|
||||
base62Base = uint64(62)
|
||||
base62CharacterSet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
|
||||
)
|
||||
|
||||
func RandBase62(rlen int) string {
|
||||
bi52 := big.NewInt(int64(len(base62CharacterSet)))
|
||||
|
||||
randMax := big.NewInt(math.MaxInt64)
|
||||
|
||||
r := ""
|
||||
|
||||
for i := 0; i < rlen; i++ {
|
||||
v, err := rand.Int(rand.Reader, randMax)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
r += string(base62CharacterSet[v.Mod(v, bi52).Int64()])
|
||||
}
|
||||
|
||||
return r
|
||||
}
|
||||
|
||||
func EncodeBase62(num uint64) string {
|
||||
if num == 0 {
|
||||
return "0"
|
||||
}
|
||||
|
||||
b := make([]byte, 0)
|
||||
|
||||
// loop as long the num is bigger than zero
|
||||
for num > 0 {
|
||||
r := num % base62Base
|
||||
|
||||
num -= r
|
||||
num /= base62Base
|
||||
|
||||
b = append([]byte{base62CharacterSet[int(r)]}, b...)
|
||||
}
|
||||
|
||||
return string(b)
|
||||
}
|
||||
|
||||
func DecodeBase62(str string) (uint64, error) {
|
||||
if str == "" {
|
||||
return 0, errors.New("empty string")
|
||||
}
|
||||
|
||||
result := uint64(0)
|
||||
|
||||
for _, v := range str {
|
||||
result *= base62Base
|
||||
|
||||
pos := strings.IndexRune(base62CharacterSet, v)
|
||||
if pos == -1 {
|
||||
return 0, errors.New("invalid character: " + string(v))
|
||||
}
|
||||
|
||||
result += uint64(pos)
|
||||
}
|
||||
|
||||
return result, nil
|
||||
}
|
17
langext/bool.go
Normal file
17
langext/bool.go
Normal file
@@ -0,0 +1,17 @@
|
||||
package langext
|
||||
|
||||
func FormatBool(v bool, strTrue string, strFalse string) string {
|
||||
if v {
|
||||
return strTrue
|
||||
} else {
|
||||
return strFalse
|
||||
}
|
||||
}
|
||||
|
||||
func Conditional[T any](v bool, resTrue T, resFalse T) T {
|
||||
if v {
|
||||
return resTrue
|
||||
} else {
|
||||
return resFalse
|
||||
}
|
||||
}
|
@@ -1,6 +1,9 @@
|
||||
package langext
|
||||
|
||||
import "fmt"
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
func FormatBytesToSI(b uint64) string {
|
||||
const unit = 1000
|
||||
@@ -14,3 +17,30 @@ func FormatBytesToSI(b uint64) string {
|
||||
}
|
||||
return fmt.Sprintf("%.1f %cB", float64(b)/float64(div), "kMGTPE"[exp])
|
||||
}
|
||||
|
||||
func BytesXOR(a []byte, b []byte) ([]byte, error) {
|
||||
if len(a) != len(b) {
|
||||
return nil, errors.New("length mismatch")
|
||||
}
|
||||
|
||||
r := make([]byte, len(a))
|
||||
|
||||
for i := 0; i < len(a); i++ {
|
||||
r[i] = a[i] ^ b[i]
|
||||
}
|
||||
|
||||
return r, nil
|
||||
}
|
||||
|
||||
func FormatBytes(b int64) string {
|
||||
const unit = 1024
|
||||
if b < unit {
|
||||
return fmt.Sprintf("%d B", b)
|
||||
}
|
||||
div, exp := int64(unit), 0
|
||||
for n := b / unit; n >= unit; n /= unit {
|
||||
div *= unit
|
||||
exp++
|
||||
}
|
||||
return fmt.Sprintf("%.1f %ciB", float64(b)/float64(div), "KMGTPE"[exp])
|
||||
}
|
||||
|
@@ -30,3 +30,34 @@ func CompareIntArr(arr1 []int, arr2 []int) bool {
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func CompareArr[T OrderedConstraint](arr1 []T, arr2 []T) bool {
|
||||
|
||||
for i := 0; i < len(arr1) || i < len(arr2); i++ {
|
||||
|
||||
if i < len(arr1) && i < len(arr2) {
|
||||
|
||||
if arr1[i] < arr2[i] {
|
||||
return true
|
||||
} else if arr1[i] > arr2[i] {
|
||||
return false
|
||||
} else {
|
||||
continue
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if i < len(arr1) {
|
||||
|
||||
return true
|
||||
|
||||
} else { // if i < len(arr2)
|
||||
|
||||
return false
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
21
langext/coords.go
Normal file
21
langext/coords.go
Normal file
@@ -0,0 +1,21 @@
|
||||
package langext
|
||||
|
||||
import "math"
|
||||
|
||||
func DegToRad(deg float64) float64 {
|
||||
return deg * (math.Pi / 180.0)
|
||||
}
|
||||
|
||||
func RadToDeg(rad float64) float64 {
|
||||
return rad / (math.Pi * 180.0)
|
||||
}
|
||||
|
||||
func GeoDistance(lon1 float64, lat1 float64, lon2 float64, lat2 float64) float64 {
|
||||
var d1 = DegToRad(lat1)
|
||||
var num1 = DegToRad(lon1)
|
||||
var d2 = DegToRad(lat2)
|
||||
var num2 = DegToRad(lon2) - num1
|
||||
var d3 = math.Pow(math.Sin((d2-d1)/2.0), 2.0) + math.Cos(d1)*math.Cos(d2)*math.Pow(math.Sin(num2/2.0), 2.0)
|
||||
|
||||
return 6376500.0 * (2.0 * math.Atan2(math.Sqrt(d3), math.Sqrt(1.0-d3)))
|
||||
}
|
33
langext/generics.go
Normal file
33
langext/generics.go
Normal file
@@ -0,0 +1,33 @@
|
||||
package langext
|
||||
|
||||
type IntConstraint interface {
|
||||
int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 | uint64
|
||||
}
|
||||
|
||||
type SignedConstraint interface {
|
||||
~int | ~int8 | ~int16 | ~int32 | ~int64
|
||||
}
|
||||
|
||||
type UnsignedConstraint interface {
|
||||
~uint | ~uint8 | ~uint16 | ~uint32 | ~uint64 | ~uintptr
|
||||
}
|
||||
|
||||
type IntegerConstraint interface {
|
||||
SignedConstraint | UnsignedConstraint
|
||||
}
|
||||
|
||||
type FloatConstraint interface {
|
||||
~float32 | ~float64
|
||||
}
|
||||
|
||||
type ComplexConstraint interface {
|
||||
~complex64 | ~complex128
|
||||
}
|
||||
|
||||
type OrderedConstraint interface {
|
||||
IntegerConstraint | FloatConstraint | ~string
|
||||
}
|
||||
|
||||
type NumberConstraint interface {
|
||||
IntegerConstraint | FloatConstraint
|
||||
}
|
65
langext/json.go
Normal file
65
langext/json.go
Normal file
@@ -0,0 +1,65 @@
|
||||
package langext
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
type H map[string]any
|
||||
|
||||
type A []any
|
||||
|
||||
func TryPrettyPrintJson(str string) string {
|
||||
var prettyJSON bytes.Buffer
|
||||
if err := json.Indent(&prettyJSON, []byte(str), "", " "); err != nil {
|
||||
return str
|
||||
}
|
||||
return prettyJSON.String()
|
||||
}
|
||||
|
||||
func PrettyPrintJson(str string) (string, bool) {
|
||||
var prettyJSON bytes.Buffer
|
||||
if err := json.Indent(&prettyJSON, []byte(str), "", " "); err != nil {
|
||||
return str, false
|
||||
}
|
||||
return prettyJSON.String(), true
|
||||
}
|
||||
|
||||
func PatchJson[JV string | []byte](rawjson JV, key string, value any) (JV, error) {
|
||||
var err error
|
||||
|
||||
var jsonpayload map[string]any
|
||||
err = json.Unmarshal([]byte(rawjson), &jsonpayload)
|
||||
if err != nil {
|
||||
return *new(JV), fmt.Errorf("failed to unmarshal payload: %w", err)
|
||||
}
|
||||
|
||||
jsonpayload[key] = value
|
||||
|
||||
newjson, err := json.Marshal(jsonpayload)
|
||||
if err != nil {
|
||||
return *new(JV), fmt.Errorf("failed to re-marshal payload: %w", err)
|
||||
}
|
||||
|
||||
return JV(newjson), nil
|
||||
}
|
||||
|
||||
func PatchRemJson[JV string | []byte](rawjson JV, key string) (JV, error) {
|
||||
var err error
|
||||
|
||||
var jsonpayload map[string]any
|
||||
err = json.Unmarshal([]byte(rawjson), &jsonpayload)
|
||||
if err != nil {
|
||||
return *new(JV), fmt.Errorf("failed to unmarshal payload: %w", err)
|
||||
}
|
||||
|
||||
delete(jsonpayload, key)
|
||||
|
||||
newjson, err := json.Marshal(jsonpayload)
|
||||
if err != nil {
|
||||
return *new(JV), fmt.Errorf("failed to re-marshal payload: %w", err)
|
||||
}
|
||||
|
||||
return JV(newjson), nil
|
||||
}
|
9
langext/maps.go
Normal file
9
langext/maps.go
Normal file
@@ -0,0 +1,9 @@
|
||||
package langext
|
||||
|
||||
func MapKeyArr[T comparable, V any](v map[T]V) []T {
|
||||
result := make([]T, 0, len(v))
|
||||
for k := range v {
|
||||
result = append(result, k)
|
||||
}
|
||||
return result
|
||||
}
|
11
langext/os.go
Normal file
11
langext/os.go
Normal file
@@ -0,0 +1,11 @@
|
||||
package langext
|
||||
|
||||
import "os"
|
||||
|
||||
func FileExists(filename string) bool {
|
||||
info, err := os.Stat(filename)
|
||||
if os.IsNotExist(err) {
|
||||
return false
|
||||
}
|
||||
return !info.IsDir()
|
||||
}
|
15
langext/rand.go
Normal file
15
langext/rand.go
Normal file
@@ -0,0 +1,15 @@
|
||||
package langext
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"io"
|
||||
)
|
||||
|
||||
func RandBytes(size int) []byte {
|
||||
b := make([]byte, size)
|
||||
_, err := io.ReadFull(rand.Reader, b)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return b
|
||||
}
|
@@ -61,3 +61,57 @@ func ConvertStringerArray[T fmt.Stringer](inarr []T) []string {
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func StrRunePadLeft(str string, pad string, padlen int) string {
|
||||
if pad == "" {
|
||||
pad = " "
|
||||
}
|
||||
|
||||
if len([]rune(str)) >= padlen {
|
||||
return str
|
||||
}
|
||||
|
||||
return strings.Repeat(pad, padlen-len([]rune(str)))[0:(padlen-len([]rune(str)))] + str
|
||||
}
|
||||
|
||||
func StrRunePadRight(str string, pad string, padlen int) string {
|
||||
if pad == "" {
|
||||
pad = " "
|
||||
}
|
||||
|
||||
if len([]rune(str)) >= padlen {
|
||||
return str
|
||||
}
|
||||
|
||||
return str + strings.Repeat(pad, padlen-len([]rune(str)))[0:(padlen-len([]rune(str)))]
|
||||
}
|
||||
|
||||
func Indent(str string, pad string) string {
|
||||
eonl := strings.HasSuffix(str, "\n")
|
||||
r := ""
|
||||
for _, v := range strings.Split(str, "\n") {
|
||||
r += pad + v + "\n"
|
||||
}
|
||||
|
||||
if eonl {
|
||||
r = r[0 : len(r)-1]
|
||||
}
|
||||
|
||||
return r
|
||||
}
|
||||
|
||||
func NumToStringOpt[V IntConstraint](v *V, fallback string) string {
|
||||
if v == nil {
|
||||
return fallback
|
||||
} else {
|
||||
return fmt.Sprintf("%d", v)
|
||||
}
|
||||
}
|
||||
|
||||
func StrRepeat(val string, count int) string {
|
||||
r := ""
|
||||
for i := 0; i < count; i++ {
|
||||
r += val
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
134
langext/uuid.go
Normal file
134
langext/uuid.go
Normal file
@@ -0,0 +1,134 @@
|
||||
package langext
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"encoding/hex"
|
||||
"io"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func NewUUID() ([16]byte, error) {
|
||||
var uuid [16]byte
|
||||
_, err := io.ReadFull(rand.Reader, uuid[:])
|
||||
if err != nil {
|
||||
return [16]byte{}, err
|
||||
}
|
||||
uuid[6] = (uuid[6] & 0x0f) | 0x40 // Version 4
|
||||
uuid[8] = (uuid[8] & 0x3f) | 0x80 // Variant is 10
|
||||
return uuid, nil
|
||||
}
|
||||
|
||||
func NewHexUUID() (string, error) {
|
||||
uuid, err := NewUUID()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// Result: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
|
||||
|
||||
var dst = make([]byte, 36)
|
||||
|
||||
hex.Encode(dst, uuid[:4])
|
||||
dst[8] = '-'
|
||||
hex.Encode(dst[9:13], uuid[4:6])
|
||||
dst[13] = '-'
|
||||
hex.Encode(dst[14:18], uuid[6:8])
|
||||
dst[18] = '-'
|
||||
hex.Encode(dst[19:23], uuid[8:10])
|
||||
dst[23] = '-'
|
||||
hex.Encode(dst[24:], uuid[10:])
|
||||
|
||||
return string(dst), nil
|
||||
}
|
||||
|
||||
func NewUpperHexUUID() (string, error) {
|
||||
uuid, err := NewUUID()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// Result: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
||||
|
||||
var dst = make([]byte, 36)
|
||||
|
||||
hex.Encode(dst, uuid[:4])
|
||||
dst[8] = '-'
|
||||
hex.Encode(dst[9:13], uuid[4:6])
|
||||
dst[13] = '-'
|
||||
hex.Encode(dst[14:18], uuid[6:8])
|
||||
dst[18] = '-'
|
||||
hex.Encode(dst[19:23], uuid[8:10])
|
||||
dst[23] = '-'
|
||||
hex.Encode(dst[24:], uuid[10:])
|
||||
|
||||
return strings.ToUpper(string(dst)), nil
|
||||
}
|
||||
|
||||
func NewRawHexUUID() (string, error) {
|
||||
uuid, err := NewUUID()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// Result: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
||||
|
||||
var dst = make([]byte, 32)
|
||||
|
||||
hex.Encode(dst, uuid[:4])
|
||||
hex.Encode(dst[8:12], uuid[4:6])
|
||||
hex.Encode(dst[12:16], uuid[6:8])
|
||||
hex.Encode(dst[16:20], uuid[8:10])
|
||||
hex.Encode(dst[20:], uuid[10:])
|
||||
|
||||
return strings.ToUpper(string(dst)), nil
|
||||
}
|
||||
|
||||
func NewBracesUUID() (string, error) {
|
||||
uuid, err := NewUUID()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// Result: {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
|
||||
|
||||
var dst = make([]byte, 38)
|
||||
|
||||
dst[0] = '{'
|
||||
hex.Encode(dst, uuid[:5])
|
||||
dst[9] = '-'
|
||||
hex.Encode(dst[10:14], uuid[4:6])
|
||||
dst[14] = '-'
|
||||
hex.Encode(dst[15:19], uuid[6:8])
|
||||
dst[19] = '-'
|
||||
hex.Encode(dst[20:24], uuid[8:10])
|
||||
dst[24] = '-'
|
||||
hex.Encode(dst[25:], uuid[10:])
|
||||
dst[37] = '}'
|
||||
|
||||
return strings.ToUpper(string(dst)), nil
|
||||
}
|
||||
|
||||
func NewParensUUID() (string, error) {
|
||||
uuid, err := NewUUID()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// Result: (XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX)
|
||||
|
||||
var dst = make([]byte, 38)
|
||||
|
||||
dst[0] = '('
|
||||
hex.Encode(dst, uuid[:5])
|
||||
dst[9] = '-'
|
||||
hex.Encode(dst[10:14], uuid[4:6])
|
||||
dst[14] = '-'
|
||||
hex.Encode(dst[15:19], uuid[6:8])
|
||||
dst[19] = '-'
|
||||
hex.Encode(dst[20:24], uuid[8:10])
|
||||
dst[24] = '-'
|
||||
hex.Encode(dst[25:], uuid[10:])
|
||||
dst[37] = ')'
|
||||
|
||||
return strings.ToUpper(string(dst)), nil
|
||||
}
|
@@ -1,5 +1,7 @@
|
||||
package mathext
|
||||
|
||||
import "gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
|
||||
func AvgFloat64(arr []float64) float64 {
|
||||
return SumFloat64(arr) / float64(len(arr))
|
||||
}
|
||||
@@ -11,3 +13,37 @@ func SumFloat64(arr []float64) float64 {
|
||||
}
|
||||
return sum
|
||||
}
|
||||
|
||||
func Max[T langext.OrderedConstraint](v1 T, v2 T) T {
|
||||
if v1 > v2 {
|
||||
return v1
|
||||
} else {
|
||||
return v2
|
||||
}
|
||||
}
|
||||
|
||||
func Min[T langext.OrderedConstraint](v1 T, v2 T) T {
|
||||
if v1 < v2 {
|
||||
return v1
|
||||
} else {
|
||||
return v2
|
||||
}
|
||||
}
|
||||
|
||||
func Abs[T langext.NumberConstraint](v T) T {
|
||||
if v < 0 {
|
||||
return -v
|
||||
} else {
|
||||
return v
|
||||
}
|
||||
}
|
||||
|
||||
func Clamp[T langext.NumberConstraint](v T, min T, max T) T {
|
||||
if v < min {
|
||||
return min
|
||||
} else if v > max {
|
||||
return max
|
||||
} else {
|
||||
return v
|
||||
}
|
||||
}
|
||||
|
@@ -1,26 +1,28 @@
|
||||
package mathext
|
||||
|
||||
func Sum(v []float64) float64 {
|
||||
total := float64(0)
|
||||
import "gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
|
||||
func Sum[T langext.NumberConstraint](v []T) T {
|
||||
total := T(0)
|
||||
for _, v := range v {
|
||||
total += v
|
||||
}
|
||||
return total
|
||||
}
|
||||
|
||||
func Mean(v []float64) float64 {
|
||||
return Sum(v) / float64(len(v))
|
||||
func Mean[T langext.FloatConstraint](v []T) T {
|
||||
return Sum(v) / T(len(v))
|
||||
}
|
||||
|
||||
func Median(v []float64) float64 {
|
||||
func Median[T langext.FloatConstraint](v []T) T {
|
||||
if len(v)%2 == 1 {
|
||||
return v[len(v)/2]
|
||||
} else {
|
||||
return (v[len(v)/2-1] + v[len(v)/2]) / float64(2)
|
||||
return (v[len(v)/2-1] + v[len(v)/2]) / T(2)
|
||||
}
|
||||
}
|
||||
|
||||
func Min(v []float64) float64 {
|
||||
func ArrMin[T langext.OrderedConstraint](v []T) T {
|
||||
r := v[0]
|
||||
for _, val := range v {
|
||||
if val < r {
|
||||
@@ -30,7 +32,7 @@ func Min(v []float64) float64 {
|
||||
return r
|
||||
}
|
||||
|
||||
func Max(v []float64) float64 {
|
||||
func ArrMax[T langext.OrderedConstraint](v []T) T {
|
||||
r := v[0]
|
||||
for _, val := range v {
|
||||
if val > r {
|
||||
|
89
sq/database.go
Normal file
89
sq/database.go
Normal file
@@ -0,0 +1,89 @@
|
||||
package sq
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"github.com/jmoiron/sqlx"
|
||||
"sync"
|
||||
)
|
||||
|
||||
type DB interface {
|
||||
Exec(ctx context.Context, sql string, prep PP) (sql.Result, error)
|
||||
Query(ctx context.Context, sql string, prep PP) (*sqlx.Rows, error)
|
||||
Ping(ctx context.Context) error
|
||||
BeginTransaction(ctx context.Context, iso sql.IsolationLevel) (Tx, error)
|
||||
SetListener(listener Listener)
|
||||
}
|
||||
|
||||
type database struct {
|
||||
db *sqlx.DB
|
||||
txctr uint16
|
||||
lock sync.Mutex
|
||||
lstr Listener
|
||||
}
|
||||
|
||||
func NewDB(db *sqlx.DB) DB {
|
||||
return &database{
|
||||
db: db,
|
||||
txctr: 0,
|
||||
lock: sync.Mutex{},
|
||||
}
|
||||
}
|
||||
|
||||
func (db *database) SetListener(listener Listener) {
|
||||
db.lstr = listener
|
||||
}
|
||||
|
||||
func (db *database) Exec(ctx context.Context, sql string, prep PP) (sql.Result, error) {
|
||||
if db.lstr != nil {
|
||||
db.lstr.OnExec(nil, sql, &prep)
|
||||
}
|
||||
|
||||
res, err := db.db.NamedExecContext(ctx, sql, prep)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (db *database) Query(ctx context.Context, sql string, prep PP) (*sqlx.Rows, error) {
|
||||
if db.lstr != nil {
|
||||
db.lstr.OnQuery(nil, sql, &prep)
|
||||
}
|
||||
|
||||
rows, err := db.db.NamedQueryContext(ctx, sql, prep)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return rows, nil
|
||||
}
|
||||
|
||||
func (db *database) Ping(ctx context.Context) error {
|
||||
if db.lstr != nil {
|
||||
db.lstr.OnPing()
|
||||
}
|
||||
|
||||
err := db.db.PingContext(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *database) BeginTransaction(ctx context.Context, iso sql.IsolationLevel) (Tx, error) {
|
||||
db.lock.Lock()
|
||||
txid := db.txctr
|
||||
db.txctr += 1 // with overflow !
|
||||
db.lock.Unlock()
|
||||
|
||||
if db.lstr != nil {
|
||||
db.lstr.OnTxBegin(txid)
|
||||
}
|
||||
|
||||
xtx, err := db.db.BeginTxx(ctx, &sql.TxOptions{Isolation: iso})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return NewTransaction(xtx, txid, db.lstr), nil
|
||||
}
|
10
sq/listener.go
Normal file
10
sq/listener.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package sq
|
||||
|
||||
type Listener interface {
|
||||
OnQuery(txID *uint16, sql string, params *PP)
|
||||
OnExec(txID *uint16, sql string, params *PP)
|
||||
OnPing()
|
||||
OnTxBegin(txid uint16)
|
||||
OnTxCommit(txid uint16)
|
||||
OnTxRollback(txid uint16)
|
||||
}
|
3
sq/params.go
Normal file
3
sq/params.go
Normal file
@@ -0,0 +1,3 @@
|
||||
package sq
|
||||
|
||||
type PP map[string]any
|
12
sq/queryable.go
Normal file
12
sq/queryable.go
Normal file
@@ -0,0 +1,12 @@
|
||||
package sq
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
type Queryable interface {
|
||||
Exec(ctx context.Context, sql string, prep PP) (sql.Result, error)
|
||||
Query(ctx context.Context, sql string, prep PP) (*sqlx.Rows, error)
|
||||
}
|
52
sq/scanner.go
Normal file
52
sq/scanner.go
Normal file
@@ -0,0 +1,52 @@
|
||||
package sq
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
func ScanSingle[TData any](rows *sqlx.Rows, close bool) (TData, error) {
|
||||
if rows.Next() {
|
||||
var data TData
|
||||
err := rows.StructScan(&data)
|
||||
if err != nil {
|
||||
return *new(TData), err
|
||||
}
|
||||
if rows.Next() {
|
||||
_ = rows.Close()
|
||||
return *new(TData), errors.New("sql returned more than onw row")
|
||||
}
|
||||
if close {
|
||||
err = rows.Close()
|
||||
if err != nil {
|
||||
return *new(TData), err
|
||||
}
|
||||
}
|
||||
return data, nil
|
||||
} else {
|
||||
if close {
|
||||
_ = rows.Close()
|
||||
}
|
||||
return *new(TData), sql.ErrNoRows
|
||||
}
|
||||
}
|
||||
|
||||
func ScanAll[TData any](rows *sqlx.Rows, close bool) ([]TData, error) {
|
||||
res := make([]TData, 0)
|
||||
for rows.Next() {
|
||||
var data TData
|
||||
err := rows.StructScan(&data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
res = append(res, data)
|
||||
}
|
||||
if close {
|
||||
err := rows.Close()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return res, nil
|
||||
}
|
69
sq/transaction.go
Normal file
69
sq/transaction.go
Normal file
@@ -0,0 +1,69 @@
|
||||
package sq
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"github.com/jmoiron/sqlx"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
)
|
||||
|
||||
type Tx interface {
|
||||
Rollback() error
|
||||
Commit() error
|
||||
Exec(ctx context.Context, sql string, prep PP) (sql.Result, error)
|
||||
Query(ctx context.Context, sql string, prep PP) (*sqlx.Rows, error)
|
||||
}
|
||||
|
||||
type transaction struct {
|
||||
tx *sqlx.Tx
|
||||
id uint16
|
||||
lstr Listener
|
||||
}
|
||||
|
||||
func NewTransaction(xtx *sqlx.Tx, txid uint16, lstr Listener) Tx {
|
||||
return &transaction{
|
||||
tx: xtx,
|
||||
id: txid,
|
||||
lstr: lstr,
|
||||
}
|
||||
}
|
||||
|
||||
func (tx *transaction) Rollback() error {
|
||||
if tx.lstr != nil {
|
||||
tx.lstr.OnTxRollback(tx.id)
|
||||
}
|
||||
|
||||
return tx.tx.Rollback()
|
||||
}
|
||||
|
||||
func (tx *transaction) Commit() error {
|
||||
if tx.lstr != nil {
|
||||
tx.lstr.OnTxCommit(tx.id)
|
||||
}
|
||||
|
||||
return tx.tx.Commit()
|
||||
}
|
||||
|
||||
func (tx *transaction) Exec(ctx context.Context, sql string, prep PP) (sql.Result, error) {
|
||||
if tx.lstr != nil {
|
||||
tx.lstr.OnExec(langext.Ptr(tx.id), sql, &prep)
|
||||
}
|
||||
|
||||
res, err := tx.tx.NamedExecContext(ctx, sql, prep)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (tx *transaction) Query(ctx context.Context, sql string, prep PP) (*sqlx.Rows, error) {
|
||||
if tx.lstr != nil {
|
||||
tx.lstr.OnQuery(langext.Ptr(tx.id), sql, &prep)
|
||||
}
|
||||
|
||||
rows, err := sqlx.NamedQueryContext(ctx, tx.tx, sql, prep)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return rows, nil
|
||||
}
|
104
syncext/atomic.go
Normal file
104
syncext/atomic.go
Normal file
@@ -0,0 +1,104 @@
|
||||
package syncext
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
)
|
||||
|
||||
type AtomicBool struct {
|
||||
v int32
|
||||
waiter chan bool // unbuffered
|
||||
}
|
||||
|
||||
func NewAtomicBool(value bool) *AtomicBool {
|
||||
if value {
|
||||
return &AtomicBool{v: 1, waiter: make(chan bool)}
|
||||
} else {
|
||||
return &AtomicBool{v: 0, waiter: make(chan bool)}
|
||||
}
|
||||
}
|
||||
|
||||
func (a *AtomicBool) Get() bool {
|
||||
return atomic.LoadInt32(&a.v) == 1
|
||||
}
|
||||
|
||||
func (a *AtomicBool) Set(value bool) {
|
||||
if value {
|
||||
atomic.StoreInt32(&a.v, 1)
|
||||
} else {
|
||||
atomic.StoreInt32(&a.v, 0)
|
||||
}
|
||||
|
||||
select {
|
||||
case a.waiter <- value:
|
||||
// message sent
|
||||
default:
|
||||
// no receiver on channel
|
||||
}
|
||||
}
|
||||
|
||||
func (a *AtomicBool) Wait(waitFor bool) {
|
||||
if a.Get() == waitFor {
|
||||
return
|
||||
}
|
||||
|
||||
for {
|
||||
if v, ok := ReadChannelWithTimeout(a.waiter, 128*time.Millisecond); ok {
|
||||
if v == waitFor {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
if a.Get() == waitFor {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (a *AtomicBool) WaitWithTimeout(timeout time.Duration, waitFor bool) error {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
||||
defer cancel()
|
||||
return a.WaitWithContext(ctx, waitFor)
|
||||
}
|
||||
|
||||
func (a *AtomicBool) WaitWithContext(ctx context.Context, waitFor bool) error {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if a.Get() == waitFor {
|
||||
return nil
|
||||
}
|
||||
|
||||
for {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
timeOut := 128 * time.Millisecond
|
||||
|
||||
if dl, ok := ctx.Deadline(); ok {
|
||||
timeOutMax := dl.Sub(time.Now())
|
||||
if timeOutMax <= 0 {
|
||||
timeOut = 0
|
||||
} else if 0 < timeOutMax && timeOutMax < timeOut {
|
||||
timeOut = timeOutMax
|
||||
}
|
||||
}
|
||||
|
||||
if v, ok := ReadChannelWithTimeout(a.waiter, timeOut); ok {
|
||||
if v == waitFor {
|
||||
return nil
|
||||
}
|
||||
} else {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if a.Get() == waitFor {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
45
syncext/channel.go
Normal file
45
syncext/channel.go
Normal file
@@ -0,0 +1,45 @@
|
||||
package syncext
|
||||
|
||||
import (
|
||||
"time"
|
||||
)
|
||||
|
||||
// https://gobyexample.com/non-blocking-channel-operations
|
||||
// https://gobyexample.com/timeouts
|
||||
// https://groups.google.com/g/golang-nuts/c/Oth9CmJPoqo
|
||||
|
||||
func ReadChannelWithTimeout[T any](c chan T, timeout time.Duration) (T, bool) {
|
||||
select {
|
||||
case msg := <-c:
|
||||
return msg, true
|
||||
case <-time.After(timeout):
|
||||
return *new(T), false
|
||||
}
|
||||
}
|
||||
|
||||
func WriteChannelWithTimeout[T any](c chan T, msg T, timeout time.Duration) bool {
|
||||
select {
|
||||
case c <- msg:
|
||||
return true
|
||||
case <-time.After(timeout):
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func ReadNonBlocking[T any](c chan T) (T, bool) {
|
||||
select {
|
||||
case msg := <-c:
|
||||
return msg, true
|
||||
default:
|
||||
return *new(T), false
|
||||
}
|
||||
}
|
||||
|
||||
func WriteNonBlocking[T any](c chan T, msg T) bool {
|
||||
select {
|
||||
case c <- msg:
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
121
syncext/channel_test.go
Normal file
121
syncext/channel_test.go
Normal file
@@ -0,0 +1,121 @@
|
||||
package syncext
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestTimeoutReadBuffered(t *testing.T) {
|
||||
c := make(chan int, 1)
|
||||
|
||||
go func() {
|
||||
time.Sleep(200 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if ok {
|
||||
t.Error("Read success, but should timeout")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTimeoutReadBigBuffered(t *testing.T) {
|
||||
c := make(chan int, 128)
|
||||
|
||||
go func() {
|
||||
time.Sleep(200 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if ok {
|
||||
t.Error("Read success, but should timeout")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTimeoutReadUnbuffered(t *testing.T) {
|
||||
c := make(chan int)
|
||||
|
||||
go func() {
|
||||
time.Sleep(200 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if ok {
|
||||
t.Error("Read success, but should timeout")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNoTimeoutAfterStartReadBuffered(t *testing.T) {
|
||||
c := make(chan int, 1)
|
||||
|
||||
go func() {
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if !ok {
|
||||
t.Error("Read timeout, but should have succeeded")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNoTimeoutAfterStartReadBigBuffered(t *testing.T) {
|
||||
c := make(chan int, 128)
|
||||
|
||||
go func() {
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if !ok {
|
||||
t.Error("Read timeout, but should have succeeded")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNoTimeoutAfterStartReadUnbuffered(t *testing.T) {
|
||||
c := make(chan int)
|
||||
|
||||
go func() {
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if !ok {
|
||||
t.Error("Read timeout, but should have succeeded")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestNoTimeoutBeforeStartReadBuffered(t *testing.T) {
|
||||
c := make(chan int, 1)
|
||||
|
||||
c <- 112
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 10*time.Millisecond)
|
||||
|
||||
if !ok {
|
||||
t.Error("Read timeout, but should have succeeded")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNoTimeoutBeforeStartReadBigBuffered(t *testing.T) {
|
||||
c := make(chan int, 128)
|
||||
|
||||
c <- 112
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 10*time.Millisecond)
|
||||
|
||||
if !ok {
|
||||
t.Error("Read timeout, but should have succeeded")
|
||||
}
|
||||
}
|
61
termext/colors.go
Normal file
61
termext/colors.go
Normal file
@@ -0,0 +1,61 @@
|
||||
package termext
|
||||
|
||||
import "strings"
|
||||
|
||||
const (
|
||||
colorReset = "\033[0m"
|
||||
colorRed = "\033[31m"
|
||||
colorGreen = "\033[32m"
|
||||
colorYellow = "\033[33m"
|
||||
colorBlue = "\033[34m"
|
||||
colorPurple = "\033[35m"
|
||||
colorCyan = "\033[36m"
|
||||
colorGray = "\033[37m"
|
||||
colorWhite = "\033[97m"
|
||||
)
|
||||
|
||||
func Red(v string) string {
|
||||
return colorRed + v + colorReset
|
||||
}
|
||||
|
||||
func Green(v string) string {
|
||||
return colorGreen + v + colorReset
|
||||
}
|
||||
|
||||
func Yellow(v string) string {
|
||||
return colorYellow + v + colorReset
|
||||
}
|
||||
|
||||
func Blue(v string) string {
|
||||
return colorBlue + v + colorReset
|
||||
}
|
||||
|
||||
func Purple(v string) string {
|
||||
return colorPurple + v + colorReset
|
||||
}
|
||||
|
||||
func Cyan(v string) string {
|
||||
return colorCyan + v + colorReset
|
||||
}
|
||||
|
||||
func Gray(v string) string {
|
||||
return colorGray + v + colorReset
|
||||
}
|
||||
|
||||
func White(v string) string {
|
||||
return colorWhite + v + colorReset
|
||||
}
|
||||
|
||||
func CleanString(v string) string {
|
||||
v = strings.ReplaceAll(v, colorReset, "")
|
||||
v = strings.ReplaceAll(v, colorRed, "")
|
||||
v = strings.ReplaceAll(v, colorGreen, "")
|
||||
v = strings.ReplaceAll(v, colorYellow, "")
|
||||
v = strings.ReplaceAll(v, colorBlue, "")
|
||||
v = strings.ReplaceAll(v, colorPurple, "")
|
||||
v = strings.ReplaceAll(v, colorCyan, "")
|
||||
v = strings.ReplaceAll(v, colorGray, "")
|
||||
v = strings.ReplaceAll(v, colorWhite, "")
|
||||
|
||||
return v
|
||||
}
|
5
termext/osutil_darwin.go
Normal file
5
termext/osutil_darwin.go
Normal file
@@ -0,0 +1,5 @@
|
||||
package termext
|
||||
|
||||
func enableColor() bool {
|
||||
return true
|
||||
}
|
5
termext/osutil_freebsd.go
Normal file
5
termext/osutil_freebsd.go
Normal file
@@ -0,0 +1,5 @@
|
||||
package termext
|
||||
|
||||
func enableColor() bool {
|
||||
return true
|
||||
}
|
5
termext/osutil_linux.go
Normal file
5
termext/osutil_linux.go
Normal file
@@ -0,0 +1,5 @@
|
||||
package termext
|
||||
|
||||
func enableColor() bool {
|
||||
return true
|
||||
}
|
5
termext/osutil_netbsd.go
Normal file
5
termext/osutil_netbsd.go
Normal file
@@ -0,0 +1,5 @@
|
||||
package termext
|
||||
|
||||
func enableColor() bool {
|
||||
return true
|
||||
}
|
5
termext/osutil_openbsd.go
Normal file
5
termext/osutil_openbsd.go
Normal file
@@ -0,0 +1,5 @@
|
||||
package termext
|
||||
|
||||
func enableColor() bool {
|
||||
return true
|
||||
}
|
26
termext/osutil_windows.go
Normal file
26
termext/osutil_windows.go
Normal file
@@ -0,0 +1,26 @@
|
||||
package termext
|
||||
|
||||
import "golang.org/x/sys/windows"
|
||||
|
||||
func enableColor() bool {
|
||||
handle, err := windows.GetStdHandle(windows.STD_OUTPUT_HANDLE)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
var mode uint32
|
||||
err = windows.GetConsoleMode(handle, &mode)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
if mode&windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING != windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING {
|
||||
mode = mode | windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING
|
||||
err = windows.SetConsoleMode(handle, mode)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
90
termext/termcolor.go
Normal file
90
termext/termcolor.go
Normal file
@@ -0,0 +1,90 @@
|
||||
package termext
|
||||
|
||||
import (
|
||||
"golang.org/x/term"
|
||||
"os"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// -> partly copied from [ https://github.com/jwalton/go-supportscolor/tree/master ]
|
||||
|
||||
func SupportsColors() bool {
|
||||
|
||||
if isatty := term.IsTerminal(int(os.Stdout.Fd())); !isatty {
|
||||
return false
|
||||
}
|
||||
|
||||
termenv := os.Getenv("TERM")
|
||||
|
||||
if termenv == "dumb" {
|
||||
return false
|
||||
}
|
||||
|
||||
if osColorEnabled := enableColor(); !osColorEnabled {
|
||||
return false
|
||||
}
|
||||
|
||||
if _, ci := os.LookupEnv("CI"); ci {
|
||||
var ciEnvNames = []string{"TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "GITHUB_ACTIONS", "BUILDKITE", "DRONE"}
|
||||
for _, ciEnvName := range ciEnvNames {
|
||||
_, exists := os.LookupEnv(ciEnvName)
|
||||
if exists {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
if os.Getenv("CI_NAME") == "codeship" {
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
if teamCityVersion, isTeamCity := os.LookupEnv("TEAMCITY_VERSION"); isTeamCity {
|
||||
versionRegex := regexp.MustCompile(`^(9\.(0*[1-9]\d*)\.|\d{2,}\.)`)
|
||||
if versionRegex.MatchString(teamCityVersion) {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
if os.Getenv("COLORTERM") == "truecolor" {
|
||||
return true
|
||||
}
|
||||
|
||||
if termProgram, termProgramPreset := os.LookupEnv("TERM_PROGRAM"); termProgramPreset {
|
||||
switch termProgram {
|
||||
case "iTerm.app":
|
||||
termProgramVersion := strings.Split(os.Getenv("TERM_PROGRAM_VERSION"), ".")
|
||||
version, err := strconv.ParseInt(termProgramVersion[0], 10, 64)
|
||||
if err == nil && version >= 3 {
|
||||
return true
|
||||
}
|
||||
return true
|
||||
case "Apple_Terminal":
|
||||
return true
|
||||
|
||||
default:
|
||||
// No default
|
||||
}
|
||||
}
|
||||
|
||||
var term256Regex = regexp.MustCompile("(?i)-256(color)?$")
|
||||
if term256Regex.MatchString(termenv) {
|
||||
return true
|
||||
}
|
||||
|
||||
var termBasicRegex = regexp.MustCompile("(?i)^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux")
|
||||
|
||||
if termBasicRegex.MatchString(termenv) {
|
||||
return true
|
||||
}
|
||||
|
||||
if _, colorTerm := os.LookupEnv("COLORTERM"); colorTerm {
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
40
termext/termcolor_test.go
Normal file
40
termext/termcolor_test.go
Normal file
@@ -0,0 +1,40 @@
|
||||
package termext
|
||||
|
||||
import (
|
||||
"math/rand"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func init() {
|
||||
rand.Seed(0)
|
||||
}
|
||||
|
||||
func TestSupportsColors(t *testing.T) {
|
||||
SupportsColors() // should not error
|
||||
}
|
||||
|
||||
func TestColor(t *testing.T) {
|
||||
assertEqual(t, Red("test"), "\033[31mtest\u001B[0m")
|
||||
assertEqual(t, Green("test"), "\033[32mtest\u001B[0m")
|
||||
assertEqual(t, Yellow("test"), "\033[33mtest\u001B[0m")
|
||||
assertEqual(t, Blue("test"), "\033[34mtest\u001B[0m")
|
||||
assertEqual(t, Purple("test"), "\033[35mtest\u001B[0m")
|
||||
assertEqual(t, Cyan("test"), "\033[36mtest\u001B[0m")
|
||||
assertEqual(t, Gray("test"), "\033[37mtest\u001B[0m")
|
||||
assertEqual(t, White("test"), "\033[97mtest\u001B[0m")
|
||||
|
||||
assertEqual(t, CleanString(Red("test")), "test")
|
||||
assertEqual(t, CleanString(Green("test")), "test")
|
||||
assertEqual(t, CleanString(Yellow("test")), "test")
|
||||
assertEqual(t, CleanString(Blue("test")), "test")
|
||||
assertEqual(t, CleanString(Purple("test")), "test")
|
||||
assertEqual(t, CleanString(Cyan("test")), "test")
|
||||
assertEqual(t, CleanString(Gray("test")), "test")
|
||||
assertEqual(t, CleanString(White("test")), "test")
|
||||
}
|
||||
|
||||
func assertEqual(t *testing.T, actual string, expected string) {
|
||||
if actual != expected {
|
||||
t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected)
|
||||
}
|
||||
}
|
@@ -1,55 +1,68 @@
|
||||
package timeext
|
||||
|
||||
import "time"
|
||||
import (
|
||||
"fmt"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"time"
|
||||
)
|
||||
|
||||
func FromSeconds(v int) time.Duration {
|
||||
return time.Duration(int64(v) * int64(time.Second))
|
||||
func FromNanoseconds[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Nanosecond)))
|
||||
}
|
||||
|
||||
func FromSecondsInt32(v int32) time.Duration {
|
||||
return time.Duration(int64(v) * int64(time.Second))
|
||||
func FromMicroseconds[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Microsecond)))
|
||||
}
|
||||
|
||||
func FromSecondsInt64(v int64) time.Duration {
|
||||
return time.Duration(v * int64(time.Second))
|
||||
func FromMilliseconds[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Millisecond)))
|
||||
}
|
||||
|
||||
func FromSecondsFloat32(v float32) time.Duration {
|
||||
return time.Duration(int64(v * float32(time.Second)))
|
||||
func FromSeconds[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Second)))
|
||||
}
|
||||
|
||||
func FromSecondsFloat64(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Second)))
|
||||
func FromMinutes[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Minute)))
|
||||
}
|
||||
|
||||
func FromSecondsFloat(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Second)))
|
||||
func FromHours[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Hour)))
|
||||
}
|
||||
|
||||
func FromMinutes(v int) time.Duration {
|
||||
return time.Duration(int64(v) * int64(time.Minute))
|
||||
func FromDays[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(24) * float64(time.Hour)))
|
||||
}
|
||||
|
||||
func FromMinutesFloat(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Minute)))
|
||||
func FormatNaturalDurationEnglish(iv time.Duration) string {
|
||||
if sec := int64(iv.Seconds()); sec < 180 {
|
||||
if sec == 1 {
|
||||
return "1 second ago"
|
||||
} else {
|
||||
return fmt.Sprintf("%d seconds ago", sec)
|
||||
}
|
||||
}
|
||||
|
||||
func FromMinutesFloat64(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Minute)))
|
||||
if min := int64(iv.Minutes()); min < 180 {
|
||||
return fmt.Sprintf("%d minutes ago", min)
|
||||
}
|
||||
|
||||
func FromHoursFloat64(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Hour)))
|
||||
if hours := int64(iv.Hours()); hours < 72 {
|
||||
return fmt.Sprintf("%d hours ago", hours)
|
||||
}
|
||||
|
||||
func FromDays(v int) time.Duration {
|
||||
return time.Duration(int64(v) * int64(24) * int64(time.Hour))
|
||||
if days := int64(iv.Hours() / 24.0); days < 21 {
|
||||
return fmt.Sprintf("%d days ago", days)
|
||||
}
|
||||
|
||||
func FromMilliseconds(v int) time.Duration {
|
||||
return time.Duration(int64(v) * int64(time.Millisecond))
|
||||
if weeks := int64(iv.Hours() / 24.0 / 7.0); weeks < 12 {
|
||||
return fmt.Sprintf("%d weeks ago", weeks)
|
||||
}
|
||||
|
||||
func FromMillisecondsFloat(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Millisecond)))
|
||||
if months := int64(iv.Hours() / 24.0 / 7.0 / 30); months < 36 {
|
||||
return fmt.Sprintf("%d months ago", months)
|
||||
}
|
||||
|
||||
years := int64(iv.Hours() / 24.0 / 7.0 / 365)
|
||||
return fmt.Sprintf("%d years ago", years)
|
||||
}
|
||||
|
152
timeext/parser.go
Normal file
152
timeext/parser.go
Normal file
@@ -0,0 +1,152 @@
|
||||
package timeext
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
var durationShortStringMap = map[string]time.Duration{
|
||||
"ns": time.Nanosecond,
|
||||
"nanosecond": time.Nanosecond,
|
||||
"nanoseconds": time.Nanosecond,
|
||||
|
||||
"us": time.Microsecond,
|
||||
"microsecond": time.Microsecond,
|
||||
"microseconds": time.Microsecond,
|
||||
|
||||
"ms": time.Millisecond,
|
||||
"millisecond": time.Millisecond,
|
||||
"milliseconds": time.Millisecond,
|
||||
|
||||
"s": time.Second,
|
||||
"sec": time.Second,
|
||||
"second": time.Second,
|
||||
"seconds": time.Second,
|
||||
|
||||
"m": time.Minute,
|
||||
"min": time.Minute,
|
||||
"minute": time.Minute,
|
||||
"minutes": time.Minute,
|
||||
|
||||
"h": time.Hour,
|
||||
"hour": time.Hour,
|
||||
"hours": time.Hour,
|
||||
|
||||
"d": 24 * time.Hour,
|
||||
"day": 24 * time.Hour,
|
||||
"days": 24 * time.Hour,
|
||||
|
||||
"w": 7 * 24 * time.Hour,
|
||||
"wk": 7 * 24 * time.Hour,
|
||||
"week": 7 * 24 * time.Hour,
|
||||
"weeks": 7 * 24 * time.Hour,
|
||||
}
|
||||
|
||||
// ParseDurationShortString parses a duration in string format to a time.Duration
|
||||
// Examples for allowed formats:
|
||||
// - '10m'
|
||||
// - '10min'
|
||||
// - '1minute'
|
||||
// - '10minutes'
|
||||
// - '10.5minutes'
|
||||
// - '50s'
|
||||
// - '50sec'
|
||||
// - '1second'
|
||||
// - '50seconds'
|
||||
// - '100ms'
|
||||
// - '100millisseconds'
|
||||
// - '1h'
|
||||
// - '1hour'
|
||||
// - '2hours'
|
||||
// - '1d'
|
||||
// - '1day'
|
||||
// - '10days'
|
||||
// - '1d10m'
|
||||
// - '1d10m200sec'
|
||||
// - '1d:10m'
|
||||
// - '1d 10m'
|
||||
// - '1d,10m'
|
||||
func ParseDurationShortString(s string) (time.Duration, error) {
|
||||
s = strings.ToLower(s)
|
||||
|
||||
segments := make([]string, 0)
|
||||
collector := ""
|
||||
|
||||
prevWasNum := true
|
||||
for _, chr := range s {
|
||||
if chr >= '0' && chr <= '9' || chr == '.' {
|
||||
if prevWasNum {
|
||||
collector += string(chr)
|
||||
} else {
|
||||
segments = append(segments, collector)
|
||||
prevWasNum = true
|
||||
collector = string(chr)
|
||||
}
|
||||
} else if chr == ' ' || chr == ':' || chr == ',' {
|
||||
continue
|
||||
} else if chr >= 'a' && chr <= 'z' {
|
||||
prevWasNum = false
|
||||
collector += string(chr)
|
||||
} else {
|
||||
return 0, errors.New("unexpected character: " + string(chr))
|
||||
}
|
||||
}
|
||||
if !prevWasNum {
|
||||
segments = append(segments, collector)
|
||||
}
|
||||
|
||||
result := time.Duration(0)
|
||||
for _, seg := range segments {
|
||||
segDur, err := parseDurationShortStringSegment(seg)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
result += segDur
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func parseDurationShortStringSegment(segment string) (time.Duration, error) {
|
||||
num := ""
|
||||
unit := ""
|
||||
|
||||
part0 := true
|
||||
for _, chr := range segment {
|
||||
if part0 {
|
||||
|
||||
if chr >= 'a' && chr <= 'z' {
|
||||
part0 = false
|
||||
unit += string(chr)
|
||||
} else if chr >= '0' && chr <= '9' || chr == '.' {
|
||||
num += string(chr)
|
||||
} else {
|
||||
return 0, errors.New(fmt.Sprintf("Unexpected character '%s' in segment [%s]", string(chr), segment))
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
if chr >= 'a' && chr <= 'z' {
|
||||
unit += string(chr)
|
||||
} else if chr >= '0' && chr <= '9' || chr == '.' {
|
||||
return 0, errors.New(fmt.Sprintf("Unexpected number '%s' in segment [%s]", string(chr), segment))
|
||||
} else {
|
||||
return 0, errors.New(fmt.Sprintf("Unexpected character '%s' in segment [%s]", string(chr), segment))
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
fpnum, err := strconv.ParseFloat(num, 64)
|
||||
if err != nil {
|
||||
return 0, errors.New(fmt.Sprintf("Failed to parse floating-point number '%s' in segment [%s]", num, segment))
|
||||
}
|
||||
|
||||
if mult, ok := durationShortStringMap[unit]; ok {
|
||||
return time.Duration(int64(fpnum * float64(mult))), nil
|
||||
} else {
|
||||
return 0, errors.New(fmt.Sprintf("Unknown unit '%s' in segment [%s]", unit, segment))
|
||||
}
|
||||
}
|
70
timeext/parser_test.go
Normal file
70
timeext/parser_test.go
Normal file
@@ -0,0 +1,70 @@
|
||||
package timeext
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestParseDurationShortString(t *testing.T) {
|
||||
|
||||
assertPDSSEqual(t, FromSeconds(1), "1s")
|
||||
assertPDSSEqual(t, FromSeconds(1), "1sec")
|
||||
assertPDSSEqual(t, FromSeconds(1), "1second")
|
||||
assertPDSSEqual(t, FromSeconds(1), "1seconds")
|
||||
assertPDSSEqual(t, FromSeconds(100), "100second")
|
||||
assertPDSSEqual(t, FromSeconds(100), "100seconds")
|
||||
assertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77second")
|
||||
assertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77seconds")
|
||||
assertPDSSEqual(t, FromSeconds(50), "50s")
|
||||
assertPDSSEqual(t, FromSeconds(50), "50sec")
|
||||
assertPDSSEqual(t, FromSeconds(1), "1second")
|
||||
assertPDSSEqual(t, FromSeconds(50), "50seconds")
|
||||
|
||||
assertPDSSEqual(t, FromMinutes(10), "10m")
|
||||
assertPDSSEqual(t, FromMinutes(10), "10min")
|
||||
assertPDSSEqual(t, FromMinutes(1), "1minute")
|
||||
assertPDSSEqual(t, FromMinutes(10), "10minutes")
|
||||
assertPDSSEqual(t, FromMinutes(10.5), "10.5minutes")
|
||||
|
||||
assertPDSSEqual(t, FromMilliseconds(100), "100ms")
|
||||
assertPDSSEqual(t, FromMilliseconds(100), "100milliseconds")
|
||||
assertPDSSEqual(t, FromMilliseconds(100), "100millisecond")
|
||||
|
||||
assertPDSSEqual(t, FromNanoseconds(99235), "99235ns")
|
||||
assertPDSSEqual(t, FromNanoseconds(99235), "99235nanoseconds")
|
||||
assertPDSSEqual(t, FromNanoseconds(99235), "99235nanosecond")
|
||||
|
||||
assertPDSSEqual(t, FromMicroseconds(99235), "99235us")
|
||||
assertPDSSEqual(t, FromMicroseconds(99235), "99235microseconds")
|
||||
assertPDSSEqual(t, FromMicroseconds(99235), "99235microsecond")
|
||||
|
||||
assertPDSSEqual(t, FromHours(1), "1h")
|
||||
assertPDSSEqual(t, FromHours(1), "1hour")
|
||||
assertPDSSEqual(t, FromHours(2), "2hours")
|
||||
|
||||
assertPDSSEqual(t, FromDays(1), "1d")
|
||||
assertPDSSEqual(t, FromDays(1), "1day")
|
||||
assertPDSSEqual(t, FromDays(10), "10days")
|
||||
assertPDSSEqual(t, FromDays(1), "1days")
|
||||
assertPDSSEqual(t, FromDays(10), "10day")
|
||||
|
||||
assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d10m")
|
||||
assertPDSSEqual(t, FromDays(1)+FromMinutes(10)+FromSeconds(200), "1d10m200sec")
|
||||
assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d:10m")
|
||||
assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d 10m")
|
||||
assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d,10m")
|
||||
assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d, 10m")
|
||||
assertPDSSEqual(t, FromDays(1)+FromSeconds(1000), "1d 1000seconds")
|
||||
|
||||
assertPDSSEqual(t, FromDays(1), "86400s")
|
||||
}
|
||||
|
||||
func assertPDSSEqual(t *testing.T, expected time.Duration, fmt string) {
|
||||
actual, err := ParseDurationShortString(fmt)
|
||||
if err != nil {
|
||||
t.Errorf("ParseDurationShortString('%s') failed with %v", fmt, err)
|
||||
}
|
||||
if actual != expected {
|
||||
t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual.String(), expected.String())
|
||||
}
|
||||
}
|
@@ -17,14 +17,14 @@ func init() {
|
||||
}
|
||||
|
||||
// TimeToDatePart returns a timestamp at the start of the day which contains t (= 00:00:00)
|
||||
func TimeToDatePart(t time.Time) time.Time {
|
||||
t = t.In(TimezoneBerlin)
|
||||
func TimeToDatePart(t time.Time, tz *time.Location) time.Time {
|
||||
t = t.In(tz)
|
||||
return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location())
|
||||
}
|
||||
|
||||
// TimeToWeekStart returns a timestamp at the start of the week which contains t (= Monday 00:00:00)
|
||||
func TimeToWeekStart(t time.Time) time.Time {
|
||||
t = TimeToDatePart(t)
|
||||
func TimeToWeekStart(t time.Time, tz *time.Location) time.Time {
|
||||
t = TimeToDatePart(t, tz)
|
||||
|
||||
delta := time.Duration(((int64(t.Weekday()) + 6) % 7) * 24 * int64(time.Hour))
|
||||
t = t.Add(-1 * delta)
|
||||
@@ -33,32 +33,32 @@ func TimeToWeekStart(t time.Time) time.Time {
|
||||
}
|
||||
|
||||
// TimeToMonthStart returns a timestamp at the start of the month which contains t (= yyyy-MM-00 00:00:00)
|
||||
func TimeToMonthStart(t time.Time) time.Time {
|
||||
t = t.In(TimezoneBerlin)
|
||||
func TimeToMonthStart(t time.Time, tz *time.Location) time.Time {
|
||||
t = t.In(tz)
|
||||
return time.Date(t.Year(), t.Month(), 1, 0, 0, 0, 0, t.Location())
|
||||
}
|
||||
|
||||
// TimeToMonthEnd returns a timestamp at the end of the month which contains t (= yyyy-MM-31 23:59:59.999999999)
|
||||
func TimeToMonthEnd(t time.Time) time.Time {
|
||||
return TimeToMonthStart(t).AddDate(0, 1, 0).Add(-1)
|
||||
func TimeToMonthEnd(t time.Time, tz *time.Location) time.Time {
|
||||
return TimeToMonthStart(t, tz).AddDate(0, 1, 0).Add(-1)
|
||||
}
|
||||
|
||||
// TimeToYearStart returns a timestamp at the start of the year which contains t (= yyyy-01-01 00:00:00)
|
||||
func TimeToYearStart(t time.Time) time.Time {
|
||||
t = t.In(TimezoneBerlin)
|
||||
func TimeToYearStart(t time.Time, tz *time.Location) time.Time {
|
||||
t = t.In(tz)
|
||||
return time.Date(t.Year(), 1, 1, 0, 0, 0, 0, t.Location())
|
||||
}
|
||||
|
||||
// TimeToYearEnd returns a timestamp at the end of the month which contains t (= yyyy-12-31 23:59:59.999999999)
|
||||
func TimeToYearEnd(t time.Time) time.Time {
|
||||
return TimeToYearStart(t).AddDate(1, 0, 0).Add(-1)
|
||||
func TimeToYearEnd(t time.Time, tz *time.Location) time.Time {
|
||||
return TimeToYearStart(t, tz).AddDate(1, 0, 0).Add(-1)
|
||||
}
|
||||
|
||||
// IsSameDayIncludingDateBoundaries returns true if t1 and t2 are part of the same day (TZ/Berlin), the boundaries of the day are
|
||||
// inclusive, this means 2021-09-15T00:00:00 is still part of the day 2021-09-14
|
||||
func IsSameDayIncludingDateBoundaries(t1 time.Time, t2 time.Time) bool {
|
||||
dp1 := TimeToDatePart(t1)
|
||||
dp2 := TimeToDatePart(t2)
|
||||
func IsSameDayIncludingDateBoundaries(t1 time.Time, t2 time.Time, tz *time.Location) bool {
|
||||
dp1 := TimeToDatePart(t1, tz)
|
||||
dp2 := TimeToDatePart(t2, tz)
|
||||
|
||||
if dp1.Equal(dp2) {
|
||||
return true
|
||||
@@ -72,9 +72,9 @@ func IsSameDayIncludingDateBoundaries(t1 time.Time, t2 time.Time) bool {
|
||||
}
|
||||
|
||||
// IsDatePartEqual returns true if a and b have the same date part (`yyyy`, `MM` and `dd`)
|
||||
func IsDatePartEqual(a time.Time, b time.Time) bool {
|
||||
yy1, mm1, dd1 := a.In(TimezoneBerlin).Date()
|
||||
yy2, mm2, dd2 := b.In(TimezoneBerlin).Date()
|
||||
func IsDatePartEqual(a time.Time, b time.Time, tz *time.Location) bool {
|
||||
yy1, mm1, dd1 := a.In(tz).Date()
|
||||
yy2, mm2, dd2 := b.In(tz).Date()
|
||||
|
||||
return yy1 == yy2 && mm1 == mm2 && dd1 == dd2
|
||||
}
|
||||
@@ -82,9 +82,9 @@ func IsDatePartEqual(a time.Time, b time.Time) bool {
|
||||
// WithTimePart returns a timestamp with the date-part (`yyyy`, `MM`, `dd`) from base
|
||||
// and the time (`HH`, `mm`, `ss`) from the parameter
|
||||
func WithTimePart(base time.Time, hour, minute, second int) time.Time {
|
||||
datepart := TimeToDatePart(base)
|
||||
datepart := TimeToDatePart(base, base.Location())
|
||||
|
||||
delta := time.Duration(hour*int(time.Hour) + minute*int(time.Minute) + second*int(time.Second))
|
||||
delta := time.Duration(int64(hour)*int64(time.Hour) + int64(minute)*int64(time.Minute) + int64(second)*int64(time.Second))
|
||||
|
||||
return datepart.Add(delta)
|
||||
}
|
||||
@@ -92,23 +92,23 @@ func WithTimePart(base time.Time, hour, minute, second int) time.Time {
|
||||
// CombineDateAndTime returns a timestamp with the date-part (`yyyy`, `MM`, `dd`) from the d parameter
|
||||
// and the time (`HH`, `mm`, `ss`) from the t parameter
|
||||
func CombineDateAndTime(d time.Time, t time.Time) time.Time {
|
||||
datepart := TimeToDatePart(d)
|
||||
datepart := TimeToDatePart(d, d.Location())
|
||||
|
||||
delta := time.Duration(t.Hour()*int(time.Hour) + t.Minute()*int(time.Minute) + t.Second()*int(time.Second) + t.Nanosecond()*int(time.Nanosecond))
|
||||
delta := time.Duration(int64(t.Hour())*int64(time.Hour) + int64(t.Minute())*int64(time.Minute) + int64(t.Second())*int64(time.Second) + int64(t.Nanosecond())*int64(time.Nanosecond))
|
||||
|
||||
return datepart.Add(delta)
|
||||
}
|
||||
|
||||
// IsSunday returns true if t is a sunday (in TZ/Berlin)
|
||||
func IsSunday(t time.Time) bool {
|
||||
if t.In(TimezoneBerlin).Weekday() == time.Sunday {
|
||||
func IsSunday(t time.Time, tz *time.Location) bool {
|
||||
if t.In(tz).Weekday() == time.Sunday {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func DurationFromTime(hours int, minutes int, seconds int) time.Duration {
|
||||
return time.Duration(hours*int(time.Hour) + minutes*int(time.Minute) + seconds*int(time.Second))
|
||||
return time.Duration(int64(hours)*int64(time.Hour) + int64(minutes)*int64(time.Minute) + int64(seconds)*int64(time.Second))
|
||||
}
|
||||
|
||||
func Min(a time.Time, b time.Time) time.Time {
|
||||
@@ -131,3 +131,7 @@ func UnixFloatSeconds(v float64) time.Time {
|
||||
sec, dec := math.Modf(v)
|
||||
return time.Unix(int64(sec), int64(dec*(1e9)))
|
||||
}
|
||||
|
||||
func FloorTime(t time.Time) time.Time {
|
||||
return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location())
|
||||
}
|
||||
|
Reference in New Issue
Block a user