refactor(backend): enhance DownloadShare functionality with context management and improve Redis share info handling

pkg/models/file.go

@@ -3,8 +3,10 @@ package models
 import (
 	"encoding/json"
 	"pkg/utils"
+	"time"
 
 	"github.com/redis/rueidis"
+	"github.com/spf13/cast"
 )
 
 type FileInfo struct {
@@ -25,6 +27,7 @@ type RedisFileInfo struct {
 	FileInfo
 	FileType  FileType `json:"type"`
 	CreatedAt int64    `json:"created_at"`
+	UpdatedAt int64    `json:"updated_at"`
 	Expire    int64    `json:"expire"` // 只有上传文件(init)的时候有这个字段
 }
 
@@ -44,21 +47,28 @@ func GetRedisFileInfo(fileId string) (*RedisFileInfo, error) {
 	return &fileInfoData, nil
 }
 
-func SetRedisFileInfo(fileId string, handler func(fileInfo *RedisFileInfo) *RedisFileInfo) error {
+func SetRedisFileInfo(fileId string, handler func(fileInfo *RedisFileInfo) *RedisFileInfo) (*RedisFileInfo, error) {
 	rdb, ctx := utils.GetRedisClient()
 	old_fileInfo, err := GetRedisFileInfo(fileId)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	if old_fileInfo == nil {
-		old_fileInfo = &RedisFileInfo{}
+		old_fileInfo = &RedisFileInfo{
+			CreatedAt: time.Now().Unix(),
+			Expire:    cast.ToInt64(utils.GetEnvWithDefault("upload.remove_expire", "2")) * 3600,
+		}
 	}
 	fileInfo := handler(old_fileInfo)
+	fileInfo.UpdatedAt = time.Now().Unix()
 	jsonData, err := json.Marshal(fileInfo)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return rdb.Do(ctx, rdb.B().Hset().Key("015:fileInfoMap").FieldValue().FieldValue(fileId, string(jsonData)).Build()).Error()
+	if err := rdb.Do(ctx, rdb.B().Hset().Key("015:fileInfoMap").FieldValue().FieldValue(fileId, string(jsonData)).Build()).Error(); err != nil {
+		return nil, err
+	}
+	return fileInfo, nil
 }
 
 func GetRedisFileInfoAll() (map[string]string, error) {

pkg/models/share.go

@@ -13,6 +13,7 @@ import (
 type RedisShareInfo struct {
 	// Id          string    `json:"id"`
 	CreatedAt   int64     `json:"created_at"`
+	UpdatedAt   int64     `json:"updated_at"`
 	Owner       string    `json:"owner"`
 	Type        ShareType `json:"type"`
 	Data        string    `json:"data"` // 分享数据 文件分享为文件id 文本分享为文本内容
@@ -51,26 +52,32 @@ func GetRedisShareInfo(shareId string) (*RedisShareInfo, error) {
 	return &shareInfoData, nil
 }
 
-func SetRedisShareInfo(shareId string, handler func(shareInfo *RedisShareInfo) *RedisShareInfo) error {
+func SetRedisShareInfo(shareId string, handler func(shareInfo *RedisShareInfo) *RedisShareInfo) (*RedisShareInfo, error) {
 	rdb, ctx := utils.GetRedisClient()
 	old_shareInfo, err := GetRedisShareInfo(shareId)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	if old_shareInfo == nil {
-		old_shareInfo = &RedisShareInfo{}
+		old_shareInfo = &RedisShareInfo{
+			CreatedAt: time.Now().Unix(),
+		}
 	}
 	shareInfo := handler(old_shareInfo)
+	shareInfo.UpdatedAt = time.Now().Unix()
 	jsonData, err := json.Marshal(shareInfo)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return rdb.Do(
+	if err := rdb.Do(
 		ctx,
 		rdb.B().Set().
 			Key(fmt.Sprintf("015:shareInfoMap:%s", shareId)).
 			Value(string(jsonData)).
 			Ex(time.Until(time.Unix(shareInfo.ExpireAt, 0))).
 			Build(),
-	).Error()
+	).Error(); err != nil {
+		return nil, err
+	}
+	return shareInfo, nil
 }

pkg/models/stat.go

@@ -33,28 +33,32 @@ func GetRedisStat(key string) (*StatData, error) {
 	return &stat, nil
 }
 
-func SetRedisStat(key string, handler func(stat *StatData) *StatData) error {
-	return utils.WithLocker(context.Background(), "015:stat:"+key, 0, func(ctx context.Context) error {
+func SetRedisStat(key string, handler func(stat *StatData) *StatData) (*StatData, error) {
+	var updatedStat *StatData
+	err := utils.WithLocker(context.Background(), "015:stat:"+key, 0, func(ctx context.Context) error {
 		rdb, _ := utils.GetRedisClient()
 		old_stat, err := GetRedisStat(key)
 		if err != nil {
 			return err
 		}
 		if old_stat == nil {
-			old_stat = &StatData{
-				FileSize:    0,
-				FileNum:     0,
-				ShareNum:    0,
-				DownloadNum: 0,
-			}
+			old_stat = &StatData{}
 		}
 		stat := handler(old_stat)
 		jsonData, err := json.Marshal(stat)
 		if err != nil {
 			return err
 		}
-		return rdb.Do(ctx, rdb.B().Hset().Key("015:stat").FieldValue().FieldValue(key, string(jsonData)).Build()).Error()
+		if err := rdb.Do(ctx, rdb.B().Hset().Key("015:stat").FieldValue().FieldValue(key, string(jsonData)).Build()).Error(); err != nil {
+			return err
+		}
+		updatedStat = stat
+		return nil
 	})
+	if err != nil {
+		return nil, err
+	}
+	return updatedStat, nil
 }
 
 func GetRedisStatAll() (map[string]string, error) {