mirror of
https://github.com/ddworken/hishtory.git
synced 2025-06-25 14:32:14 +02:00
Rename deEscape to unescape
This commit is contained in:
parent
f79ab37bcf
commit
b6eb4da4f3
@ -1150,14 +1150,14 @@ func Search(ctx *context.Context, db *gorm.DB, query string, limit int) ([]*data
|
|||||||
}
|
}
|
||||||
|
|
||||||
func parseNonAtomizedToken(token string) (string, interface{}, interface{}, interface{}, error) {
|
func parseNonAtomizedToken(token string) (string, interface{}, interface{}, interface{}, error) {
|
||||||
wildcardedToken := "%" + deEscape(token) + "%"
|
wildcardedToken := "%" + unescape(token) + "%"
|
||||||
return "(command LIKE ? OR hostname LIKE ? OR current_working_directory LIKE ?)", wildcardedToken, wildcardedToken, wildcardedToken, nil
|
return "(command LIKE ? OR hostname LIKE ? OR current_working_directory LIKE ?)", wildcardedToken, wildcardedToken, wildcardedToken, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseAtomizedToken(ctx *context.Context, token string) (string, interface{}, interface{}, error) {
|
func parseAtomizedToken(ctx *context.Context, token string) (string, interface{}, interface{}, error) {
|
||||||
splitToken := splitEscaped(token, ':', 2)
|
splitToken := splitEscaped(token, ':', 2)
|
||||||
field := deEscape(splitToken[0])
|
field := unescape(splitToken[0])
|
||||||
val := deEscape(splitToken[1])
|
val := unescape(splitToken[1])
|
||||||
switch field {
|
switch field {
|
||||||
case "user":
|
case "user":
|
||||||
return "(local_username = ?)", val, nil, nil
|
return "(local_username = ?)", val, nil, nil
|
||||||
@ -1273,7 +1273,7 @@ func containsUnescaped(query string, token string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
func deEscape(query string) string {
|
func unescape(query string) string {
|
||||||
runeQuery := []rune(query)
|
runeQuery := []rune(query)
|
||||||
var newQuery []rune
|
var newQuery []rune
|
||||||
for i := 0; i < len(runeQuery); i++ {
|
for i := 0; i < len(runeQuery); i++ {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user