搜索结果只展示名称，不展示文件名。

Rvn0xsy · Sep 18, 2021 · 46555f4 · 46555f4
1 parent 4c0802b
commit 46555f4
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/pkg/search.go b/pkg/search.go
@@ -37,6 +37,11 @@ type SearchDbStruct struct {
 	Data []DataStruct`json:"data"`
 }
 
+type SearchResultStruct struct {
+	Filename string
+	Name string
+}
+
 func checkSliceContains(slice []string,value string) bool{
 	for _,v := range slice{
 		if value == v || strings.Contains(v,value) || strings.HasPrefix(v,value){
@@ -60,9 +65,9 @@ func Search(file string,keyword string)  {
 	}
 }
 
-func ShowDetails(file string)  {
+func ShowDetails(file SearchResultStruct)  {
 	Data := new(SearchDataStruct)
-	yamlFile, err := ioutil.ReadFile(SearchDbDir+ utils.GetPathSeparator() + file)
+	yamlFile, err := ioutil.ReadFile(SearchDbDir+ utils.GetPathSeparator() + file.Filename)
 	utils.CheckErrorOnExit(err)
 	err = yaml.Unmarshal(yamlFile, Data)
 	utils.CheckErrorOnExit(err)
@@ -72,7 +77,7 @@ func ShowDetails(file string)  {
 	fmt.Println(Data.Data)
 }
 
-func SelectOneResult(fileList []string)  {
+func SelectOneResult(fileList []SearchResultStruct)  {
 	var(
 		i = 0
 		count int
@@ -83,7 +88,7 @@ func SelectOneResult(fileList []string)  {
 	}
 
 	for n,f := range fileList{
-		fmt.Println(n,") ",f)
+		fmt.Println(n,") ",f.Name)
 	}
 
 	count = len(fileList)
@@ -111,15 +116,18 @@ func getDataStruct(file string) (Data * DataStruct ){
 	return Data
 }
 
-func SearchDB(file string,keyword string) (yamlFile []string) {
+func SearchDB(file string,keyword string) (yamlFile []SearchResultStruct) {
 	Data := new(SearchDbStruct)
 	DbFile, err := ioutil.ReadFile(file)
 	utils.CheckErrorOnExit(err)
 	err = json.Unmarshal(DbFile, Data)
 	utils.CheckErrorOnExit(err)
 	for _,o := range Data.Data{
 		if checkSliceContains(o.Tags,keyword) {
-			yamlFile = append(yamlFile,o.File)
+			yamlFile = append(yamlFile, struct {
+				Filename string
+				Name     string
+			}{Filename: o.File, Name: o.Name})
 		}
 	}
 	return yamlFile