Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
34e6d1819d
|
|||
87fa6021e4
|
|||
297d6c52a8
|
|||
b9c46947d2
|
|||
412277b3e0
|
|||
e46f8019ec
|
|||
ae952b2166
|
1
.idea/inspectionProfiles/Project_Default.xml
generated
1
.idea/inspectionProfiles/Project_Default.xml
generated
@@ -1,6 +1,7 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="GoMixedReceiverTypes" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="LanguageDetectionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
|
||||
<option name="processCode" value="true" />
|
||||
|
68
cryptext/aes.go
Normal file
68
cryptext/aes.go
Normal file
@@ -0,0 +1,68 @@
|
||||
package cryptext
|
||||
|
||||
import (
|
||||
"crypto/aes"
|
||||
"crypto/cipher"
|
||||
"crypto/rand"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"golang.org/x/crypto/scrypt"
|
||||
"io"
|
||||
)
|
||||
|
||||
// https://stackoverflow.com/a/18819040/1761622
|
||||
|
||||
func EncryptAESSimple(password, text []byte) ([]byte, error) {
|
||||
|
||||
key, err := scrypt.Key(password, nil, 32768, 8, 1, 32) // this is not 100% correct, rounds too low and salt is missing
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
block, err := aes.NewCipher(key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
b := base64.StdEncoding.EncodeToString(text)
|
||||
ciphertext := make([]byte, aes.BlockSize+len(b))
|
||||
|
||||
iv := ciphertext[:aes.BlockSize]
|
||||
if _, err := io.ReadFull(rand.Reader, iv); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
cfb := cipher.NewCFBEncrypter(block, iv)
|
||||
cfb.XORKeyStream(ciphertext[aes.BlockSize:], []byte(b))
|
||||
|
||||
return ciphertext, nil
|
||||
}
|
||||
|
||||
func DecryptAESSimple(password, text []byte) ([]byte, error) {
|
||||
|
||||
key, err := scrypt.Key(password, nil, 32768, 8, 1, 32) // this is not 100% correct, rounds too low and salt is missing
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
block, err := aes.NewCipher(key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(text) < aes.BlockSize {
|
||||
return nil, errors.New("ciphertext too short")
|
||||
}
|
||||
|
||||
iv := text[:aes.BlockSize]
|
||||
text = text[aes.BlockSize:]
|
||||
cfb := cipher.NewCFBDecrypter(block, iv)
|
||||
cfb.XORKeyStream(text, text)
|
||||
|
||||
data, err := base64.StdEncoding.DecodeString(string(text))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return data, nil
|
||||
}
|
22
cryptext/aes_test.go
Normal file
22
cryptext/aes_test.go
Normal file
@@ -0,0 +1,22 @@
|
||||
package cryptext
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestEncryptAESSimple(t *testing.T) {
|
||||
|
||||
pw := []byte("hunter12")
|
||||
|
||||
str1 := []byte("Hello World")
|
||||
|
||||
str2, err := EncryptAESSimple(pw, str1)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
str3, err := DecryptAESSimple(pw, str2)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
assertEqual(t, string(str1), string(str3))
|
||||
}
|
116
dataext/stack.go
Normal file
116
dataext/stack.go
Normal file
@@ -0,0 +1,116 @@
|
||||
package dataext
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"sync"
|
||||
)
|
||||
|
||||
var ErrEmptyStack = errors.New("stack is empty")
|
||||
|
||||
type Stack[T any] struct {
|
||||
lock *sync.Mutex
|
||||
data []T
|
||||
}
|
||||
|
||||
func NewStack[T any](threadsafe bool, initialCapacity int) *Stack[T] {
|
||||
var lck *sync.Mutex = nil
|
||||
if threadsafe {
|
||||
lck = &sync.Mutex{}
|
||||
}
|
||||
return &Stack[T]{
|
||||
lock: lck,
|
||||
data: make([]T, 0, initialCapacity),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Stack[T]) Push(v T) {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
s.data = append(s.data, v)
|
||||
}
|
||||
|
||||
func (s *Stack[T]) Pop() (T, error) {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
l := len(s.data)
|
||||
if l == 0 {
|
||||
return *new(T), ErrEmptyStack
|
||||
}
|
||||
|
||||
result := s.data[l-1]
|
||||
s.data = s.data[:l-1]
|
||||
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (s *Stack[T]) OptPop() *T {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
l := len(s.data)
|
||||
if l == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
result := s.data[l-1]
|
||||
s.data = s.data[:l-1]
|
||||
|
||||
return langext.Ptr(result)
|
||||
}
|
||||
|
||||
func (s *Stack[T]) Peek() (T, error) {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
l := len(s.data)
|
||||
|
||||
if l == 0 {
|
||||
return *new(T), ErrEmptyStack
|
||||
}
|
||||
|
||||
return s.data[l-1], nil
|
||||
}
|
||||
|
||||
func (s *Stack[T]) OptPeek() *T {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
l := len(s.data)
|
||||
|
||||
if l == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
return langext.Ptr(s.data[l-1])
|
||||
}
|
||||
|
||||
func (s *Stack[T]) Length() int {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
return len(s.data)
|
||||
}
|
||||
|
||||
func (s *Stack[T]) Empty() bool {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
return len(s.data) == 0
|
||||
}
|
@@ -37,3 +37,21 @@ func IsSliceSorted[T any](arr []T, less func(v1, v2 T) bool) bool {
|
||||
return less(arr[i1], arr[i2])
|
||||
})
|
||||
}
|
||||
|
||||
func SortBy[TElem any, TSel OrderedConstraint](arr []TElem, selector func(v TElem) TSel) {
|
||||
sort.Slice(arr, func(i1, i2 int) bool {
|
||||
return selector(arr[i1]) < selector(arr[i2])
|
||||
})
|
||||
}
|
||||
|
||||
func SortByStable[TElem any, TSel OrderedConstraint](arr []TElem, selector func(v TElem) TSel) {
|
||||
sort.SliceStable(arr, func(i1, i2 int) bool {
|
||||
return selector(arr[i1]) < selector(arr[i2])
|
||||
})
|
||||
}
|
||||
|
||||
func IsSortedBy[TElem any, TSel OrderedConstraint](arr []TElem, selector func(v TElem) TSel) {
|
||||
sort.SliceStable(arr, func(i1, i2 int) bool {
|
||||
return selector(arr[i1]) < selector(arr[i2])
|
||||
})
|
||||
}
|
||||
|
45
rfctime/interface.go
Normal file
45
rfctime/interface.go
Normal file
@@ -0,0 +1,45 @@
|
||||
package rfctime
|
||||
|
||||
import "time"
|
||||
|
||||
type RFCTime interface {
|
||||
Time() time.Time
|
||||
Serialize() string
|
||||
|
||||
UnmarshalJSON(bytes []byte) error
|
||||
MarshalJSON() ([]byte, error)
|
||||
|
||||
MarshalBinary() ([]byte, error)
|
||||
UnmarshalBinary(data []byte) error
|
||||
|
||||
GobEncode() ([]byte, error)
|
||||
GobDecode(data []byte) error
|
||||
|
||||
MarshalText() ([]byte, error)
|
||||
UnmarshalText(data []byte) error
|
||||
|
||||
After(u RFCTime) bool
|
||||
Before(u RFCTime) bool
|
||||
Equal(u RFCTime) bool
|
||||
IsZero() bool
|
||||
Date() (year int, month time.Month, day int)
|
||||
Year() int
|
||||
Month() time.Month
|
||||
Day() int
|
||||
Weekday() time.Weekday
|
||||
ISOWeek() (year, week int)
|
||||
Clock() (hour, min, sec int)
|
||||
Hour() int
|
||||
Minute() int
|
||||
Second() int
|
||||
Nanosecond() int
|
||||
YearDay() int
|
||||
Sub(u RFCTime) time.Duration
|
||||
Unix() int64
|
||||
UnixMilli() int64
|
||||
UnixMicro() int64
|
||||
UnixNano() int64
|
||||
Format(layout string) string
|
||||
GoString() string
|
||||
String() string
|
||||
}
|
182
rfctime/rfc3339Nano.go
Normal file
182
rfctime/rfc3339Nano.go
Normal file
@@ -0,0 +1,182 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
)
|
||||
|
||||
type RFC3339NanoTime time.Time
|
||||
|
||||
func (t RFC3339NanoTime) Time() time.Time {
|
||||
return time.Time(t)
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) MarshalBinary() ([]byte, error) {
|
||||
return (time.Time)(t).MarshalBinary()
|
||||
}
|
||||
|
||||
func (t *RFC3339NanoTime) UnmarshalBinary(data []byte) error {
|
||||
return (*time.Time)(t).UnmarshalBinary(data)
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) GobEncode() ([]byte, error) {
|
||||
return (time.Time)(t).GobEncode()
|
||||
}
|
||||
|
||||
func (t *RFC3339NanoTime) GobDecode(data []byte) error {
|
||||
return (*time.Time)(t).GobDecode(data)
|
||||
}
|
||||
|
||||
func (t *RFC3339NanoTime) UnmarshalJSON(data []byte) error {
|
||||
str := ""
|
||||
if err := json.Unmarshal(data, &str); err != nil {
|
||||
return err
|
||||
}
|
||||
t0, err := time.Parse(t.FormatStr(), str)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = RFC3339NanoTime(t0)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) MarshalJSON() ([]byte, error) {
|
||||
str := t.Time().Format(t.FormatStr())
|
||||
return json.Marshal(str)
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) MarshalText() ([]byte, error) {
|
||||
b := make([]byte, 0, len(t.FormatStr()))
|
||||
return t.Time().AppendFormat(b, t.FormatStr()), nil
|
||||
}
|
||||
|
||||
func (t *RFC3339NanoTime) UnmarshalText(data []byte) error {
|
||||
var err error
|
||||
v, err := time.Parse(t.FormatStr(), string(data))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
tt := RFC3339NanoTime(v)
|
||||
*t = tt
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Serialize() string {
|
||||
return t.Time().Format(t.FormatStr())
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) FormatStr() string {
|
||||
return time.RFC3339Nano
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) After(u RFCTime) bool {
|
||||
return t.Time().After(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Before(u RFCTime) bool {
|
||||
return t.Time().Before(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Equal(u RFCTime) bool {
|
||||
return t.Time().Equal(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) IsZero() bool {
|
||||
return t.Time().IsZero()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Date() (year int, month time.Month, day int) {
|
||||
return t.Time().Date()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Year() int {
|
||||
return t.Time().Year()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Month() time.Month {
|
||||
return t.Time().Month()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Day() int {
|
||||
return t.Time().Day()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Weekday() time.Weekday {
|
||||
return t.Time().Weekday()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) ISOWeek() (year, week int) {
|
||||
return t.Time().ISOWeek()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Clock() (hour, min, sec int) {
|
||||
return t.Time().Clock()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Hour() int {
|
||||
return t.Time().Hour()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Minute() int {
|
||||
return t.Time().Minute()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Second() int {
|
||||
return t.Time().Second()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Nanosecond() int {
|
||||
return t.Time().Nanosecond()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) YearDay() int {
|
||||
return t.Time().YearDay()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Add(d time.Duration) RFC3339NanoTime {
|
||||
return RFC3339NanoTime(t.Time().Add(d))
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Sub(u RFCTime) time.Duration {
|
||||
return t.Time().Sub(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) AddDate(years int, months int, days int) RFC3339NanoTime {
|
||||
return RFC3339NanoTime(t.Time().AddDate(years, months, days))
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Unix() int64 {
|
||||
return t.Time().Unix()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) UnixMilli() int64 {
|
||||
return t.Time().UnixMilli()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) UnixMicro() int64 {
|
||||
return t.Time().UnixMicro()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) UnixNano() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Format(layout string) string {
|
||||
return t.Time().Format(layout)
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) GoString() string {
|
||||
return t.Time().GoString()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) String() string {
|
||||
return t.Time().String()
|
||||
}
|
||||
|
||||
func NewRFC3339Nano(t time.Time) RFC3339NanoTime {
|
||||
return RFC3339NanoTime(t)
|
||||
}
|
||||
|
||||
func NowRFC3339Nano() RFC3339NanoTime {
|
||||
return RFC3339NanoTime(time.Now())
|
||||
}
|
51
rfctime/rfc3339Nano_test.go
Normal file
51
rfctime/rfc3339Nano_test.go
Normal file
@@ -0,0 +1,51 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestRoundtrip(t *testing.T) {
|
||||
|
||||
type Wrap struct {
|
||||
Value RFC3339NanoTime `json:"v"`
|
||||
}
|
||||
|
||||
val1 := NewRFC3339Nano(time.Now())
|
||||
w1 := Wrap{val1}
|
||||
|
||||
jstr1, err := json.Marshal(w1)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
if string(jstr1) != "{\"v\":\"2023-01-29T20:32:36.149692117+01:00\"}" {
|
||||
t.Errorf("repr differs")
|
||||
}
|
||||
|
||||
w2 := Wrap{}
|
||||
|
||||
err = json.Unmarshal(jstr1, &w2)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
jstr2, err := json.Marshal(w2)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
assertEqual(t, string(jstr1), string(jstr2))
|
||||
|
||||
if !w1.Value.Equal(&w2.Value) {
|
||||
t.Errorf("time differs")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func assertEqual(t *testing.T, actual string, expected string) {
|
||||
if actual != expected {
|
||||
t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected)
|
||||
}
|
||||
}
|
176
rfctime/unix.go
Normal file
176
rfctime/unix.go
Normal file
@@ -0,0 +1,176 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
type UnixTime time.Time
|
||||
|
||||
func (t UnixTime) Time() time.Time {
|
||||
return time.Time(t)
|
||||
}
|
||||
|
||||
func (t UnixTime) MarshalBinary() ([]byte, error) {
|
||||
return (time.Time)(t).MarshalBinary()
|
||||
}
|
||||
|
||||
func (t *UnixTime) UnmarshalBinary(data []byte) error {
|
||||
return (*time.Time)(t).UnmarshalBinary(data)
|
||||
}
|
||||
|
||||
func (t UnixTime) GobEncode() ([]byte, error) {
|
||||
return (time.Time)(t).GobEncode()
|
||||
}
|
||||
|
||||
func (t *UnixTime) GobDecode(data []byte) error {
|
||||
return (*time.Time)(t).GobDecode(data)
|
||||
}
|
||||
|
||||
func (t *UnixTime) UnmarshalJSON(data []byte) error {
|
||||
str := ""
|
||||
if err := json.Unmarshal(data, &str); err != nil {
|
||||
return err
|
||||
}
|
||||
t0, err := strconv.ParseInt(str, 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixTime(time.Unix(t0, 0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixTime) MarshalJSON() ([]byte, error) {
|
||||
str := strconv.FormatInt(t.Time().Unix(), 10)
|
||||
return json.Marshal(str)
|
||||
}
|
||||
|
||||
func (t UnixTime) MarshalText() ([]byte, error) {
|
||||
return []byte(strconv.FormatInt(t.Time().Unix(), 10)), nil
|
||||
}
|
||||
|
||||
func (t *UnixTime) UnmarshalText(data []byte) error {
|
||||
t0, err := strconv.ParseInt(string(data), 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixTime(time.Unix(t0, 0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixTime) Serialize() string {
|
||||
return strconv.FormatInt(t.Time().Unix(), 10)
|
||||
}
|
||||
|
||||
func (t UnixTime) After(u RFCTime) bool {
|
||||
return t.Time().After(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixTime) Before(u RFCTime) bool {
|
||||
return t.Time().Before(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixTime) Equal(u RFCTime) bool {
|
||||
return t.Time().Equal(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixTime) IsZero() bool {
|
||||
return t.Time().IsZero()
|
||||
}
|
||||
|
||||
func (t UnixTime) Date() (year int, month time.Month, day int) {
|
||||
return t.Time().Date()
|
||||
}
|
||||
|
||||
func (t UnixTime) Year() int {
|
||||
return t.Time().Year()
|
||||
}
|
||||
|
||||
func (t UnixTime) Month() time.Month {
|
||||
return t.Time().Month()
|
||||
}
|
||||
|
||||
func (t UnixTime) Day() int {
|
||||
return t.Time().Day()
|
||||
}
|
||||
|
||||
func (t UnixTime) Weekday() time.Weekday {
|
||||
return t.Time().Weekday()
|
||||
}
|
||||
|
||||
func (t UnixTime) ISOWeek() (year, week int) {
|
||||
return t.Time().ISOWeek()
|
||||
}
|
||||
|
||||
func (t UnixTime) Clock() (hour, min, sec int) {
|
||||
return t.Time().Clock()
|
||||
}
|
||||
|
||||
func (t UnixTime) Hour() int {
|
||||
return t.Time().Hour()
|
||||
}
|
||||
|
||||
func (t UnixTime) Minute() int {
|
||||
return t.Time().Minute()
|
||||
}
|
||||
|
||||
func (t UnixTime) Second() int {
|
||||
return t.Time().Second()
|
||||
}
|
||||
|
||||
func (t UnixTime) Nanosecond() int {
|
||||
return t.Time().Nanosecond()
|
||||
}
|
||||
|
||||
func (t UnixTime) YearDay() int {
|
||||
return t.Time().YearDay()
|
||||
}
|
||||
|
||||
func (t UnixTime) Add(d time.Duration) UnixTime {
|
||||
return UnixTime(t.Time().Add(d))
|
||||
}
|
||||
|
||||
func (t UnixTime) Sub(u RFCTime) time.Duration {
|
||||
return t.Time().Sub(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixTime) AddDate(years int, months int, days int) UnixTime {
|
||||
return UnixTime(t.Time().AddDate(years, months, days))
|
||||
}
|
||||
|
||||
func (t UnixTime) Unix() int64 {
|
||||
return t.Time().Unix()
|
||||
}
|
||||
|
||||
func (t UnixTime) UnixMilli() int64 {
|
||||
return t.Time().UnixMilli()
|
||||
}
|
||||
|
||||
func (t UnixTime) UnixMicro() int64 {
|
||||
return t.Time().UnixMicro()
|
||||
}
|
||||
|
||||
func (t UnixTime) UnixNano() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t UnixTime) Format(layout string) string {
|
||||
return t.Time().Format(layout)
|
||||
}
|
||||
|
||||
func (t UnixTime) GoString() string {
|
||||
return t.Time().GoString()
|
||||
}
|
||||
|
||||
func (t UnixTime) String() string {
|
||||
return t.Time().String()
|
||||
}
|
||||
|
||||
func NewUnix(t time.Time) UnixTime {
|
||||
return UnixTime(t)
|
||||
}
|
||||
|
||||
func NowUnix() UnixTime {
|
||||
return UnixTime(time.Now())
|
||||
}
|
176
rfctime/unixMilli.go
Normal file
176
rfctime/unixMilli.go
Normal file
@@ -0,0 +1,176 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
type UnixMilliTime time.Time
|
||||
|
||||
func (t UnixMilliTime) Time() time.Time {
|
||||
return time.Time(t)
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) MarshalBinary() ([]byte, error) {
|
||||
return (time.Time)(t).MarshalBinary()
|
||||
}
|
||||
|
||||
func (t *UnixMilliTime) UnmarshalBinary(data []byte) error {
|
||||
return (*time.Time)(t).UnmarshalBinary(data)
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) GobEncode() ([]byte, error) {
|
||||
return (time.Time)(t).GobEncode()
|
||||
}
|
||||
|
||||
func (t *UnixMilliTime) GobDecode(data []byte) error {
|
||||
return (*time.Time)(t).GobDecode(data)
|
||||
}
|
||||
|
||||
func (t *UnixMilliTime) UnmarshalJSON(data []byte) error {
|
||||
str := ""
|
||||
if err := json.Unmarshal(data, &str); err != nil {
|
||||
return err
|
||||
}
|
||||
t0, err := strconv.ParseInt(str, 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixMilliTime(time.UnixMilli(t0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) MarshalJSON() ([]byte, error) {
|
||||
str := strconv.FormatInt(t.Time().UnixMilli(), 10)
|
||||
return json.Marshal(str)
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) MarshalText() ([]byte, error) {
|
||||
return []byte(strconv.FormatInt(t.Time().UnixMilli(), 10)), nil
|
||||
}
|
||||
|
||||
func (t *UnixMilliTime) UnmarshalText(data []byte) error {
|
||||
t0, err := strconv.ParseInt(string(data), 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixMilliTime(time.UnixMilli(t0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Serialize() string {
|
||||
return strconv.FormatInt(t.Time().UnixMilli(), 10)
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) After(u RFCTime) bool {
|
||||
return t.Time().After(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Before(u RFCTime) bool {
|
||||
return t.Time().Before(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Equal(u RFCTime) bool {
|
||||
return t.Time().Equal(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) IsZero() bool {
|
||||
return t.Time().IsZero()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Date() (year int, month time.Month, day int) {
|
||||
return t.Time().Date()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Year() int {
|
||||
return t.Time().Year()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Month() time.Month {
|
||||
return t.Time().Month()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Day() int {
|
||||
return t.Time().Day()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Weekday() time.Weekday {
|
||||
return t.Time().Weekday()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) ISOWeek() (year, week int) {
|
||||
return t.Time().ISOWeek()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Clock() (hour, min, sec int) {
|
||||
return t.Time().Clock()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Hour() int {
|
||||
return t.Time().Hour()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Minute() int {
|
||||
return t.Time().Minute()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Second() int {
|
||||
return t.Time().Second()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Nanosecond() int {
|
||||
return t.Time().Nanosecond()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) YearDay() int {
|
||||
return t.Time().YearDay()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Add(d time.Duration) UnixMilliTime {
|
||||
return UnixMilliTime(t.Time().Add(d))
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Sub(u RFCTime) time.Duration {
|
||||
return t.Time().Sub(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) AddDate(years int, months int, days int) UnixMilliTime {
|
||||
return UnixMilliTime(t.Time().AddDate(years, months, days))
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Unix() int64 {
|
||||
return t.Time().Unix()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) UnixMilli() int64 {
|
||||
return t.Time().UnixMilli()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) UnixMicro() int64 {
|
||||
return t.Time().UnixMicro()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) UnixNano() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Format(layout string) string {
|
||||
return t.Time().Format(layout)
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) GoString() string {
|
||||
return t.Time().GoString()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) String() string {
|
||||
return t.Time().String()
|
||||
}
|
||||
|
||||
func NewUnixMilli(t time.Time) UnixMilliTime {
|
||||
return UnixMilliTime(t)
|
||||
}
|
||||
|
||||
func NowUnixMilli() UnixMilliTime {
|
||||
return UnixMilliTime(time.Now())
|
||||
}
|
176
rfctime/unixNano.go
Normal file
176
rfctime/unixNano.go
Normal file
@@ -0,0 +1,176 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
type UnixNanoTime time.Time
|
||||
|
||||
func (t UnixNanoTime) Time() time.Time {
|
||||
return time.Time(t)
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) MarshalBinary() ([]byte, error) {
|
||||
return (time.Time)(t).MarshalBinary()
|
||||
}
|
||||
|
||||
func (t *UnixNanoTime) UnmarshalBinary(data []byte) error {
|
||||
return (*time.Time)(t).UnmarshalBinary(data)
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) GobEncode() ([]byte, error) {
|
||||
return (time.Time)(t).GobEncode()
|
||||
}
|
||||
|
||||
func (t *UnixNanoTime) GobDecode(data []byte) error {
|
||||
return (*time.Time)(t).GobDecode(data)
|
||||
}
|
||||
|
||||
func (t *UnixNanoTime) UnmarshalJSON(data []byte) error {
|
||||
str := ""
|
||||
if err := json.Unmarshal(data, &str); err != nil {
|
||||
return err
|
||||
}
|
||||
t0, err := strconv.ParseInt(str, 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixNanoTime(time.Unix(0, t0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) MarshalJSON() ([]byte, error) {
|
||||
str := strconv.FormatInt(t.Time().UnixNano(), 10)
|
||||
return json.Marshal(str)
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) MarshalText() ([]byte, error) {
|
||||
return []byte(strconv.FormatInt(t.Time().UnixNano(), 10)), nil
|
||||
}
|
||||
|
||||
func (t *UnixNanoTime) UnmarshalText(data []byte) error {
|
||||
t0, err := strconv.ParseInt(string(data), 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixNanoTime(time.Unix(0, t0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Serialize() string {
|
||||
return strconv.FormatInt(t.Time().UnixNano(), 10)
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) After(u RFCTime) bool {
|
||||
return t.Time().After(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Before(u RFCTime) bool {
|
||||
return t.Time().Before(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Equal(u RFCTime) bool {
|
||||
return t.Time().Equal(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) IsZero() bool {
|
||||
return t.Time().IsZero()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Date() (year int, month time.Month, day int) {
|
||||
return t.Time().Date()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Year() int {
|
||||
return t.Time().Year()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Month() time.Month {
|
||||
return t.Time().Month()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Day() int {
|
||||
return t.Time().Day()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Weekday() time.Weekday {
|
||||
return t.Time().Weekday()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) ISOWeek() (year, week int) {
|
||||
return t.Time().ISOWeek()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Clock() (hour, min, sec int) {
|
||||
return t.Time().Clock()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Hour() int {
|
||||
return t.Time().Hour()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Minute() int {
|
||||
return t.Time().Minute()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Second() int {
|
||||
return t.Time().Second()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Nanosecond() int {
|
||||
return t.Time().Nanosecond()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) YearDay() int {
|
||||
return t.Time().YearDay()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Add(d time.Duration) UnixNanoTime {
|
||||
return UnixNanoTime(t.Time().Add(d))
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Sub(u RFCTime) time.Duration {
|
||||
return t.Time().Sub(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) AddDate(years int, months int, days int) UnixNanoTime {
|
||||
return UnixNanoTime(t.Time().AddDate(years, months, days))
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Unix() int64 {
|
||||
return t.Time().Unix()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) UnixMilli() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) UnixMicro() int64 {
|
||||
return t.Time().UnixMicro()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) UnixNano() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Format(layout string) string {
|
||||
return t.Time().Format(layout)
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) GoString() string {
|
||||
return t.Time().GoString()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) String() string {
|
||||
return t.Time().String()
|
||||
}
|
||||
|
||||
func NewUnixNano(t time.Time) UnixNanoTime {
|
||||
return UnixNanoTime(t)
|
||||
}
|
||||
|
||||
func NowUnixNano() UnixNanoTime {
|
||||
return UnixNanoTime(time.Now())
|
||||
}
|
Reference in New Issue
Block a user