feat: add hash_info field to /fs/get (close #5259)

AlistGo · Sep 22, 2023 · 882112e · 882112e
1 parent 2a6ab77
commit 882112e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 27 deletions.
diff --git a/pkg/utils/hash.go b/pkg/utils/hash.go
@@ -218,3 +218,7 @@ func FromString(str string) HashInfo {
 func (hi HashInfo) GetHash(ht *HashType) string {
 	return hi.h[ht]
 }
+
+func (hi HashInfo) Export() map[*HashType]string {
+	return hi.h
+}
diff --git a/server/handles/fsread.go b/server/handles/fsread.go
@@ -33,15 +33,16 @@ type DirReq struct {
 }
 
 type ObjResp struct {
-	Name     string    `json:"name"`
-	Size     int64     `json:"size"`
-	IsDir    bool      `json:"is_dir"`
-	Modified time.Time `json:"modified"`
-	Created  time.Time `json:"created"`
-	Sign     string    `json:"sign"`
-	Thumb    string    `json:"thumb"`
-	Type     int       `json:"type"`
-	HashInfo string    `json:"hashinfo"`
+	Name        string                     `json:"name"`
+	Size        int64                      `json:"size"`
+	IsDir       bool                       `json:"is_dir"`
+	Modified    time.Time                  `json:"modified"`
+	Created     time.Time                  `json:"created"`
+	Sign        string                     `json:"sign"`
+	Thumb       string                     `json:"thumb"`
+	Type        int                        `json:"type"`
+	HashInfoStr string                     `json:"hashinfo"`
+	HashInfo    map[*utils.HashType]string `json:"hash_info"`
 }
 
 type FsListResp struct {
@@ -200,15 +201,16 @@ func toObjsResp(objs []model.Obj, parent string, encrypt bool) []ObjResp {
 	for _, obj := range objs {
 		thumb, _ := model.GetThumb(obj)
 		resp = append(resp, ObjResp{
-			Name:     obj.GetName(),
-			Size:     obj.GetSize(),
-			IsDir:    obj.IsDir(),
-			Modified: obj.ModTime(),
-			Created:  obj.CreateTime(),
-			HashInfo: obj.GetHash().String(),
-			Sign:     common.Sign(obj, parent, encrypt),
-			Thumb:    thumb,
-			Type:     utils.GetObjType(obj.GetName(), obj.IsDir()),
+			Name:        obj.GetName(),
+			Size:        obj.GetSize(),
+			IsDir:       obj.IsDir(),
+			Modified:    obj.ModTime(),
+			Created:     obj.CreateTime(),
+			HashInfoStr: obj.GetHash().String(),
+			HashInfo:    obj.GetHash().Export(),
+			Sign:        common.Sign(obj, parent, encrypt),
+			Thumb:       thumb,
+			Type:        utils.GetObjType(obj.GetName(), obj.IsDir()),
 		})
 	}
 	return resp
@@ -313,15 +315,16 @@ func FsGet(c *gin.Context) {
 	thumb, _ := model.GetThumb(obj)
 	common.SuccessResp(c, FsGetResp{
 		ObjResp: ObjResp{
-			Name:     obj.GetName(),
-			Size:     obj.GetSize(),
-			IsDir:    obj.IsDir(),
-			Modified: obj.ModTime(),
-			Created:  obj.CreateTime(),
-			HashInfo: obj.GetHash().String(),
-			Sign:     common.Sign(obj, parentPath, isEncrypt(meta, reqPath)),
-			Type:     utils.GetFileType(obj.GetName()),
-			Thumb:    thumb,
+			Name:        obj.GetName(),
+			Size:        obj.GetSize(),
+			IsDir:       obj.IsDir(),
+			Modified:    obj.ModTime(),
+			Created:     obj.CreateTime(),
+			HashInfoStr: obj.GetHash().String(),
+			HashInfo:    obj.GetHash().Export(),
+			Sign:        common.Sign(obj, parentPath, isEncrypt(meta, reqPath)),
+			Type:        utils.GetFileType(obj.GetName()),
+			Thumb:       thumb,
 		},
 		RawURL:   rawURL,
 		Readme:   getReadme(meta, reqPath),