Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
f3700a772d
|
|||
2c69b33547
|
|||
6a304b875a
|
|||
d12bf23b46
|
|||
52f7f6e690
|
|||
b1e3891256
|
|||
bdf5b53c20
|
|||
496c4e4f59
|
|||
deab986caf
|
|||
9d9a6f1c6e
|
|||
06a37f37b7
|
|||
b35d6ca0b0
|
|||
b643bded8a
|
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
|
||||
|
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)
|
||||
}
|
||||
}
|
2
go.mod
2
go.mod
@@ -6,3 +6,5 @@ require (
|
||||
golang.org/x/sys v0.1.0
|
||||
golang.org/x/term v0.1.0
|
||||
)
|
||||
|
||||
require github.com/jmoiron/sqlx v1.3.5 // indirect
|
||||
|
5
go.sum
5
go.sum
@@ -1,3 +1,8 @@
|
||||
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=
|
||||
|
@@ -163,6 +163,25 @@ func ArrLast[T comparable](arr []T, comp func(v T) bool) (T, bool) {
|
||||
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 {
|
||||
@@ -171,3 +190,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
|
||||
}
|
||||
|
@@ -7,3 +7,11 @@ func FormatBool(v bool, strTrue string, strFalse string) string {
|
||||
return strFalse
|
||||
}
|
||||
}
|
||||
|
||||
func Conditional[T any](v bool, resTrue T, resFalse T) T {
|
||||
if v {
|
||||
return resTrue
|
||||
} else {
|
||||
return resFalse
|
||||
}
|
||||
}
|
||||
|
@@ -29,3 +29,21 @@ func Min[T langext.OrderedConstraint](v1 T, v2 T) T {
|
||||
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
|
||||
}
|
||||
}
|
||||
|
88
sq/database.go
Normal file
88
sq/database.go
Normal file
@@ -0,0 +1,88 @@
|
||||
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)
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
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")
|
||||
}
|
||||
}
|
@@ -2,59 +2,36 @@ package timeext
|
||||
|
||||
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 FromMinutesFloat(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Minute)))
|
||||
}
|
||||
|
||||
func FromMinutesFloat64(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Minute)))
|
||||
}
|
||||
|
||||
func FromHoursFloat64(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Hour)))
|
||||
}
|
||||
|
||||
func FromDays(v int) time.Duration {
|
||||
return time.Duration(int64(v) * int64(24) * int64(time.Hour))
|
||||
}
|
||||
|
||||
func FromMilliseconds(v int) time.Duration {
|
||||
return time.Duration(int64(v) * int64(time.Millisecond))
|
||||
}
|
||||
|
||||
func FromMillisecondsFloat(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Millisecond)))
|
||||
func FromDays[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(24) * float64(time.Hour)))
|
||||
}
|
||||
|
||||
func FormatNaturalDurationEnglish(iv time.Duration) string {
|
||||
|
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())
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user