summaryrefslogtreecommitdiffstats
path: root/modules/base
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2023-12-28 17:38:59 +0800
committerGitHub <noreply@github.com>2023-12-28 09:38:59 +0000
commitf3999888c0b765380003f814f9c3d5cf80128167 (patch)
tree757e14c4cff65a4f123c248ceda20960ee8144ca /modules/base
parent921df1cbad83dcba37ff12cba88c7d3a69f8588b (diff)
downloadgitea-f3999888c0b765380003f814f9c3d5cf80128167.tar.gz
gitea-f3999888c0b765380003f814f9c3d5cf80128167.zip
Refactor some legacy code and remove unused code (#28622)
1. use slices.Contains, remove Int64sContains 2. use HashEmail, remove base.EncodeMD5 3. remove BasicAuthEncode, IsLetter
Diffstat (limited to 'modules/base')
-rw-r--r--modules/base/tool.go30
-rw-r--r--modules/base/tool_test.go35
2 files changed, 0 insertions, 65 deletions
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 71dcb83fb4..e9f4dfa279 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -4,7 +4,6 @@
package base
import (
- "crypto/md5"
"crypto/sha1"
"encoding/base64"
"encoding/hex"
@@ -16,7 +15,6 @@ import (
"strconv"
"strings"
"time"
- "unicode"
"unicode/utf8"
"code.gitea.io/gitea/modules/git"
@@ -27,13 +25,6 @@ import (
"github.com/minio/sha256-simd"
)
-// EncodeMD5 encodes string to md5 hex value.
-func EncodeMD5(str string) string {
- m := md5.New()
- _, _ = m.Write([]byte(str))
- return hex.EncodeToString(m.Sum(nil))
-}
-
// EncodeSha1 string to sha1 hex value.
func EncodeSha1(str string) string {
h := sha1.New()
@@ -70,11 +61,6 @@ func BasicAuthDecode(encoded string) (string, string, error) {
return auth[0], auth[1], nil
}
-// BasicAuthEncode encode basic auth string
-func BasicAuthEncode(username, password string) string {
- return base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-}
-
// VerifyTimeLimitCode verify time limit code
func VerifyTimeLimitCode(data string, minutes int, code string) bool {
if len(code) <= 18 {
@@ -184,22 +170,6 @@ func Int64sToStrings(ints []int64) []string {
return strs
}
-// Int64sContains returns if a int64 in a slice of int64
-func Int64sContains(intsSlice []int64, a int64) bool {
- for _, c := range intsSlice {
- if c == a {
- return true
- }
- }
- return false
-}
-
-// IsLetter reports whether the rune is a letter (category L).
-// https://github.com/golang/go/blob/c3b4918/src/go/scanner/scanner.go#L342
-func IsLetter(ch rune) bool {
- return 'a' <= ch && ch <= 'z' || 'A' <= ch && ch <= 'Z' || ch == '_' || ch >= 0x80 && unicode.IsLetter(ch)
-}
-
// EntryIcon returns the octicon class for displaying files/directories
func EntryIcon(entry *git.TreeEntry) string {
switch {
diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go
index 0c3e76704e..d28deb593d 100644
--- a/modules/base/tool_test.go
+++ b/modules/base/tool_test.go
@@ -11,13 +11,6 @@ import (
"github.com/stretchr/testify/assert"
)
-func TestEncodeMD5(t *testing.T) {
- assert.Equal(t,
- "3858f62230ac3c915f300c664312c63f",
- EncodeMD5("foobar"),
- )
-}
-
func TestEncodeSha1(t *testing.T) {
assert.Equal(t,
"8843d7f92416211de9ebb963ff4ce28125932878",
@@ -52,11 +45,6 @@ func TestBasicAuthDecode(t *testing.T) {
assert.Error(t, err)
}
-func TestBasicAuthEncode(t *testing.T) {
- assert.Equal(t, "Zm9vOmJhcg==", BasicAuthEncode("foo", "bar"))
- assert.Equal(t, "MjM6IjotLS0t", BasicAuthEncode("23:\"", "----"))
-}
-
func TestVerifyTimeLimitCode(t *testing.T) {
tc := []struct {
data string
@@ -167,29 +155,6 @@ func TestInt64sToStrings(t *testing.T) {
)
}
-func TestInt64sContains(t *testing.T) {
- assert.True(t, Int64sContains([]int64{6, 44324, 4324, 32, 1, 2323}, 1))
- assert.True(t, Int64sContains([]int64{2323}, 2323))
- assert.False(t, Int64sContains([]int64{6, 44324, 4324, 32, 1, 2323}, 232))
-}
-
-func TestIsLetter(t *testing.T) {
- assert.True(t, IsLetter('a'))
- assert.True(t, IsLetter('e'))
- assert.True(t, IsLetter('q'))
- assert.True(t, IsLetter('z'))
- assert.True(t, IsLetter('A'))
- assert.True(t, IsLetter('E'))
- assert.True(t, IsLetter('Q'))
- assert.True(t, IsLetter('Z'))
- assert.True(t, IsLetter('_'))
- assert.False(t, IsLetter('-'))
- assert.False(t, IsLetter('1'))
- assert.False(t, IsLetter('$'))
- assert.False(t, IsLetter(0x00))
- assert.False(t, IsLetter(0x93))
-}
-
// TODO: Test EntryIcon
func TestSetupGiteaRoot(t *testing.T) {