Skip to content

Commit c971815

Browse files
ddkworkddkwork
committed
sync
1 parent 2522fcd commit c971815

File tree

11 files changed

+58
-221
lines changed

11 files changed

+58
-221
lines changed

‎gen/fileAction_gen.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package gen
22

33
import (
4+
"github.com/ddkwork/golibrary/mylog"
5+
"github.com/ddkwork/golibrary/safeType"
46
"go/format"
57
"os"
68
"path/filepath"
7-
8-
"github.com/ddkwork/golibrary/mylog"
9-
"github.com/ddkwork/golibrary/safeType"
109
)
1110

1211
func WriteGoFile[T safeType.Type](name string, data T) (ok bool) {

‎gen/mock_Interface.go

Lines changed: 0 additions & 174 deletions
This file was deleted.

‎gen/mock_Interface_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import "testing"
66
//go:generate mockery --all --with-expecter --inpackage
77

88
func TestName(t *testing.T) {
9-
m := NewMockInterface(t)
10-
m.EXPECT()
11-
m.EXPECT().FileAction().RunAndReturn(func() {
12-
})
9+
//m := NewMockInterface(t)
10+
//m.EXPECT()
11+
//m.EXPECT().FileAction().RunAndReturn(func() {
12+
//})
1313
}

‎go.mod

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/ddkwork/golibrary
33
go 1.22
44

55
require (
6-
cogentcore.org/core v0.0.8-0.20240309213453-422cbc2cd1f1
6+
cogentcore.org/core v0.0.8-0.20240312041954-1380c137a49a
77
github.com/alecthomas/chroma/v2 v2.12.0
88
github.com/aquasecurity/table v1.8.0
99
github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
@@ -12,7 +12,6 @@ require (
1212
github.com/charmbracelet/lipgloss v0.9.1
1313
github.com/dc0d/caseconv v0.5.0
1414
github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
15-
github.com/fatih/color v1.16.0
1615
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240118000515-a250818d05e3
1716
github.com/google/uuid v1.4.0
1817
github.com/gorilla/websocket v1.5.1
@@ -21,11 +20,11 @@ require (
2120
github.com/mattn/go-sqlite3 v1.14.22
2221
github.com/rivo/uniseg v0.4.7
2322
github.com/smallnest/safemap v0.0.0-20221221063619-2e3a9fa0ff20
24-
github.com/stretchr/testify v1.8.4
23+
github.com/stretchr/testify v1.9.0
2524
github.com/zzl/go-win32api/v2 v2.1.0
2625
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
2726
golang.org/x/image v0.15.0
28-
golang.org/x/sys v0.17.0
27+
golang.org/x/sys v0.18.0
2928
golang.org/x/text v0.14.0
3029
)
3130

@@ -54,7 +53,6 @@ require (
5453
github.com/hupe1980/golog v0.0.2 // indirect
5554
github.com/jinzhu/copier v0.4.0 // indirect
5655
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
57-
github.com/mattn/go-colorable v0.1.13 // indirect
5856
github.com/mattn/go-isatty v0.0.20 // indirect
5957
github.com/mattn/go-localereader v0.0.1 // indirect
6058
github.com/mattn/go-runewidth v0.0.15 // indirect
@@ -67,11 +65,11 @@ require (
6765
github.com/pelletier/go-toml/v2 v2.1.2-0.20240227203013-2b69615b5d55 // indirect
6866
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6967
github.com/rogpeppe/go-internal v1.12.0 // indirect
70-
github.com/stretchr/objx v0.5.0 // indirect
68+
github.com/stretchr/objx v0.5.2 // indirect
7169
golang.org/x/mod v0.15.0 // indirect
72-
golang.org/x/net v0.21.0 // indirect
70+
golang.org/x/net v0.22.0 // indirect
7371
golang.org/x/sync v0.6.0 // indirect
74-
golang.org/x/term v0.17.0 // indirect
72+
golang.org/x/term v0.18.0 // indirect
7573
golang.org/x/tools v0.18.0 // indirect
7674
gopkg.in/yaml.v3 v3.0.1 // indirect
7775
)

‎go.sum

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
cogentcore.org/core v0.0.8-0.20240309010543-9eb35d11ca28 h1:75QOteCtyn263SQtmx00wGUad2VkxzniB8+UwLA6HOs=
2-
cogentcore.org/core v0.0.8-0.20240309010543-9eb35d11ca28/go.mod h1:86eoGoMKgZgLm1o/zEP5m3iRUb1+xLKX0+jLaTQKeBI=
3-
cogentcore.org/core v0.0.8-0.20240309213453-422cbc2cd1f1 h1:gVQCsN88owRvSd+iOaLnlWKoVFL9r9T4C1ljRP96Ymk=
4-
cogentcore.org/core v0.0.8-0.20240309213453-422cbc2cd1f1/go.mod h1:86eoGoMKgZgLm1o/zEP5m3iRUb1+xLKX0+jLaTQKeBI=
1+
cogentcore.org/core v0.0.8-0.20240312041954-1380c137a49a h1:tVAeAEN3KwKEOnEaMERKf80gljTaG+9H0vJXMNgmg6c=
52
github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4 h1:6lx9xzJAhdjq0LvVfbITeC3IH9Fzvo1aBahyPu2FuG8=
63
github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4/go.mod h1:FChzXi1izqzdPb6BiNZmcZLGyTYiT61iGx9Rxx9GNeI=
74
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -61,8 +58,6 @@ github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d h1:wi6jN5LVt/ljaBG4ue7
6158
github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d/go.mod h1:QMWlm50DNe14hD7t24KEqZuUdC9sOTy8W6XbCU1mlw4=
6259
github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
6360
github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=
64-
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
65-
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
6661
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
6762
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
6863
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
@@ -116,9 +111,6 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
116111
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
117112
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
118113
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
119-
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
120-
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
121-
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
122114
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
123115
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
124116
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
@@ -165,14 +157,14 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
165157
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
166158
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
167159
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
168-
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
169160
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
161+
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
170162
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
171163
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
172164
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
173165
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
174-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
175166
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
167+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
176168
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
177169
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
178170
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -192,8 +184,7 @@ golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
192184
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
193185
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
194186
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
195-
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
196-
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
187+
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
197188
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
198189
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
199190
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
@@ -205,15 +196,12 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
205196
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
206197
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
207198
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
208-
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
209199
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
210200
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
211-
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
212-
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
201+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
213202
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
214203
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
215-
golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
216-
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
204+
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
217205
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
218206
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
219207
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

‎mylog/go.mod

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
module github.com/ddkwork/golibrary/mylog
2+
3+
go 1.22
4+
5+
require (
6+
github.com/fatih/color v1.16.0
7+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
8+
golang.org/x/text v0.14.0
9+
)
10+
11+
require (
12+
github.com/mattn/go-colorable v0.1.13 // indirect
13+
github.com/mattn/go-isatty v0.0.20 // indirect
14+
golang.org/x/sys v0.18.0 // indirect
15+
)

‎mylog/go.sum

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
2+
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
3+
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
4+
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
5+
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
6+
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
7+
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
8+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
9+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
10+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
11+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
12+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
13+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
14+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
15+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=

‎mylog/interface.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ package mylog
33
import (
44
"bytes"
55
"fmt"
6+
"golang.org/x/exp/constraints"
67
"net/http"
78
"os"
8-
"testing"
9-
10-
"github.com/stretchr/testify/assert"
11-
"golang.org/x/exp/constraints"
129
)
1310

1411
type (
@@ -59,11 +56,11 @@ func True(b bool) {
5956
}
6057
}
6158

62-
func Assert(t *testing.T) *assert.Assertions { return assert.New(t) }
63-
func Error(err any) bool { return defaultObject.Error(err) }
64-
func Error2(_ any, err error) bool { return defaultObject.Error2(nil, err) }
65-
func Reason() (reason string) { return defaultObject.Reason() }
66-
func HexDump(title string, b []byte) { defaultObject.hexDump(title, b) }
59+
// func Assert(t *testing.T) *assert.Assertions { return assert.New(t) }
60+
func Error(err any) bool { return defaultObject.Error(err) }
61+
func Error2(_ any, err error) bool { return defaultObject.Error2(nil, err) }
62+
func Reason() (reason string) { return defaultObject.Reason() }
63+
func HexDump(title string, b []byte) { defaultObject.hexDump(title, b) }
6764
func HexInteger[T constraints.Integer](msg T) string {
6865
return Hex("", msg) + "|" + fmt.Sprintf("%d", msg)
6966
}

0 commit comments

Comments
 (0)