ProjectHentai/alist
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andy Hsu 2023-09-22 15:20:04 +08:00
parent 2a6ab77295
commit 882112ed1c
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/utils/hash.go
View File

@ -218,3 +218,7 @@ func FromString(str string) HashInfo {
func (hi HashInfo) GetHash(ht *HashType) string { func (hi HashInfo) GetHash(ht *HashType) string {
return hi.h[ht] return hi.h[ht]
} }
func (hi HashInfo) Export() map[*HashType]string {
return hi.h
}

9
server/handles/fsread.go
View File

@ -41,7 +41,8 @@ type ObjResp struct {
Sign string `json:"sign"` Sign string `json:"sign"`
Thumb string `json:"thumb"` Thumb string `json:"thumb"`
Type int `json:"type"` Type int `json:"type"`
HashInfo string `json:"hashinfo"` HashInfoStr string `json:"hashinfo"`
HashInfo map[*utils.HashType]string `json:"hash_info"`
} }
type FsListResp struct { type FsListResp struct {
@ -205,7 +206,8 @@ func toObjsResp(objs []model.Obj, parent string, encrypt bool) []ObjResp {
IsDir: obj.IsDir(), IsDir: obj.IsDir(),
Modified: obj.ModTime(), Modified: obj.ModTime(),
Created: obj.CreateTime(), Created: obj.CreateTime(),
HashInfo: obj.GetHash().String(), HashInfoStr: obj.GetHash().String(),
HashInfo: obj.GetHash().Export(),
Sign: common.Sign(obj, parent, encrypt), Sign: common.Sign(obj, parent, encrypt),
Thumb: thumb, Thumb: thumb,
Type: utils.GetObjType(obj.GetName(), obj.IsDir()), Type: utils.GetObjType(obj.GetName(), obj.IsDir()),
@ -318,7 +320,8 @@ func FsGet(c *gin.Context) {
IsDir: obj.IsDir(), IsDir: obj.IsDir(),
Modified: obj.ModTime(), Modified: obj.ModTime(),
Created: obj.CreateTime(), Created: obj.CreateTime(),
HashInfo: obj.GetHash().String(), HashInfoStr: obj.GetHash().String(),
HashInfo: obj.GetHash().Export(),
Sign: common.Sign(obj, parentPath, isEncrypt(meta, reqPath)), Sign: common.Sign(obj, parentPath, isEncrypt(meta, reqPath)),
Type: utils.GetFileType(obj.GetName()), Type: utils.GetFileType(obj.GetName()),
Thumb: thumb, Thumb: thumb,