remove search Data files

This commit is contained in:
MHSanaei 2023-05-13 15:03:46 +03:30
parent e64a9eeee6
commit 9e8ac8a087
6 changed files with 7 additions and 51 deletions

View File

@ -3,7 +3,6 @@ package controller
import ( import (
"errors" "errors"
"time" "time"
"x-ui/util/common"
"x-ui/web/entity" "x-ui/web/entity"
"x-ui/web/service" "x-ui/web/service"
"x-ui/web/session" "x-ui/web/session"
@ -45,7 +44,6 @@ func (a *SettingController) initRouter(g *gin.RouterGroup) {
g.GET("/getDefaultJsonConfig", a.getDefaultJsonConfig) g.GET("/getDefaultJsonConfig", a.getDefaultJsonConfig)
g.POST("/updateUserSecret", a.updateSecret) g.POST("/updateUserSecret", a.updateSecret)
g.POST("/getUserSecret", a.getUserSecret) g.POST("/getUserSecret", a.getUserSecret)
g.GET("/searchDatafiles", a.searchDatafiles)
} }
func (a *SettingController) getAllSetting(c *gin.Context) { func (a *SettingController) getAllSetting(c *gin.Context) {
@ -159,18 +157,3 @@ func (a *SettingController) getUserSecret(c *gin.Context) {
jsonObj(c, user, nil) jsonObj(c, user, nil)
} }
} }
func (a *SettingController) searchDatafiles(c *gin.Context) {
searchString := c.Query("query")
if searchString == "" {
err := common.NewError("data query parameter is empty")
jsonMsg(c, "Invalid query:", err)
return
}
found, err := a.settingService.SearchDatafiles(searchString)
if err != nil {
jsonMsg(c, "Something went wrong!", err)
return
}
jsonObj(c, found, nil)
}

View File

@ -1,12 +1,10 @@
package service package service
import ( import (
"bufio"
_ "embed" _ "embed"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"os"
"reflect" "reflect"
"strconv" "strconv"
"strings" "strings"
@ -18,7 +16,6 @@ import (
"x-ui/util/random" "x-ui/util/random"
"x-ui/util/reflect_util" "x-ui/util/reflect_util"
"x-ui/web/entity" "x-ui/web/entity"
"x-ui/xray"
) )
//go:embed config.json //go:embed config.json
@ -354,27 +351,3 @@ func (s *SettingService) UpdateAllSetting(allSetting *entity.AllSetting) error {
} }
return common.Combine(errs...) return common.Combine(errs...)
} }
func (s *SettingService) SearchDatafiles(query string) (bool, error) {
// Open the file for reading
file, err := os.Open(xray.GetGeositePath())
if err != nil {
return false, common.NewErrorf("Error opening geosite.dat: %v", err)
}
defer file.Close()
// Create a scanner to read the file line-by-line
scanner := bufio.NewScanner(file)
for scanner.Scan() {
line := scanner.Text()
if strings.Contains(strings.ToLower(line), strings.ToLower(query)) {
return true, nil
}
}
err = scanner.Err()
if err != nil {
return false, common.NewErrorf("Error while scanning geosite.dat: %v", err)
}
return false, nil
}