diff --git a/.codacy.yml b/.codacy.yml deleted file mode 100644 index 5cb31fe5..00000000 --- a/.codacy.yml +++ /dev/null @@ -1,2 +0,0 @@ -exclude: - - "**/*.md" \ No newline at end of file diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml deleted file mode 100644 index 2141ba4f..00000000 --- a/.github/workflows/codacy.yml +++ /dev/null @@ -1,61 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -# This workflow checks out code, performs a Codacy security scan -# and integrates the results with the -# GitHub Advanced Security code scanning feature. For more information on -# the Codacy security scan action usage and parameters, see -# https://github.com/codacy/codacy-analysis-cli-action. -# For more information on Codacy Analysis CLI in general, see -# https://github.com/codacy/codacy-analysis-cli. - -name: Codacy Security Scan - -on: - push: - branches: [ "master" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "master" ] - schedule: - - cron: '43 2 * * 4' - -permissions: - contents: read - -jobs: - codacy-security-scan: - permissions: - contents: read # for actions/checkout to fetch code - security-events: write # for github/codeql-action/upload-sarif to upload SARIF results - actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status - name: Codacy Security Scan - runs-on: ubuntu-latest - steps: - # Checkout the repository to the GitHub Actions runner - - name: Checkout code - uses: actions/checkout@v3 - - # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis - - name: Run Codacy Analysis CLI - uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b - with: - # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository - # You can also omit the token and run the tools that support default configurations - project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} - verbose: true - output: results.sarif - format: sarif - # Adjust severity of non-security issues - gh-code-scanning-compat: true - # Force 0 exit code to allow SARIF file generation - # This will handover control about PR rejection to the GitHub side - max-allowed-issues: 2147483647 - - # Upload the SARIF file generated in the previous step - - name: Upload SARIF results file - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: results.sarif diff --git a/internal/game/activity/controller_internal.go b/internal/game/activity/controller_internal.go index 802fc60e..ac8181f6 100644 --- a/internal/game/activity/controller_internal.go +++ b/internal/game/activity/controller_internal.go @@ -2,11 +2,11 @@ package activity import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/generic" - "github.com/kercylan98/minotaur/utils/times" - "reflect" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/generic" +"github.com/kercylan98/minotaur/utils/times" +"reflect" +"time" ) var ( diff --git a/internal/game/activity/events.go b/internal/game/activity/events.go index 7ede4538..b122ab94 100644 --- a/internal/game/activity/events.go +++ b/internal/game/activity/events.go @@ -2,16 +2,15 @@ package activity import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/collection/listings" - "github.com/kercylan98/minotaur/utils/generic" - "github.com/kercylan98/minotaur/utils/log" - "github.com/kercylan98/minotaur/utils/timer" - "github.com/kercylan98/minotaur/utils/times" - "reflect" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/collection/listings" +"github.com/kercylan98/minotaur/utils/generic" +"github.com/kercylan98/minotaur/utils/log" +"github.com/kercylan98/minotaur/utils/timer" +"github.com/kercylan98/minotaur/utils/times" +"reflect" +"time" ) - type ( UpcomingEventHandler[ID generic.Basic] func(activityId ID) // 即将开始的活动事件处理器 StartedEventHandler[ID generic.Basic] func(activityId ID) // 活动开始事件处理器 diff --git a/internal/game/space/room_controller.go b/internal/game/space/room_controller.go index 6eabd017..19d95a52 100644 --- a/internal/game/space/room_controller.go +++ b/internal/game/space/room_controller.go @@ -1,9 +1,9 @@ package space import ( - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/generic" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/generic" +"sync" ) const UnknownSeat = -1 // 未知座位号 diff --git a/internal/game/space/room_manager.go b/internal/game/space/room_manager.go index 34518e6b..1121513e 100644 --- a/internal/game/space/room_manager.go +++ b/internal/game/space/room_manager.go @@ -1,9 +1,9 @@ package space import ( - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/generic" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/generic" +"sync" ) // NewRoomManager 创建房间管理器 RoomManager 的实例 diff --git a/internal/planner/pce/exporter/cmd/exportgo.go b/internal/planner/pce/exporter/cmd/exportgo.go index 973d254f..0add0edd 100644 --- a/internal/planner/pce/exporter/cmd/exportgo.go +++ b/internal/planner/pce/exporter/cmd/exportgo.go @@ -5,15 +5,15 @@ import ( "github.com/kercylan98/minotaur/planner/pce" "github.com/kercylan98/minotaur/planner/pce/cs" "github.com/kercylan98/minotaur/planner/pce/tmpls" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/file" - "github.com/kercylan98/minotaur/utils/str" - "github.com/spf13/cobra" - "github.com/tealeg/xlsx" - "os" - "os/exec" - "path/filepath" - "strings" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/file" +"github.com/kercylan98/minotaur/utils/str" +"github.com/spf13/cobra" +"github.com/tealeg/xlsx" +"os" +"os/exec" +"path/filepath" +"strings" ) func init() { diff --git a/internal/planner/pce/exporter/cmd/exportjson.go b/internal/planner/pce/exporter/cmd/exportjson.go index 2d42e232..3d8b3b68 100644 --- a/internal/planner/pce/exporter/cmd/exportjson.go +++ b/internal/planner/pce/exporter/cmd/exportjson.go @@ -6,14 +6,14 @@ import ( "github.com/kercylan98/minotaur/planner/pce" "github.com/kercylan98/minotaur/planner/pce/cs" "github.com/kercylan98/minotaur/planner/pce/tmpls" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/file" - "github.com/kercylan98/minotaur/utils/str" - "github.com/spf13/cobra" - "github.com/tealeg/xlsx" - "os" - "path/filepath" - "strings" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/file" +"github.com/kercylan98/minotaur/utils/str" +"github.com/spf13/cobra" +"github.com/tealeg/xlsx" +"os" +"path/filepath" +"strings" ) func init() { diff --git a/internal/planner/pce/exporter/cmd/exportjson_test.go b/internal/planner/pce/exporter/cmd/exportjson_test.go index 742d4d08..f8e91b07 100644 --- a/internal/planner/pce/exporter/cmd/exportjson_test.go +++ b/internal/planner/pce/exporter/cmd/exportjson_test.go @@ -6,14 +6,14 @@ import ( "github.com/kercylan98/minotaur/planner/pce" "github.com/kercylan98/minotaur/planner/pce/cs" "github.com/kercylan98/minotaur/planner/pce/tmpls" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/file" - "github.com/kercylan98/minotaur/utils/str" - "github.com/tealeg/xlsx" - "os" - "path/filepath" - "strings" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/file" +"github.com/kercylan98/minotaur/utils/str" +"github.com/tealeg/xlsx" +"os" +"path/filepath" +"strings" +"testing" ) func TestExecute(t *testing.T) { diff --git a/internal/planner/pce/tmpl_field.go b/internal/planner/pce/tmpl_field.go index 2517b450..c2bb40c0 100644 --- a/internal/planner/pce/tmpl_field.go +++ b/internal/planner/pce/tmpl_field.go @@ -2,9 +2,9 @@ package pce import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/str" - "strings" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/str" +"strings" ) // TmplField 模板字段 diff --git a/internal/planner/pce/tmpl_struct.go b/internal/planner/pce/tmpl_struct.go index 6cd38492..4e1cfa05 100644 --- a/internal/planner/pce/tmpl_struct.go +++ b/internal/planner/pce/tmpl_struct.go @@ -1,7 +1,7 @@ package pce import ( - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) // TmplStruct 模板结构 diff --git a/internal/planner/pce/tmpls/golang.go b/internal/planner/pce/tmpls/golang.go index 4c325a84..5310fe30 100644 --- a/internal/planner/pce/tmpls/golang.go +++ b/internal/planner/pce/tmpls/golang.go @@ -27,7 +27,7 @@ func (slf *Golang) Render(templates ...*pce.TmplStruct) (string, error) { import ( jsonIter "github.com/json-iterator/go" "github.com/kercylan98/minotaur/utils/log" - "github.com/kercylan98/minotaur/utils/collection" + "github.com/kercylan98/minotaur/toolkit/collection" "sync" "sync/atomic" ) diff --git a/internal/server/conn.go b/internal/server/conn.go index 555a39e2..15872e7a 100644 --- a/internal/server/conn.go +++ b/internal/server/conn.go @@ -6,22 +6,22 @@ import ( "fmt" "github.com/gorilla/websocket" "github.com/kercylan98/minotaur/server/writeloop" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/hub" - "github.com/kercylan98/minotaur/utils/log" - "github.com/kercylan98/minotaur/utils/random" - "github.com/kercylan98/minotaur/utils/timer" - "github.com/panjf2000/gnet" - "github.com/xtaci/kcp-go/v5" - "io" - "net" - "net/http" - "os" - "runtime/debug" - "strings" - "sync" - "sync/atomic" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/hub" +"github.com/kercylan98/minotaur/utils/log" +"github.com/kercylan98/minotaur/utils/random" +"github.com/kercylan98/minotaur/utils/timer" +"github.com/panjf2000/gnet" +"github.com/xtaci/kcp-go/v5" +"io" +"net" +"net/http" +"os" +"runtime/debug" +"strings" +"sync" +"sync/atomic" +"time" ) var wsRequestKey = fmt.Sprintf("WS:REQ:%s", strings.ToUpper(random.HostName())) diff --git a/internal/server/conn_mgr.go b/internal/server/conn_mgr.go index c60f6a5e..8a1e2d6e 100644 --- a/internal/server/conn_mgr.go +++ b/internal/server/conn_mgr.go @@ -2,10 +2,9 @@ package server import ( "context" - "github.com/kercylan98/minotaur/utils/collection" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"sync" ) - type connMgr struct { connections map[string]*Conn // 所有连接 diff --git a/internal/server/event.go b/internal/server/event.go index 0e1262cb..60f8bd48 100644 --- a/internal/server/event.go +++ b/internal/server/event.go @@ -2,20 +2,19 @@ package server import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/collection/listings" - "github.com/kercylan98/minotaur/utils/log" - "github.com/kercylan98/minotaur/utils/runtimes" - "golang.org/x/crypto/ssh/terminal" - "net/url" - "os" - "reflect" - "runtime/debug" - "strings" - "sync" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/collection/listings" +"github.com/kercylan98/minotaur/utils/log" +"github.com/kercylan98/minotaur/utils/runtimes" +"golang.org/x/crypto/ssh/terminal" +"net/url" +"os" +"reflect" +"runtime/debug" +"strings" +"sync" +"time" ) - type ( MessageReadyEventHandler func(srv *Server) StartBeforeEventHandler func(srv *Server) diff --git a/internal/server/gateway/events.go b/internal/server/gateway/events.go index cace5aaf..f6d6011d 100644 --- a/internal/server/gateway/events.go +++ b/internal/server/gateway/events.go @@ -2,10 +2,9 @@ package gateway import ( "github.com/kercylan98/minotaur/server" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/collection/listings" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/collection/listings" ) - type ( ConnectionOpenedEventHandle func(gateway *Gateway, conn *server.Conn) ConnectionClosedEventHandle func(gateway *Gateway, conn *server.Conn) diff --git a/internal/server/message.go b/internal/server/message.go index e4c20287..c80904b4 100644 --- a/internal/server/message.go +++ b/internal/server/message.go @@ -2,10 +2,10 @@ package server import ( "github.com/kercylan98/minotaur/server/internal/dispatcher" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/log" - "github.com/kercylan98/minotaur/utils/super" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/log" +"github.com/kercylan98/minotaur/utils/super" +"sync" ) const ( diff --git a/internal/server/network.go b/internal/server/network.go index 14097cc5..0f645e26 100644 --- a/internal/server/network.go +++ b/internal/server/network.go @@ -4,16 +4,16 @@ import ( "fmt" "github.com/gin-gonic/gin" "github.com/kercylan98/minotaur/server/internal/logger" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/log" - "github.com/kercylan98/minotaur/utils/super" - "github.com/panjf2000/gnet" - "github.com/xtaci/kcp-go/v5" - "google.golang.org/grpc" - "net" - "net/http" - "strings" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/log" +"github.com/kercylan98/minotaur/utils/super" +"github.com/panjf2000/gnet" +"github.com/xtaci/kcp-go/v5" +"google.golang.org/grpc" +"net" +"net/http" +"strings" +"time" ) // Network 服务器运行的网络模式 diff --git a/internal/server/server.go b/internal/server/server.go index 4ea9b6f6..57fc05ac 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -7,25 +7,25 @@ import ( "github.com/gin-gonic/gin" "github.com/kercylan98/minotaur/server/internal/dispatcher" "github.com/kercylan98/minotaur/server/internal/logger" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/hub" - "github.com/kercylan98/minotaur/utils/log" - "github.com/kercylan98/minotaur/utils/network" - "github.com/kercylan98/minotaur/utils/str" - "github.com/kercylan98/minotaur/utils/super" - "github.com/kercylan98/minotaur/utils/timer" - "github.com/panjf2000/ants/v2" - "github.com/panjf2000/gnet" - "github.com/xtaci/kcp-go/v5" - "google.golang.org/grpc" - "net/http" - "os" - "os/signal" - "runtime/debug" - "sync" - "sync/atomic" - "syscall" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/hub" +"github.com/kercylan98/minotaur/utils/log" +"github.com/kercylan98/minotaur/utils/network" +"github.com/kercylan98/minotaur/utils/str" +"github.com/kercylan98/minotaur/utils/super" +"github.com/kercylan98/minotaur/utils/timer" +"github.com/panjf2000/ants/v2" +"github.com/panjf2000/gnet" +"github.com/xtaci/kcp-go/v5" +"google.golang.org/grpc" +"net/http" +"os" +"os/signal" +"runtime/debug" +"sync" +"sync/atomic" +"syscall" +"time" ) // New 根据特定网络类型创建一个服务器 diff --git a/internal/utils/aoi/2d.go b/internal/utils/aoi/2d.go index 3eb15aa8..fac061c9 100644 --- a/internal/utils/aoi/2d.go +++ b/internal/utils/aoi/2d.go @@ -1,11 +1,11 @@ package aoi import ( - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/generic" - "github.com/kercylan98/minotaur/utils/geometry" - "math" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/generic" +"github.com/kercylan98/minotaur/utils/geometry" +"math" +"sync" ) func NewTwoDimensional[EID generic.Basic, PosType generic.SignedNumber, E TwoDimensionalEntity[EID, PosType]](width, height, areaWidth, areaHeight int) *TwoDimensional[EID, PosType, E] { diff --git a/internal/utils/arrangement/area.go b/internal/utils/arrangement/area.go index a085c0c1..bdda6c93 100644 --- a/internal/utils/arrangement/area.go +++ b/internal/utils/arrangement/area.go @@ -1,7 +1,7 @@ package arrangement import ( - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) // Area 编排区域 diff --git a/internal/utils/arrangement/arrangement.go b/internal/utils/arrangement/arrangement.go index bd19d1b1..43e6963c 100644 --- a/internal/utils/arrangement/arrangement.go +++ b/internal/utils/arrangement/arrangement.go @@ -1,8 +1,8 @@ package arrangement import ( - "github.com/kercylan98/minotaur/utils/collection" - "sort" +"github.com/kercylan98/minotaur/toolkit/collection" +"sort" ) // NewArrangement 创建一个新的编排 diff --git a/internal/utils/arrangement/editor.go b/internal/utils/arrangement/editor.go index c7a23de5..d33bf7eb 100644 --- a/internal/utils/arrangement/editor.go +++ b/internal/utils/arrangement/editor.go @@ -1,8 +1,8 @@ package arrangement import ( - "github.com/kercylan98/minotaur/utils/collection" - "sort" +"github.com/kercylan98/minotaur/toolkit/collection" +"sort" ) // Editor 提供了大量辅助函数的编辑器 diff --git a/internal/utils/chrono/scheduler.go b/internal/utils/chrono/scheduler.go index d7ed3a1a..1a0d8e98 100644 --- a/internal/utils/chrono/scheduler.go +++ b/internal/utils/chrono/scheduler.go @@ -3,10 +3,10 @@ package chrono import ( "github.com/RussellLuo/timingwheel" "github.com/gorhill/cronexpr" - "github.com/kercylan98/minotaur/utils/collection" - "reflect" - "sync" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"reflect" +"sync" +"time" ) const ( diff --git a/internal/utils/chrono/state_line.go b/internal/utils/chrono/state_line.go index e0377a43..20b569fa 100644 --- a/internal/utils/chrono/state_line.go +++ b/internal/utils/chrono/state_line.go @@ -2,10 +2,10 @@ package chrono import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/generic" - "strings" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/generic" +"strings" +"time" ) // NewStateLine 创建一个从左向右由早到晚的状态时间线 diff --git a/internal/utils/collection/clone_example_test.go b/internal/utils/collection/clone_example_test.go index 7fe9b836..bff0ce44 100644 --- a/internal/utils/collection/clone_example_test.go +++ b/internal/utils/collection/clone_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) // 在该示例中,将 slice 克隆后将会得到一个新的 slice result,而 result 和 slice 将不会有任何关联,但是如果 slice 中的元素是引用类型,那么 result 中的元素将会和 slice 中的元素指向同一个地址 diff --git a/internal/utils/collection/clone_test.go b/internal/utils/collection/clone_test.go index 1fc2803d..1ada3a5c 100644 --- a/internal/utils/collection/clone_test.go +++ b/internal/utils/collection/clone_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestCloneSlice(t *testing.T) { diff --git a/internal/utils/collection/contains_example_test.go b/internal/utils/collection/contains_example_test.go index 033f0fec..b9b73e70 100644 --- a/internal/utils/collection/contains_example_test.go +++ b/internal/utils/collection/contains_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleEqualSlice() { diff --git a/internal/utils/collection/contains_test.go b/internal/utils/collection/contains_test.go index f9f1b323..2bf5a734 100644 --- a/internal/utils/collection/contains_test.go +++ b/internal/utils/collection/contains_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) var intComparisonHandler = func(source, target int) bool { diff --git a/internal/utils/collection/convert_example_test.go b/internal/utils/collection/convert_example_test.go index 468e6eac..181557db 100644 --- a/internal/utils/collection/convert_example_test.go +++ b/internal/utils/collection/convert_example_test.go @@ -2,9 +2,9 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "reflect" - "sort" +"github.com/kercylan98/minotaur/toolkit/collection" +"reflect" +"sort" ) func ExampleConvertSliceToBatches() { diff --git a/internal/utils/collection/convert_test.go b/internal/utils/collection/convert_test.go index a117cc9d..92ff2992 100644 --- a/internal/utils/collection/convert_test.go +++ b/internal/utils/collection/convert_test.go @@ -1,9 +1,9 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "reflect" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"reflect" +"testing" ) func TestConvertSliceToBatches(t *testing.T) { diff --git a/internal/utils/collection/drop_test.go b/internal/utils/collection/drop_test.go index b4540e95..3854f9a2 100644 --- a/internal/utils/collection/drop_test.go +++ b/internal/utils/collection/drop_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestClearSlice(t *testing.T) { diff --git a/internal/utils/collection/duplicate_test.go b/internal/utils/collection/duplicate_test.go index 2632441d..edb64a62 100644 --- a/internal/utils/collection/duplicate_test.go +++ b/internal/utils/collection/duplicate_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestDeduplicateSliceInPlace(t *testing.T) { diff --git a/internal/utils/collection/filter_example_test.go b/internal/utils/collection/filter_example_test.go index cd80fac8..9becb3e8 100644 --- a/internal/utils/collection/filter_example_test.go +++ b/internal/utils/collection/filter_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleFilterOutByIndices() { diff --git a/internal/utils/collection/filter_test.go b/internal/utils/collection/filter_test.go index edc1d557..e3fea2d8 100644 --- a/internal/utils/collection/filter_test.go +++ b/internal/utils/collection/filter_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestFilterOutByIndices(t *testing.T) { diff --git a/internal/utils/collection/find_example_test.go b/internal/utils/collection/find_example_test.go index 3c73c5eb..8a6bf6eb 100644 --- a/internal/utils/collection/find_example_test.go +++ b/internal/utils/collection/find_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleFindLoopedNextInSlice() { diff --git a/internal/utils/collection/find_test.go b/internal/utils/collection/find_test.go index 8838ea60..8c4c2229 100644 --- a/internal/utils/collection/find_test.go +++ b/internal/utils/collection/find_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestFindLoopedNextInSlice(t *testing.T) { diff --git a/internal/utils/collection/item_example_test.go b/internal/utils/collection/item_example_test.go index 277ee7ad..86528055 100644 --- a/internal/utils/collection/item_example_test.go +++ b/internal/utils/collection/item_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleSwapSlice() { diff --git a/internal/utils/collection/item_test.go b/internal/utils/collection/item_test.go index faf36a34..8944302b 100644 --- a/internal/utils/collection/item_test.go +++ b/internal/utils/collection/item_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestSwapSlice(t *testing.T) { diff --git a/internal/utils/collection/listings/sync_slice.go b/internal/utils/collection/listings/sync_slice.go index 32992896..9030d2c6 100644 --- a/internal/utils/collection/listings/sync_slice.go +++ b/internal/utils/collection/listings/sync_slice.go @@ -1,8 +1,8 @@ package listings import ( - "github.com/kercylan98/minotaur/utils/collection" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"sync" ) // NewSyncSlice 创建一个 SyncSlice diff --git a/internal/utils/collection/loop_example_test.go b/internal/utils/collection/loop_example_test.go index f7256068..2efc4f51 100644 --- a/internal/utils/collection/loop_example_test.go +++ b/internal/utils/collection/loop_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleLoopSlice() { diff --git a/internal/utils/collection/loop_test.go b/internal/utils/collection/loop_test.go index 8c0c739f..e91d4c62 100644 --- a/internal/utils/collection/loop_test.go +++ b/internal/utils/collection/loop_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestLoopSlice(t *testing.T) { diff --git a/internal/utils/collection/map_example_test.go b/internal/utils/collection/map_example_test.go index d26b712b..56fe0ce1 100644 --- a/internal/utils/collection/map_example_test.go +++ b/internal/utils/collection/map_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleMappingFromSlice() { diff --git a/internal/utils/collection/map_test.go b/internal/utils/collection/map_test.go index 163b598b..81fff6c7 100644 --- a/internal/utils/collection/map_test.go +++ b/internal/utils/collection/map_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestMappingFromSlice(t *testing.T) { diff --git a/internal/utils/collection/mappings/sync_map.go b/internal/utils/collection/mappings/sync_map.go index 6da93c02..075d14ae 100644 --- a/internal/utils/collection/mappings/sync_map.go +++ b/internal/utils/collection/mappings/sync_map.go @@ -2,8 +2,8 @@ package mappings import ( "encoding/json" - "github.com/kercylan98/minotaur/utils/collection" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"sync" ) // NewSyncMap 创建一个 SyncMap diff --git a/internal/utils/collection/merge_example_test.go b/internal/utils/collection/merge_example_test.go index bf34c43f..d6ee6b63 100644 --- a/internal/utils/collection/merge_example_test.go +++ b/internal/utils/collection/merge_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleMergeSlice() { diff --git a/internal/utils/collection/merge_test.go b/internal/utils/collection/merge_test.go index 46ce9be8..85056397 100644 --- a/internal/utils/collection/merge_test.go +++ b/internal/utils/collection/merge_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestMergeSlice(t *testing.T) { diff --git a/internal/utils/collection/random_example_test.go b/internal/utils/collection/random_example_test.go index d19a7d59..433a83b9 100644 --- a/internal/utils/collection/random_example_test.go +++ b/internal/utils/collection/random_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleChooseRandomSliceElementRepeatN() { diff --git a/internal/utils/collection/random_test.go b/internal/utils/collection/random_test.go index 27a6e1be..2f8bd183 100644 --- a/internal/utils/collection/random_test.go +++ b/internal/utils/collection/random_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestChooseRandomSliceElementRepeatN(t *testing.T) { diff --git a/internal/utils/collection/sort_example_test.go b/internal/utils/collection/sort_example_test.go index be6164d2..fa39f24d 100644 --- a/internal/utils/collection/sort_example_test.go +++ b/internal/utils/collection/sort_example_test.go @@ -2,8 +2,8 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "sort" +"github.com/kercylan98/minotaur/toolkit/collection" +"sort" ) func ExampleDescBy() { diff --git a/internal/utils/collection/sort_test.go b/internal/utils/collection/sort_test.go index 26a0dfc3..c732f9e3 100644 --- a/internal/utils/collection/sort_test.go +++ b/internal/utils/collection/sort_test.go @@ -1,9 +1,9 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "sort" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"sort" +"testing" ) func TestDescBy(t *testing.T) { diff --git a/internal/utils/combination/matcher_options.go b/internal/utils/combination/matcher_options.go index 26c1476f..401bad78 100644 --- a/internal/utils/combination/matcher_options.go +++ b/internal/utils/combination/matcher_options.go @@ -1,10 +1,10 @@ package combination import ( - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/generic" - "reflect" - "sort" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/generic" +"reflect" +"sort" ) // MatcherOption 匹配器选项 diff --git a/internal/utils/deck/deck.go b/internal/utils/deck/deck.go index 554dff00..ebbda6fc 100644 --- a/internal/utils/deck/deck.go +++ b/internal/utils/deck/deck.go @@ -1,7 +1,7 @@ package deck import ( - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) // NewDeck 创建一个新的甲板 diff --git a/internal/utils/file/file.go b/internal/utils/file/file.go index a579e957..32a6977a 100644 --- a/internal/utils/file/file.go +++ b/internal/utils/file/file.go @@ -2,11 +2,11 @@ package file import ( "bufio" - "github.com/kercylan98/minotaur/utils/collection" - "io" - "os" - "path/filepath" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"io" +"os" +"path/filepath" +"sync" ) // PathExist 路径是否存在 diff --git a/internal/utils/fsm/fsm.go b/internal/utils/fsm/fsm.go index 5220c656..d6985282 100644 --- a/internal/utils/fsm/fsm.go +++ b/internal/utils/fsm/fsm.go @@ -2,7 +2,7 @@ package fsm import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) // NewFSM 创建一个新的状态机 diff --git a/internal/utils/geometry/shape.go b/internal/utils/geometry/shape.go index f88b90a9..1b46b37f 100644 --- a/internal/utils/geometry/shape.go +++ b/internal/utils/geometry/shape.go @@ -3,11 +3,11 @@ package geometry import ( "bytes" "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/generic" - "math" - "sort" - "strings" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/generic" +"math" +"sort" +"strings" ) var ( diff --git a/internal/utils/hub/object_pool_example_test.go b/internal/utils/hub/object_pool_example_test.go index 73d267fc..9f0f54ec 100644 --- a/internal/utils/hub/object_pool_example_test.go +++ b/internal/utils/hub/object_pool_example_test.go @@ -2,8 +2,8 @@ package hub_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/hub" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/hub" ) func ExampleNewObjectPool() { diff --git a/internal/utils/maths/compare.go b/internal/utils/maths/compare.go index 70eb450a..5b4e099a 100644 --- a/internal/utils/maths/compare.go +++ b/internal/utils/maths/compare.go @@ -1,9 +1,9 @@ package maths import ( - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/generic" - "sort" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/generic" +"sort" ) const ( diff --git a/internal/utils/memory/memory.go b/internal/utils/memory/memory.go index a8bfa212..d1a5e80a 100644 --- a/internal/utils/memory/memory.go +++ b/internal/utils/memory/memory.go @@ -2,12 +2,12 @@ package memory import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/random" - "github.com/kercylan98/minotaur/utils/super" - "reflect" - "strings" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/random" +"github.com/kercylan98/minotaur/utils/super" +"reflect" +"strings" +"sync" ) var ( diff --git a/internal/utils/sole/once.go b/internal/utils/sole/once.go index 95044784..3200c488 100644 --- a/internal/utils/sole/once.go +++ b/internal/utils/sole/once.go @@ -1,7 +1,7 @@ package sole import ( - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) // NewOnce 创建一个用于数据取值去重的结构实例 diff --git a/internal/utils/times/line.go b/internal/utils/times/line.go index c346f6de..4e8c3a47 100644 --- a/internal/utils/times/line.go +++ b/internal/utils/times/line.go @@ -2,10 +2,10 @@ package times import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/generic" - "strings" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/generic" +"strings" +"time" ) // NewStateLine 创建一个从左向右由早到晚的状态时间线 diff --git a/modular/example/internal/dimension/dimensions/dimensions/visitors/visitors.go b/modular/example/internal/dimension/dimensions/dimensions/visitors/visitors.go index 0e1a91f8..d6b4097c 100644 --- a/modular/example/internal/dimension/dimensions/dimensions/visitors/visitors.go +++ b/modular/example/internal/dimension/dimensions/dimensions/visitors/visitors.go @@ -5,9 +5,8 @@ import ( "github.com/kercylan98/minotaur/modular/example/internal/dimension/core" "github.com/kercylan98/minotaur/modular/example/internal/dimension/dimensions/exposes" "github.com/kercylan98/minotaur/modular/example/internal/dimension/dimensions/models" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) - type Dimension struct { *core.Room // 房间 Id visitors map[string]*models.VisitorsMember // 所有访客 diff --git a/server/events.go b/server/events.go index 64e7c6a0..c12b599e 100644 --- a/server/events.go +++ b/server/events.go @@ -2,9 +2,8 @@ package server import ( "context" + "github.com/kercylan98/minotaur/toolkit/collection/listings" "time" - - "github.com/kercylan98/minotaur/utils/collection/listings" ) type ( @@ -67,7 +66,7 @@ func (s *events) onLaunched() { s.PublishSyncMessage(s.getSysQueue(), func(ctx context.Context) { s.launchedEventHandlers.RangeValue(func(index int, value LaunchedEventHandler) bool { value(s.server, s.server.state.Ip, s.server.state.LaunchedAt) - return true + return true }) }) } diff --git a/server/network/websocket.go b/server/network/websocket.go index 746b3568..a956f537 100644 --- a/server/network/websocket.go +++ b/server/network/websocket.go @@ -3,9 +3,9 @@ package network import ( "context" "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/panjf2000/gnet/v2" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/panjf2000/gnet/v2" +"time" ) func WebSocket(addr string, pattern ...string) server.Network { diff --git a/server/options.go b/server/options.go index ff1c3521..67bd6d01 100644 --- a/server/options.go +++ b/server/options.go @@ -1,6 +1,7 @@ package server import ( + "github.com/kercylan98/minotaur/toolkit/log" "os" "runtime" "sync" diff --git a/server/server.go b/server/server.go index 5bbcdf5e..b3a36201 100644 --- a/server/server.go +++ b/server/server.go @@ -7,13 +7,10 @@ import ( "github.com/kercylan98/minotaur/toolkit/nexus/brokers" messageEvents "github.com/kercylan98/minotaur/toolkit/nexus/events" "github.com/kercylan98/minotaur/toolkit/nexus/queues" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/random" + "github.com/kercylan98/minotaur/toolkit/random" "github.com/panjf2000/ants/v2" "reflect" "time" - - "github.com/kercylan98/minotaur/utils/network" ) type Server interface { diff --git a/server/server_test.go b/server/server_test.go index c4bbb2e4..3511c45b 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -3,11 +3,11 @@ package server_test import ( "context" "github.com/gobwas/ws" - "github.com/kercylan98/minotaur/server/internal/v2" - "github.com/kercylan98/minotaur/server/internal/v2/network" - "github.com/kercylan98/minotaur/utils/log/v2" - "github.com/kercylan98/minotaur/utils/random" - "github.com/kercylan98/minotaur/utils/times" + "github.com/kercylan98/minotaur/server" + "github.com/kercylan98/minotaur/server/network" + "github.com/kercylan98/minotaur/toolkit/chrono" + "github.com/kercylan98/minotaur/toolkit/log" + "github.com/kercylan98/minotaur/toolkit/random" "testing" "time" ) @@ -26,7 +26,7 @@ func TestNewServer(t *testing.T) { }) }() - srv := server.NewServer(network.WebSocket(":9999"), server.NewOptions().WithLifeCycleLimit(times.Day*3).WithLogger(log.GetLogger())) + srv := server.NewServer(network.WebSocket(":9999"), server.NewOptions().WithLifeCycleLimit(chrono.Day*3).WithLogger(log.GetLogger())) var tm = make(map[string]bool) diff --git a/toolkit/buffer/ring_benchmark_test.go b/toolkit/buffer/ring_benchmark_test.go index ee1f6aff..2311f6ef 100644 --- a/toolkit/buffer/ring_benchmark_test.go +++ b/toolkit/buffer/ring_benchmark_test.go @@ -1,7 +1,7 @@ package buffer_test import ( - "github.com/kercylan98/minotaur/utils/buffer" + "github.com/kercylan98/minotaur/toolkit/buffer" "testing" ) diff --git a/toolkit/buffer/ring_test.go b/toolkit/buffer/ring_test.go index 5461102d..2669b942 100644 --- a/toolkit/buffer/ring_test.go +++ b/toolkit/buffer/ring_test.go @@ -1,7 +1,6 @@ package buffer_test import ( - "github.com/kercylan98/minotaur/utils/buffer" "testing" ) diff --git a/toolkit/buffer/ring_unbounded_benchmark_test.go b/toolkit/buffer/ring_unbounded_benchmark_test.go index 4f983dbb..f8ecae81 100644 --- a/toolkit/buffer/ring_unbounded_benchmark_test.go +++ b/toolkit/buffer/ring_unbounded_benchmark_test.go @@ -1,7 +1,7 @@ package buffer_test import ( - "github.com/kercylan98/minotaur/utils/buffer" + "github.com/kercylan98/minotaur/toolkit/buffer" "testing" ) diff --git a/toolkit/buffer/ring_unbounded_test.go b/toolkit/buffer/ring_unbounded_test.go index d7b69593..aa0cf44d 100644 --- a/toolkit/buffer/ring_unbounded_test.go +++ b/toolkit/buffer/ring_unbounded_test.go @@ -1,7 +1,7 @@ package buffer_test import ( - "github.com/kercylan98/minotaur/utils/buffer" + "github.com/kercylan98/minotaur/toolkit/buffer" "testing" ) diff --git a/toolkit/buffer/unbounded_benchmark_test.go b/toolkit/buffer/unbounded_benchmark_test.go index 6ee69a7e..f3b3c480 100644 --- a/toolkit/buffer/unbounded_benchmark_test.go +++ b/toolkit/buffer/unbounded_benchmark_test.go @@ -1,7 +1,7 @@ package buffer_test import ( - "github.com/kercylan98/minotaur/utils/buffer" + "github.com/kercylan98/minotaur/toolkit/buffer" "testing" ) diff --git a/toolkit/buffer/unbounded_test.go b/toolkit/buffer/unbounded_test.go index ea8b75fc..1d096f05 100644 --- a/toolkit/buffer/unbounded_test.go +++ b/toolkit/buffer/unbounded_test.go @@ -2,7 +2,7 @@ package buffer_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/buffer" + "github.com/kercylan98/minotaur/toolkit/buffer" "testing" ) diff --git a/toolkit/chrono/scheduler.go b/toolkit/chrono/scheduler.go index d7ed3a1a..1a0d8e98 100644 --- a/toolkit/chrono/scheduler.go +++ b/toolkit/chrono/scheduler.go @@ -3,10 +3,10 @@ package chrono import ( "github.com/RussellLuo/timingwheel" "github.com/gorhill/cronexpr" - "github.com/kercylan98/minotaur/utils/collection" - "reflect" - "sync" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"reflect" +"sync" +"time" ) const ( diff --git a/toolkit/chrono/state_line.go b/toolkit/chrono/state_line.go index e0377a43..20b569fa 100644 --- a/toolkit/chrono/state_line.go +++ b/toolkit/chrono/state_line.go @@ -2,10 +2,10 @@ package chrono import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "github.com/kercylan98/minotaur/utils/generic" - "strings" - "time" +"github.com/kercylan98/minotaur/toolkit/collection" +"github.com/kercylan98/minotaur/utils/generic" +"strings" +"time" ) // NewStateLine 创建一个从左向右由早到晚的状态时间线 diff --git a/toolkit/collection/clone_example_test.go b/toolkit/collection/clone_example_test.go index 7fe9b836..1bdaf5d0 100644 --- a/toolkit/collection/clone_example_test.go +++ b/toolkit/collection/clone_example_test.go @@ -2,7 +2,8 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" + "" +"github.com/kercylan98/minotaur/toolkit/collection" ) // 在该示例中,将 slice 克隆后将会得到一个新的 slice result,而 result 和 slice 将不会有任何关联,但是如果 slice 中的元素是引用类型,那么 result 中的元素将会和 slice 中的元素指向同一个地址 diff --git a/toolkit/collection/clone_test.go b/toolkit/collection/clone_test.go index 1fc2803d..1ada3a5c 100644 --- a/toolkit/collection/clone_test.go +++ b/toolkit/collection/clone_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestCloneSlice(t *testing.T) { diff --git a/toolkit/collection/contains_example_test.go b/toolkit/collection/contains_example_test.go index 033f0fec..f2fe40d0 100644 --- a/toolkit/collection/contains_example_test.go +++ b/toolkit/collection/contains_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" + "github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleEqualSlice() { diff --git a/toolkit/collection/contains_test.go b/toolkit/collection/contains_test.go index f9f1b323..2bf5a734 100644 --- a/toolkit/collection/contains_test.go +++ b/toolkit/collection/contains_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) var intComparisonHandler = func(source, target int) bool { diff --git a/toolkit/collection/convert_example_test.go b/toolkit/collection/convert_example_test.go index 468e6eac..181557db 100644 --- a/toolkit/collection/convert_example_test.go +++ b/toolkit/collection/convert_example_test.go @@ -2,9 +2,9 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "reflect" - "sort" +"github.com/kercylan98/minotaur/toolkit/collection" +"reflect" +"sort" ) func ExampleConvertSliceToBatches() { diff --git a/toolkit/collection/convert_test.go b/toolkit/collection/convert_test.go index a117cc9d..92ff2992 100644 --- a/toolkit/collection/convert_test.go +++ b/toolkit/collection/convert_test.go @@ -1,9 +1,9 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "reflect" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"reflect" +"testing" ) func TestConvertSliceToBatches(t *testing.T) { diff --git a/toolkit/collection/drop_test.go b/toolkit/collection/drop_test.go index b4540e95..3854f9a2 100644 --- a/toolkit/collection/drop_test.go +++ b/toolkit/collection/drop_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestClearSlice(t *testing.T) { diff --git a/toolkit/collection/duplicate_test.go b/toolkit/collection/duplicate_test.go index 2632441d..edb64a62 100644 --- a/toolkit/collection/duplicate_test.go +++ b/toolkit/collection/duplicate_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestDeduplicateSliceInPlace(t *testing.T) { diff --git a/toolkit/collection/filter_example_test.go b/toolkit/collection/filter_example_test.go index cd80fac8..9becb3e8 100644 --- a/toolkit/collection/filter_example_test.go +++ b/toolkit/collection/filter_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleFilterOutByIndices() { diff --git a/toolkit/collection/filter_test.go b/toolkit/collection/filter_test.go index edc1d557..e3fea2d8 100644 --- a/toolkit/collection/filter_test.go +++ b/toolkit/collection/filter_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestFilterOutByIndices(t *testing.T) { diff --git a/toolkit/collection/find_example_test.go b/toolkit/collection/find_example_test.go index 3c73c5eb..8a6bf6eb 100644 --- a/toolkit/collection/find_example_test.go +++ b/toolkit/collection/find_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleFindLoopedNextInSlice() { diff --git a/toolkit/collection/find_test.go b/toolkit/collection/find_test.go index 8838ea60..8c4c2229 100644 --- a/toolkit/collection/find_test.go +++ b/toolkit/collection/find_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestFindLoopedNextInSlice(t *testing.T) { diff --git a/toolkit/collection/item_example_test.go b/toolkit/collection/item_example_test.go index 277ee7ad..86528055 100644 --- a/toolkit/collection/item_example_test.go +++ b/toolkit/collection/item_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleSwapSlice() { diff --git a/toolkit/collection/item_test.go b/toolkit/collection/item_test.go index faf36a34..8944302b 100644 --- a/toolkit/collection/item_test.go +++ b/toolkit/collection/item_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestSwapSlice(t *testing.T) { diff --git a/toolkit/collection/listings/sync_slice.go b/toolkit/collection/listings/sync_slice.go index 32992896..9030d2c6 100644 --- a/toolkit/collection/listings/sync_slice.go +++ b/toolkit/collection/listings/sync_slice.go @@ -1,8 +1,8 @@ package listings import ( - "github.com/kercylan98/minotaur/utils/collection" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"sync" ) // NewSyncSlice 创建一个 SyncSlice diff --git a/toolkit/collection/loop_example_test.go b/toolkit/collection/loop_example_test.go index f7256068..2efc4f51 100644 --- a/toolkit/collection/loop_example_test.go +++ b/toolkit/collection/loop_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleLoopSlice() { diff --git a/toolkit/collection/loop_test.go b/toolkit/collection/loop_test.go index 8c0c739f..e91d4c62 100644 --- a/toolkit/collection/loop_test.go +++ b/toolkit/collection/loop_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestLoopSlice(t *testing.T) { diff --git a/toolkit/collection/map_example_test.go b/toolkit/collection/map_example_test.go index d26b712b..56fe0ce1 100644 --- a/toolkit/collection/map_example_test.go +++ b/toolkit/collection/map_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleMappingFromSlice() { diff --git a/toolkit/collection/map_test.go b/toolkit/collection/map_test.go index 163b598b..81fff6c7 100644 --- a/toolkit/collection/map_test.go +++ b/toolkit/collection/map_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestMappingFromSlice(t *testing.T) { diff --git a/toolkit/collection/mappings/sync_map.go b/toolkit/collection/mappings/sync_map.go index 6da93c02..075d14ae 100644 --- a/toolkit/collection/mappings/sync_map.go +++ b/toolkit/collection/mappings/sync_map.go @@ -2,8 +2,8 @@ package mappings import ( "encoding/json" - "github.com/kercylan98/minotaur/utils/collection" - "sync" +"github.com/kercylan98/minotaur/toolkit/collection" +"sync" ) // NewSyncMap 创建一个 SyncMap diff --git a/toolkit/collection/merge_example_test.go b/toolkit/collection/merge_example_test.go index bf34c43f..d6ee6b63 100644 --- a/toolkit/collection/merge_example_test.go +++ b/toolkit/collection/merge_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleMergeSlice() { diff --git a/toolkit/collection/merge_test.go b/toolkit/collection/merge_test.go index 46ce9be8..85056397 100644 --- a/toolkit/collection/merge_test.go +++ b/toolkit/collection/merge_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestMergeSlice(t *testing.T) { diff --git a/toolkit/collection/random_example_test.go b/toolkit/collection/random_example_test.go index d19a7d59..433a83b9 100644 --- a/toolkit/collection/random_example_test.go +++ b/toolkit/collection/random_example_test.go @@ -2,7 +2,7 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" +"github.com/kercylan98/minotaur/toolkit/collection" ) func ExampleChooseRandomSliceElementRepeatN() { diff --git a/toolkit/collection/random_test.go b/toolkit/collection/random_test.go index 27a6e1be..2f8bd183 100644 --- a/toolkit/collection/random_test.go +++ b/toolkit/collection/random_test.go @@ -1,8 +1,8 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"testing" ) func TestChooseRandomSliceElementRepeatN(t *testing.T) { diff --git a/toolkit/collection/sort_example_test.go b/toolkit/collection/sort_example_test.go index be6164d2..fa39f24d 100644 --- a/toolkit/collection/sort_example_test.go +++ b/toolkit/collection/sort_example_test.go @@ -2,8 +2,8 @@ package collection_test import ( "fmt" - "github.com/kercylan98/minotaur/utils/collection" - "sort" +"github.com/kercylan98/minotaur/toolkit/collection" +"sort" ) func ExampleDescBy() { diff --git a/toolkit/collection/sort_test.go b/toolkit/collection/sort_test.go index 26a0dfc3..c732f9e3 100644 --- a/toolkit/collection/sort_test.go +++ b/toolkit/collection/sort_test.go @@ -1,9 +1,9 @@ package collection_test import ( - "github.com/kercylan98/minotaur/utils/collection" - "sort" - "testing" +"github.com/kercylan98/minotaur/toolkit/collection" +"sort" +"testing" ) func TestDescBy(t *testing.T) { diff --git a/toolkit/fileproc/file.go b/toolkit/fileproc/file.go index da640495..2d479e8c 100644 --- a/toolkit/fileproc/file.go +++ b/toolkit/fileproc/file.go @@ -2,10 +2,11 @@ package fileproc import ( "bufio" - "github.com/kercylan98/minotaur/toolkit/collection" - "io" - "os" - "sync" + "" +"github.com/kercylan98/minotaur/toolkit/collection" +"io" +"os" +"sync" ) // WriteToFile 向特定文件写入内容,如果文件不存在则创建 diff --git a/toolkit/internal/ecs/world.go b/toolkit/internal/ecs/world.go index 1b293eeb..bf675162 100644 --- a/toolkit/internal/ecs/world.go +++ b/toolkit/internal/ecs/world.go @@ -2,8 +2,8 @@ package ecs import ( "github.com/kercylan98/minotaur/toolkit/ident" - "github.com/kercylan98/minotaur/utils/collection" - "reflect" +"github.com/kercylan98/minotaur/toolkit/collection" +"reflect" ) // NewWorld 创建一个新的世界 diff --git a/internal/utils/log/v2/color.go b/toolkit/log/color.go similarity index 100% rename from internal/utils/log/v2/color.go rename to toolkit/log/color.go diff --git a/internal/utils/log/v2/defines.go b/toolkit/log/defines.go similarity index 100% rename from internal/utils/log/v2/defines.go rename to toolkit/log/defines.go diff --git a/internal/utils/log/v2/field.go b/toolkit/log/field.go similarity index 78% rename from internal/utils/log/v2/field.go rename to toolkit/log/field.go index 03c7c24e..3857b838 100644 --- a/internal/utils/log/v2/field.go +++ b/toolkit/log/field.go @@ -1,7 +1,7 @@ package log import ( - "github.com/kercylan98/minotaur/utils/generic" + "github.com/kercylan98/minotaur/toolkit/constraints" "github.com/pkg/errors" "log/slog" "time" @@ -53,12 +53,12 @@ func StringP(key string, val *string) Field { } // Int 构造一个带有整数值的字段 -func Int[I generic.Integer](key string, val I) Field { +func Int[I constraints.Int](key string, val I) Field { return slog.Int(key, int(val)) } // IntP 构造一个带有整数值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func IntP[I generic.Integer](key string, val *I) Field { +func IntP[I constraints.Int](key string, val *I) Field { if val == nil { return slog.Any(key, nil) } @@ -66,12 +66,12 @@ func IntP[I generic.Integer](key string, val *I) Field { } // Int8 构造一个带有整数值的字段 -func Int8[I generic.Integer](key string, val I) Field { +func Int8[I constraints.Int](key string, val I) Field { return slog.Int(key, int(val)) } // Int8P 构造一个带有整数值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func Int8P[I generic.Integer](key string, val *I) Field { +func Int8P[I constraints.Int](key string, val *I) Field { if val == nil { return slog.Any(key, nil) } @@ -79,12 +79,12 @@ func Int8P[I generic.Integer](key string, val *I) Field { } // Int16 构造一个带有整数值的字段 -func Int16[I generic.Integer](key string, val I) Field { +func Int16[I constraints.Int](key string, val I) Field { return slog.Int(key, int(val)) } // Int16P 构造一个带有整数值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func Int16P[I generic.Integer](key string, val *I) Field { +func Int16P[I constraints.Int](key string, val *I) Field { if val == nil { return slog.Any(key, nil) } @@ -92,12 +92,12 @@ func Int16P[I generic.Integer](key string, val *I) Field { } // Int32 构造一个带有整数值的字段 -func Int32[I generic.Integer](key string, val I) Field { +func Int32[I constraints.Int](key string, val I) Field { return slog.Int(key, int(val)) } // Int32P 构造一个带有整数值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func Int32P[I generic.Integer](key string, val *I) Field { +func Int32P[I constraints.Int](key string, val *I) Field { if val == nil { return slog.Any(key, nil) } @@ -105,12 +105,12 @@ func Int32P[I generic.Integer](key string, val *I) Field { } // Int64 构造一个带有整数值的字段 -func Int64[I generic.Integer](key string, val I) Field { +func Int64[I constraints.Int](key string, val I) Field { return slog.Int64(key, int64(val)) } // Int64P 构造一个带有整数值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func Int64P[I generic.Integer](key string, val *I) Field { +func Int64P[I constraints.Int](key string, val *I) Field { if val == nil { return slog.Any(key, nil) } @@ -118,12 +118,12 @@ func Int64P[I generic.Integer](key string, val *I) Field { } // Uint 构造一个带有整数值的字段 -func Uint[I generic.Integer](key string, val I) Field { +func Uint[I constraints.Int](key string, val I) Field { return slog.Uint64(key, uint64(val)) } // UintP 构造一个带有整数值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func UintP[I generic.Integer](key string, val *I) Field { +func UintP[I constraints.Int](key string, val *I) Field { if val == nil { return slog.Any(key, nil) } @@ -131,12 +131,12 @@ func UintP[I generic.Integer](key string, val *I) Field { } // Uint8 构造一个带有整数值的字段 -func Uint8[I generic.Integer](key string, val I) Field { +func Uint8[I constraints.Int](key string, val I) Field { return slog.Uint64(key, uint64(val)) } // Uint8P 构造一个带有整数值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func Uint8P[I generic.Integer](key string, val *I) Field { +func Uint8P[I constraints.Int](key string, val *I) Field { if val == nil { return slog.Any(key, nil) } @@ -144,12 +144,12 @@ func Uint8P[I generic.Integer](key string, val *I) Field { } // Uint16 构造一个带有整数值的字段 -func Uint16[I generic.Integer](key string, val I) Field { +func Uint16[I constraints.Int](key string, val I) Field { return slog.Uint64(key, uint64(val)) } // Uint16P 构造一个带有整数值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func Uint16P[I generic.Integer](key string, val *I) Field { +func Uint16P[I constraints.Int](key string, val *I) Field { if val == nil { return slog.Any(key, nil) } @@ -157,12 +157,12 @@ func Uint16P[I generic.Integer](key string, val *I) Field { } // Uint32 构造一个带有整数值的字段 -func Uint32[I generic.Integer](key string, val I) Field { +func Uint32[I constraints.Int](key string, val I) Field { return slog.Uint64(key, uint64(val)) } // Uint32P 构造一个带有整数值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func Uint32P[I generic.Integer](key string, val *I) Field { +func Uint32P[I constraints.Int](key string, val *I) Field { if val == nil { return slog.Any(key, nil) } @@ -170,12 +170,12 @@ func Uint32P[I generic.Integer](key string, val *I) Field { } // Uint64 构造一个带有整数值的字段 -func Uint64[I generic.Integer](key string, val I) Field { +func Uint64[I constraints.Int](key string, val I) Field { return slog.Uint64(key, uint64(val)) } // Uint64P 构造一个带有整数值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func Uint64P[I generic.Integer](key string, val *I) Field { +func Uint64P[I constraints.Int](key string, val *I) Field { if val == nil { return slog.Any(key, nil) } @@ -183,12 +183,12 @@ func Uint64P[I generic.Integer](key string, val *I) Field { } // Float 构造一个带有浮点值的字段 -func Float[F generic.Float](key string, val F) Field { +func Float[F constraints.Float](key string, val F) Field { return slog.Float64(key, float64(val)) } // FloatP 构造一个带有浮点值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func FloatP[F generic.Float](key string, val *F) Field { +func FloatP[F constraints.Float](key string, val *F) Field { if val == nil { return slog.Any(key, nil) } @@ -196,12 +196,12 @@ func FloatP[F generic.Float](key string, val *F) Field { } // Float32 构造一个带有浮点值的字段 -func Float32[F generic.Float](key string, val F) Field { +func Float32[F constraints.Float](key string, val F) Field { return slog.Float64(key, float64(val)) } // Float32P 构造一个带有浮点值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func Float32P[F generic.Float](key string, val *F) Field { +func Float32P[F constraints.Float](key string, val *F) Field { if val == nil { return slog.Any(key, nil) } @@ -209,12 +209,12 @@ func Float32P[F generic.Float](key string, val *F) Field { } // Float64 构造一个带有浮点值的字段 -func Float64[F generic.Float](key string, val F) Field { +func Float64[F constraints.Float](key string, val F) Field { return slog.Float64(key, float64(val)) } // Float64P 构造一个带有浮点值的字段。返回的 Field 将在适当的时候安全且显式地表示 "null" -func Float64P[F generic.Float](key string, val *F) Field { +func Float64P[F constraints.Float](key string, val *F) Field { if val == nil { return slog.Any(key, nil) } diff --git a/internal/utils/log/v2/handler.go b/toolkit/log/handler.go similarity index 98% rename from internal/utils/log/v2/handler.go rename to toolkit/log/handler.go index c6b98d51..7ab0fb27 100644 --- a/internal/utils/log/v2/handler.go +++ b/toolkit/log/handler.go @@ -4,6 +4,8 @@ import ( "context" "encoding" "fmt" + "github.com/kercylan98/minotaur/internal/utils/str" + "github.com/kercylan98/minotaur/toolkit/charproc" "io" "log/slog" "runtime" @@ -11,8 +13,6 @@ import ( "strings" "sync" "unicode" - - "github.com/kercylan98/minotaur/utils/str" ) func NewHandler(w io.Writer, opts ...*Options) *MinotaurHandler { @@ -120,7 +120,7 @@ func processTime(buffer *strings.Builder, record slog.Record, opt *Options) { func processLevel(buffer *strings.Builder, record slog.Record, opt *Options) { var levelColor = opt.levelColor[record.Level] var levelText = opt.levelText[record.Level] - if levelText == str.None { + if levelText == charproc.None { return } diff --git a/internal/utils/log/v2/logger.go b/toolkit/log/logger.go similarity index 100% rename from internal/utils/log/v2/logger.go rename to toolkit/log/logger.go diff --git a/internal/utils/log/v2/logger_test.go b/toolkit/log/logger_test.go similarity index 88% rename from internal/utils/log/v2/logger_test.go rename to toolkit/log/logger_test.go index fe36214d..9ee5dde2 100644 --- a/internal/utils/log/v2/logger_test.go +++ b/toolkit/log/logger_test.go @@ -2,7 +2,7 @@ package log_test import ( "errors" - "github.com/kercylan98/minotaur/utils/log/v2" + "github.com/kercylan98/minotaur/toolkit/log" "testing" ) diff --git a/internal/utils/log/v2/multi_handler.go b/toolkit/log/multi_handler.go similarity index 86% rename from internal/utils/log/v2/multi_handler.go rename to toolkit/log/multi_handler.go index 6533cec2..58471017 100644 --- a/internal/utils/log/v2/multi_handler.go +++ b/toolkit/log/multi_handler.go @@ -2,7 +2,7 @@ package log import ( "context" - "github.com/kercylan98/minotaur/utils/super" + "fmt" "log/slog" ) @@ -32,7 +32,14 @@ func (h MultiHandler) Handle(ctx context.Context, record slog.Record) (err error if h.handlers[i].Enabled(ctx, record.Level) { err = func() error { defer func() { - err = super.RecoverTransform(recover()) + if v := recover(); v != nil { + switch v.(type) { + case error: + err = v.(error) + default: + err = fmt.Errorf("recover from panic: %v", v) + } + } }() return h.handlers[i].Handle(ctx, record.Clone()) }() diff --git a/internal/utils/log/v2/options.go b/toolkit/log/options.go similarity index 99% rename from internal/utils/log/v2/options.go rename to toolkit/log/options.go index f75f45c9..67ad38ca 100644 --- a/internal/utils/log/v2/options.go +++ b/toolkit/log/options.go @@ -1,11 +1,12 @@ package log import ( - "github.com/kercylan98/minotaur/utils/collection" - "path/filepath" - "strconv" - "sync" - "time" + "" +"github.com/kercylan98/minotaur/toolkit/collection" +"path/filepath" +"strconv" +"sync" +"time" ) const basicCallSkip = 8 diff --git a/internal/utils/log/v2/stack_trace.go b/toolkit/log/stack_trace.go similarity index 100% rename from internal/utils/log/v2/stack_trace.go rename to toolkit/log/stack_trace.go