wsy182/Cloudreve
1
0
Fork 0
mirror of https://github.com/halejohn/Cloudreve.git synced 2026-01-28 10:51:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: refresh interval not working

Browse Source
This commit is contained in:
HFO4
2021-11-30 19:26:35 +08:00
parent af4d9767c2
commit 84d81f201f
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets

Submodule assets updated: 691e82868d...88c1133306

8
pkg/serializer/aria2.go
View File

@@ -76,9 +76,8 @@ func BuildFinishedListResponse(tasks []model.Download) Response {
} }
// BuildDownloadingResponse 构建正在下载的列表响应 // BuildDownloadingResponse 构建正在下载的列表响应
func BuildDownloadingResponse(tasks []model.Download) Response { func BuildDownloadingResponse(tasks []model.Download, intervals map[uint]int) Response {
resp := make([]DownloadListResponse, 0, len(tasks)) resp := make([]DownloadListResponse, 0, len(tasks))
interval := model.GetIntSetting("aria2_interval", 10)
for i := 0; i < len(tasks); i++ { for i := 0; i < len(tasks); i++ {
fileName := "" fileName := ""
@@ -92,6 +91,11 @@ func BuildDownloadingResponse(tasks []model.Download) Response {
tasks[i].StatusInfo.Files[i2].Path = path.Base(tasks[i].StatusInfo.Files[i2].Path) tasks[i].StatusInfo.Files[i2].Path = path.Base(tasks[i].StatusInfo.Files[i2].Path)
} }
interval := 10
if actualInterval, ok := intervals[tasks[i].ID]; ok {
interval = actualInterval
}
resp = append(resp, DownloadListResponse{ resp = append(resp, DownloadListResponse{
UpdateTime: tasks[i].UpdatedAt, UpdateTime: tasks[i].UpdatedAt,
UpdateInterval: interval, UpdateInterval: interval,

4
pkg/serializer/aria2_test.go
View File

@@ -82,10 +82,12 @@ func TestBuildDownloadingResponse(t *testing.T) {
}, },
} }
tasks[1].StatusInfo.BitTorrent.Info.Name = "name.txt" tasks[1].StatusInfo.BitTorrent.Info.Name = "name.txt"
tasks[1].ID = 1
res := BuildDownloadingResponse(tasks).Data.([]DownloadListResponse) res := BuildDownloadingResponse(tasks, map[uint]int{1: 5}).Data.([]DownloadListResponse)
asserts.Len(res, 2) asserts.Len(res, 2)
asserts.Equal("name1.txt", res[1].Name) asserts.Equal("name1.txt", res[1].Name)
asserts.Equal(5, res[1].UpdateInterval)
asserts.Equal("name.txt", res[0].Name) asserts.Equal("name.txt", res[0].Name)
asserts.Equal("name.txt", res[0].Info.Files[0].Path) asserts.Equal("name.txt", res[0].Info.Files[0].Path)
asserts.Equal("name1.txt", res[1].Info.Files[0].Path) asserts.Equal("name1.txt", res[1].Info.Files[0].Path)

11
service/aria2/manage.go
View File

@@ -34,7 +34,16 @@ func (service *DownloadListService) Finished(c *gin.Context, user *model.User) s
func (service *DownloadListService) Downloading(c *gin.Context, user *model.User) serializer.Response { func (service *DownloadListService) Downloading(c *gin.Context, user *model.User) serializer.Response {
// 查找下载记录 // 查找下载记录
downloads := model.GetDownloadsByStatusAndUser(service.Page, user.ID, common.Downloading, common.Paused, common.Ready) downloads := model.GetDownloadsByStatusAndUser(service.Page, user.ID, common.Downloading, common.Paused, common.Ready)
return serializer.BuildDownloadingResponse(downloads) intervals := make(map[uint]int)
for _, download := range downloads {
if _, ok := intervals[download.ID]; !ok {
if node := cluster.Default.GetNodeByID(download.GetNodeID()); node != nil {
intervals[download.ID] = node.DBModel().Aria2OptionsSerialized.Interval
}
}
}
return serializer.BuildDownloadingResponse(downloads, intervals)
} }
// Delete 取消或删除下载任务 // Delete 取消或删除下载任务