From 3e268d10876cdb4c3a10b5b19df40f9273ff8f19 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sat, 05 Apr 2025 19:07:57 +0800 Subject: [PATCH] ansiec: Move ansi escape codes to this module --- ansiec/colors.go | 23 +++++++++++++++++++++++ ansiec/reset.go | 3 +++ ansiec/style.go | 8 ++++++++ git_hooks_handle_linux.go | 2 +- git_hooks_handle_other.go | 2 +- go.sum | 2 -- ssh_server.go | 2 +- ssh_utils.go | 2 +- diff --git a/ansiec/colors.go b/ansiec/colors.go new file mode 100644 index 0000000000000000000000000000000000000000..fa8ea4f9b5cd8101498ab3fde13bc780b4b4f3e4 --- /dev/null +++ b/ansiec/colors.go @@ -0,0 +1,23 @@ +package ansiec + +var ( + Black = "\x1b[30m" + Red = "\x1b[31m" + Green = "\x1b[32m" + Yellow = "\x1b[33m" + Blue = "\x1b[34m" + Magenta = "\x1b[35m" + Cyan = "\x1b[36m" + White = "\x1b[37m" +) + +var ( + BrightBlack = "\x1b[30;1m" + BrightRed = "\x1b[31;1m" + BrightGreen = "\x1b[32;1m" + BrightYellow = "\x1b[33;1m" + BrightBlue = "\x1b[34;1m" + BrightMagenta = "\x1b[35;1m" + BrightCyan = "\x1b[36;1m" + BrightWhite = "\x1b[37;1m" +) diff --git a/ansiec/reset.go b/ansiec/reset.go new file mode 100644 index 0000000000000000000000000000000000000000..82a56d5cdb4e8a3a6633010a81b5c349afb5f588 --- /dev/null +++ b/ansiec/reset.go @@ -0,0 +1,3 @@ +package ansiec + +var Reset = "\x1b[0m" diff --git a/ansiec/style.go b/ansiec/style.go new file mode 100644 index 0000000000000000000000000000000000000000..18050df5714e5d2e495fb9684c414694909fd931 --- /dev/null +++ b/ansiec/style.go @@ -0,0 +1,8 @@ +package ansiec + +var ( + Bold = "\x1b[1m" + Underline = "\x1b[4m" + Reversed = "\x1b[7m" + Italic = "\x1b[3m" +) diff --git a/git_hooks_handle_linux.go b/git_hooks_handle_linux.go index 440bd46741b0a00b04a44da053c3d23b8d47bf43..8c8d34b99bb68a64570a49c3d1eaee784e1516b0 100644 --- a/git_hooks_handle_linux.go +++ b/git_hooks_handle_linux.go @@ -23,8 +23,8 @@ "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/jackc/pgx/v5" + "go.lindenii.runxiyu.org/forge/ansiec" "go.lindenii.runxiyu.org/forge/misc" - "go.lindenii.runxiyu.org/lindenii-common/ansiec" ) var ( diff --git a/git_hooks_handle_other.go b/git_hooks_handle_other.go index d0c7088a5c7a12455a90e1bb135f5c792bdc4e5e..fdeca8303b360e783a3a5325371d9ab2a05e2d45 100644 --- a/git_hooks_handle_other.go +++ b/git_hooks_handle_other.go @@ -21,8 +21,8 @@ "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/jackc/pgx/v5" + "go.lindenii.runxiyu.org/forge/ansiec" "go.lindenii.runxiyu.org/forge/misc" - "go.lindenii.runxiyu.org/lindenii-common/ansiec" ) var errGetFD = errors.New("unable to get file descriptor") diff --git a/go.sum b/go.sum index c32bcfec242b97ccf391447f8691599aea2b6a52..be8af73cdef1123745690c783a14ec6fa4f4d2b2 100644 --- a/go.sum +++ b/go.sum @@ -114,8 +114,6 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tdewolff/minify/v2 v2.22.4 h1:0/8K2fheOuYr5B4e5oCE1hGBVX6DQHLP0EGzdsDlYeg= github.com/tdewolff/minify/v2 v2.22.4/go.mod h1:K/R8TT7aivpcU8QCNUU1UdR6etfnFPr7L11TO/X7shk= -github.com/tdewolff/parse/v2 v2.7.21 h1:OCuPFtGr4mXdnfKikQlUb0n654ROJANhBqCk+wioJ/A= -github.com/tdewolff/parse/v2 v2.7.21/go.mod h1:I7TXO37t3aSG9SlPUBefAhgIF8nt7yYUwVGgETIoBcA= github.com/tdewolff/parse/v2 v2.7.22 h1:ROVbrjtp5RoXi22YSZaOks5DaOcXBJ3PZO5hyyQ9Bbs= github.com/tdewolff/parse/v2 v2.7.22/go.mod h1:I7TXO37t3aSG9SlPUBefAhgIF8nt7yYUwVGgETIoBcA= github.com/tdewolff/test v1.0.11 h1:FdLbwQVHxqG16SlkGveC0JVyrJN62COWTRyUFzfbtBE= diff --git a/ssh_server.go b/ssh_server.go index 345d47fc85c50adb0448ec19ac9fa44d45b87b6e..c1b8c8a3b8ac851df9ba002201754733a0eada40 100644 --- a/ssh_server.go +++ b/ssh_server.go @@ -11,8 +11,8 @@ "os" "strings" gliderSSH "github.com/gliderlabs/ssh" + "go.lindenii.runxiyu.org/forge/ansiec" "go.lindenii.runxiyu.org/forge/misc" - "go.lindenii.runxiyu.org/lindenii-common/ansiec" goSSH "golang.org/x/crypto/ssh" ) diff --git a/ssh_utils.go b/ssh_utils.go index 54e9cb03692eeaf23966d8203f79565c86f96147..476fc313a5d10ce0be314542f501bad473f5bf66 100644 --- a/ssh_utils.go +++ b/ssh_utils.go @@ -10,7 +10,7 @@ "fmt" "io" "net/url" - "go.lindenii.runxiyu.org/lindenii-common/ansiec" + "go.lindenii.runxiyu.org/forge/ansiec" ) var errIllegalSSHRepoPath = errors.New("illegal SSH repo path") -- 2.48.1