diff --git a/kernel/api/asset.go b/kernel/api/asset.go index c4ba7577e..8b51684bc 100644 --- a/kernel/api/asset.go +++ b/kernel/api/asset.go @@ -23,9 +23,9 @@ import ( "path/filepath" "strings" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/djherbis/times" - "github.com/dustin/go-humanize" "github.com/gin-gonic/gin" "github.com/siyuan-note/filelock" "github.com/siyuan-note/siyuan/kernel/model" diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go index 3e1cab908..a63d416f1 100644 --- a/kernel/bazaar/icon.go +++ b/kernel/bazaar/icon.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/dustin/go-humanize" + "github.com/88250/go-humanize" ants "github.com/panjf2000/ants/v2" "github.com/siyuan-note/httpclient" "github.com/siyuan-note/logging" diff --git a/kernel/bazaar/plugin.go b/kernel/bazaar/plugin.go index 0b460e518..5a5e5429a 100644 --- a/kernel/bazaar/plugin.go +++ b/kernel/bazaar/plugin.go @@ -24,7 +24,7 @@ import ( "strings" "sync" - "github.com/dustin/go-humanize" + "github.com/88250/go-humanize" ants "github.com/panjf2000/ants/v2" "github.com/siyuan-note/httpclient" "github.com/siyuan-note/logging" diff --git a/kernel/bazaar/template.go b/kernel/bazaar/template.go index e08f260d3..a60fc18db 100644 --- a/kernel/bazaar/template.go +++ b/kernel/bazaar/template.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/dustin/go-humanize" + "github.com/88250/go-humanize" "github.com/panjf2000/ants/v2" "github.com/siyuan-note/httpclient" "github.com/siyuan-note/logging" diff --git a/kernel/bazaar/theme.go b/kernel/bazaar/theme.go index af1ec06c0..57df50bdb 100644 --- a/kernel/bazaar/theme.go +++ b/kernel/bazaar/theme.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/dustin/go-humanize" + "github.com/88250/go-humanize" ants "github.com/panjf2000/ants/v2" "github.com/siyuan-note/httpclient" "github.com/siyuan-note/logging" diff --git a/kernel/bazaar/widget.go b/kernel/bazaar/widget.go index 901f9c739..c0cf9cbb6 100644 --- a/kernel/bazaar/widget.go +++ b/kernel/bazaar/widget.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/dustin/go-humanize" + "github.com/88250/go-humanize" ants "github.com/panjf2000/ants/v2" "github.com/siyuan-note/httpclient" "github.com/siyuan-note/logging" diff --git a/kernel/go.mod b/kernel/go.mod index eb6cdd7ce..d39a26d50 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -1,13 +1,14 @@ module github.com/siyuan-note/siyuan/kernel -go 1.21 +go 1.22 -toolchain go1.21.3 +toolchain go1.22.2 require ( code.sajari.com/docconv v1.3.8 github.com/88250/clipboard v0.1.5 github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48 + github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7 github.com/88250/gulu v1.2.3-0.20240324024901-3c1bb82cba30 github.com/88250/lute v1.7.7-0.20240417130943-8e943102e99b github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c @@ -22,7 +23,6 @@ require ( github.com/denisbrodbeck/machineid v1.0.1 github.com/dgraph-io/ristretto v0.1.1 github.com/djherbis/times v1.6.0 - github.com/dustin/go-humanize v1.0.1 github.com/emirpasic/gods v1.18.1 github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb github.com/flopp/go-findfont v0.1.0 @@ -52,7 +52,7 @@ require ( github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/sashabaranov/go-openai v1.22.0 github.com/shirou/gopsutil/v3 v3.24.3 - github.com/siyuan-note/dejavu v0.0.0-20240419132957-4353a98ca162 + github.com/siyuan-note/dejavu v0.0.0-20240424103714-37ed611dc7e8 github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4 github.com/siyuan-note/eventbus v0.0.0-20240318125243-801c98e8f025 github.com/siyuan-note/filelock v0.0.0-20240419132904-2fbfe64f1939 @@ -82,7 +82,7 @@ require ( github.com/andybalholm/brotli v1.1.0 // indirect github.com/andybalholm/cascadia v1.3.2 // indirect github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef // indirect - github.com/aws/aws-sdk-go v1.51.24 // indirect + github.com/aws/aws-sdk-go v1.51.27 // indirect github.com/bytedance/sonic v1.11.5-alpha3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudflare/circl v1.3.7 // indirect @@ -90,6 +90,7 @@ require ( github.com/cloudwego/iasm v0.2.0 // indirect github.com/dlclark/regexp2 v1.11.0 // indirect github.com/dsnet/compress v0.0.1 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/fatih/set v0.2.1 // indirect github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573 // indirect github.com/gin-contrib/sse v0.1.0 // indirect @@ -100,7 +101,7 @@ require ( github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/glog v1.2.1 // indirect - github.com/google/pprof v0.0.0-20240416155748-26353dc0451f // indirect + github.com/google/pprof v0.0.0-20240422182052-72c8669ad3e7 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/gorilla/context v1.1.2 // indirect diff --git a/kernel/go.sum b/kernel/go.sum index bf557cc42..f7148af4c 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -6,6 +6,8 @@ github.com/88250/clipboard v0.1.5 h1:V/mCiSrjwmIiJwvchGTs+W2ozdINxk7y7KgHNTSzlCI github.com/88250/clipboard v0.1.5/go.mod h1:bNLJx4L8cF6fEgiXMPVrK1Iidnaff8BTkktTNtefcks= github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48 h1:qiE88Pw/9GG8hvMfpfB4aUhnIikZTwG+Z/Xbn0a9R14= github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48/go.mod h1:UgVSq5iO9pOvqs3hIGNVk6WXDiAB0v3Dlg4nssQJ7W4= +github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7 h1:MafIFwSS0x6A4hqNtl0ObDG2cx8kcafqWu2xxkwZ3rI= +github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7/go.mod h1:HrKCCTin3YNDSLBD02K0AOljjV6eNwc3/zyEI+xyV1I= github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceTVVqrYaDlLio2QSKbXMUmAZPbzCwT5eNCw= github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/88250/gulu v1.2.3-0.20240324024901-3c1bb82cba30 h1:IeE4DVRWnVpcbMj7gGZoSMiBWs3h/ihiyOmualS1Mas= @@ -48,8 +50,8 @@ github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhP github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw= github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef h1:2JGTg6JapxP9/R33ZaagQtAM4EkkSYnIAlOG5EI8gkM= github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef/go.mod h1:JS7hed4L1fj0hXcyEejnW57/7LCetXggd+vwrRnYeII= -github.com/aws/aws-sdk-go v1.51.24 h1:nwL5MaommPkwb7Ixk24eWkdx5HY4of1gD10kFFVAl6A= -github.com/aws/aws-sdk-go v1.51.24/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.51.27 h1:ZprksHovT4rFfNBHB+Bc/0p4PTntAnTlZP39DMA/Qp8= +github.com/aws/aws-sdk-go v1.51.27/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/bytedance/sonic v1.11.5-alpha3 h1:sxepBMt+5mb0YQZOAzXYOiUQ5D4+EWqOfnklxyZRofQ= github.com/bytedance/sonic v1.11.5-alpha3/go.mod h1:NYwWBqBszgmWi7sDnT+p6Yj1Jwf2gzpN0UY7R3VYH+c= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -158,8 +160,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240416155748-26353dc0451f h1:WpZiq8iqvGjJ3m3wzAVKL6+0vz7VkE79iSy9GII00II= -github.com/google/pprof v0.0.0-20240416155748-26353dc0451f/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240422182052-72c8669ad3e7 h1:3q13T5NW3mlTJZM6B5UAsf2N5NYFbYWIyI3W8DlvBDU= +github.com/google/pprof v0.0.0-20240422182052-72c8669ad3e7/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -342,8 +344,8 @@ github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+D github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA= github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8= -github.com/siyuan-note/dejavu v0.0.0-20240419132957-4353a98ca162 h1:bE323aGR0aa6PfY89mwSit46Dj2JUpEt/82aQUYLTZA= -github.com/siyuan-note/dejavu v0.0.0-20240419132957-4353a98ca162/go.mod h1:W25DJqMuttu4jbayhVPk1hsHQqj2BcopJTp87qLVAVc= +github.com/siyuan-note/dejavu v0.0.0-20240424103714-37ed611dc7e8 h1:yOOuFHCGdluTCz/r6A9lLOY1RstR+39nlwAH8lB0/0Q= +github.com/siyuan-note/dejavu v0.0.0-20240424103714-37ed611dc7e8/go.mod h1:1rXTXxp/4qyfqtvjD1st+xtHJzICUHs8Y99rfqYfC+0= github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4 h1:kJaw5L/evyW6LcB9IQT8PR4ppx8JVqOFP9Ix3rfwSrc= github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4/go.mod h1:UYcCCY+0wh+GmUoDOaO63j1sV5lgy7laLAk1XhEiUis= github.com/siyuan-note/eventbus v0.0.0-20240318125243-801c98e8f025 h1:crQmKw5vZz3MljAP/xKMWY/rksMX634jJK9kcsOIbkw= diff --git a/kernel/model/asset_content.go b/kernel/model/asset_content.go index d4bb8db3a..584e56f57 100644 --- a/kernel/model/asset_content.go +++ b/kernel/model/asset_content.go @@ -30,9 +30,9 @@ import ( "code.sajari.com/docconv" "github.com/88250/epub" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/88250/lute/ast" - "github.com/dustin/go-humanize" "github.com/klippa-app/go-pdfium" "github.com/klippa-app/go-pdfium/requests" "github.com/klippa-app/go-pdfium/webassembly" diff --git a/kernel/model/assets.go b/kernel/model/assets.go index e52a360ae..8b7783d07 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -32,12 +32,12 @@ import ( "strings" "time" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/88250/lute/ast" "github.com/88250/lute/editor" "github.com/88250/lute/html" "github.com/88250/lute/parse" - "github.com/dustin/go-humanize" "github.com/gabriel-vasile/mimetype" "github.com/imroc/req/v3" "github.com/siyuan-note/filelock" diff --git a/kernel/model/box.go b/kernel/model/box.go index e4d8ffd5a..223d20570 100644 --- a/kernel/model/box.go +++ b/kernel/model/box.go @@ -28,11 +28,11 @@ import ( "strings" "time" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/88250/lute/ast" "github.com/88250/lute/html" "github.com/88250/lute/parse" - "github.com/dustin/go-humanize" "github.com/facette/natsort" "github.com/siyuan-note/filelock" "github.com/siyuan-note/logging" diff --git a/kernel/model/conf.go b/kernel/model/conf.go index fe67b6b4e..f0b911c3d 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -28,11 +28,11 @@ import ( "sync" "time" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/88250/lute" "github.com/88250/lute/ast" "github.com/Xuanwo/go-locale" - "github.com/dustin/go-humanize" "github.com/getsentry/sentry-go" "github.com/sashabaranov/go-openai" "github.com/siyuan-note/eventbus" diff --git a/kernel/model/file.go b/kernel/model/file.go index 61fe8c76c..57cdaa00a 100644 --- a/kernel/model/file.go +++ b/kernel/model/file.go @@ -30,13 +30,13 @@ import ( "time" "unicode/utf8" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/88250/lute" "github.com/88250/lute/ast" "github.com/88250/lute/html" "github.com/88250/lute/parse" util2 "github.com/88250/lute/util" - "github.com/dustin/go-humanize" "github.com/facette/natsort" "github.com/siyuan-note/filelock" "github.com/siyuan-note/logging" diff --git a/kernel/model/index.go b/kernel/model/index.go index 3a325368a..b5d34e78f 100644 --- a/kernel/model/index.go +++ b/kernel/model/index.go @@ -27,11 +27,11 @@ import ( "sync" "time" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/88250/lute/ast" "github.com/88250/lute/html" "github.com/88250/lute/parse" - "github.com/dustin/go-humanize" "github.com/panjf2000/ants/v2" "github.com/siyuan-note/eventbus" "github.com/siyuan-note/filelock" diff --git a/kernel/model/ocr.go b/kernel/model/ocr.go index 9e50ede1b..ad6e7ecc2 100644 --- a/kernel/model/ocr.go +++ b/kernel/model/ocr.go @@ -6,8 +6,8 @@ import ( "strings" "time" + "github.com/88250/go-humanize" "github.com/88250/gulu" - "github.com/dustin/go-humanize" "github.com/siyuan-note/filelock" "github.com/siyuan-note/logging" "github.com/siyuan-note/siyuan/kernel/cache" diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 5620da690..5980d5fba 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -34,13 +34,13 @@ import ( "sync/atomic" "time" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/88250/lute" "github.com/88250/lute/ast" "github.com/88250/lute/html" "github.com/88250/lute/parse" "github.com/88250/lute/render" - "github.com/dustin/go-humanize" "github.com/siyuan-note/dejavu" "github.com/siyuan-note/dejavu/cloud" "github.com/siyuan-note/dejavu/entity" diff --git a/kernel/model/sync.go b/kernel/model/sync.go index 1b4086db1..4c1decbf6 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/88250/lute/html" - "github.com/dustin/go-humanize" "github.com/gorilla/websocket" "github.com/siyuan-note/dejavu" "github.com/siyuan-note/dejavu/cloud" diff --git a/kernel/treenode/blocktree.go b/kernel/treenode/blocktree.go index 03c3ddafd..5e87382c3 100644 --- a/kernel/treenode/blocktree.go +++ b/kernel/treenode/blocktree.go @@ -24,10 +24,10 @@ import ( "sync/atomic" "time" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/88250/lute/ast" "github.com/88250/lute/parse" - "github.com/dustin/go-humanize" "github.com/panjf2000/ants/v2" util2 "github.com/siyuan-note/dejavu/util" "github.com/siyuan-note/logging" diff --git a/kernel/util/disk.go b/kernel/util/disk.go index 2d3fb881c..0d1fa21c4 100644 --- a/kernel/util/disk.go +++ b/kernel/util/disk.go @@ -19,7 +19,7 @@ package util import ( - "github.com/dustin/go-humanize" + "github.com/88250/go-humanize" "github.com/shirou/gopsutil/v3/disk" "github.com/siyuan-note/logging" ) diff --git a/kernel/util/tesseract.go b/kernel/util/tesseract.go index 90443cc29..25f8bd298 100644 --- a/kernel/util/tesseract.go +++ b/kernel/util/tesseract.go @@ -29,10 +29,10 @@ import ( "sync/atomic" "time" + "github.com/88250/go-humanize" "github.com/88250/gulu" "github.com/88250/lute/ast" "github.com/88250/lute/html" - "github.com/dustin/go-humanize" "github.com/siyuan-note/logging" ) diff --git a/kernel/util/time.go b/kernel/util/time.go index 2b1258171..7adab564d 100644 --- a/kernel/util/time.go +++ b/kernel/util/time.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/dustin/go-humanize" + "github.com/88250/go-humanize" ) // Weekday returns the day of the week specified by date.