Skip to content

Commit 69bc0eb

Browse files
committed
refactor(util): extract string equal utility func
1 parent cf63d78 commit 69bc0eb

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

src/serverHandler/aliasAccurate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (alias aliasAccurate) caseSensitive() bool {
2626
}
2727

2828
func (alias aliasAccurate) isMatch(rawReqPath string) bool {
29-
return isNameEqualAccurate(alias.url, rawReqPath)
29+
return util.IsStrEqualAccurate(alias.url, rawReqPath)
3030
}
3131

3232
func (alias aliasAccurate) isSuccessorOf(rawReqPath string) bool {
@@ -38,5 +38,5 @@ func (alias aliasAccurate) isPredecessorOf(rawReqPath string) bool {
3838
}
3939

4040
func (alias aliasAccurate) namesEqual(a, b string) bool {
41-
return isNameEqualAccurate(a, b)
41+
return util.IsStrEqualAccurate(a, b)
4242
}

src/serverHandler/aliasNoCase.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (alias aliasNoCase) caseSensitive() bool {
2626
}
2727

2828
func (alias aliasNoCase) isMatch(rawReqPath string) bool {
29-
return isNameEqualNoCase(alias.url, rawReqPath)
29+
return util.IsStrEqualNoCase(alias.url, rawReqPath)
3030
}
3131

3232
func (alias aliasNoCase) isSuccessorOf(rawReqPath string) bool {
@@ -38,5 +38,5 @@ func (alias aliasNoCase) isPredecessorOf(rawReqPath string) bool {
3838
}
3939

4040
func (alias aliasNoCase) namesEqual(a, b string) bool {
41-
return isNameEqualNoCase(a, b)
41+
return util.IsStrEqualNoCase(a, b)
4242
}

src/serverHandler/util.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package serverHandler
22

33
import (
44
"../acceptHeaders"
5+
"../util"
56
"compress/flate"
67
"compress/gzip"
78
"io"
@@ -92,19 +93,11 @@ func isNameCaseSensitive(info os.FileInfo) bool {
9293
return true
9394
}
9495

95-
func isNameEqualAccurate(a, b string) bool {
96-
return a == b
97-
}
98-
99-
func isNameEqualNoCase(a, b string) bool {
100-
return strings.EqualFold(a, b)
101-
}
102-
10396
func getIsNameEqualFunc(info os.FileInfo) func(a, b string) bool {
10497
if isNameCaseSensitive(info) {
105-
return isNameEqualAccurate
98+
return util.IsStrEqualAccurate
10699
} else {
107-
return isNameEqualNoCase
100+
return util.IsStrEqualNoCase
108101
}
109102
}
110103

src/util/str.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package util
2+
3+
import "strings"
4+
5+
func IsStrEqualAccurate(a, b string) bool {
6+
return a == b
7+
}
8+
9+
func IsStrEqualNoCase(a, b string) bool {
10+
return strings.EqualFold(a, b)
11+
}

0 commit comments

Comments
 (0)