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

Feat: group-defined aria2 download options

Browse Source
This commit is contained in:
HFO4
2020-02-06 10:27:20 +08:00
parent c29695a40d
commit cde49e6e98
5 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/aria2/aria2.go
View File

@@ -1,6 +1,7 @@
package aria2
import (
"encoding/json"
model "github.com/HFO4/cloudreve/models"
"github.com/HFO4/cloudreve/pkg/serializer"
"github.com/HFO4/cloudreve/pkg/util"
@@ -17,7 +18,7 @@ var EventNotifier = &Notifier{}
// Aria2 离线下载处理接口
type Aria2 interface {
// CreateTask 创建新的任务
CreateTask(task *model.Download) error
CreateTask(task *model.Download, options []interface{}) error
// 返回状态信息
Status(task *model.Download) (rpc.StatusInfo, error)
// 取消任务
@@ -52,7 +53,8 @@ const (
var (
// ErrNotEnabled 功能未开启错误
ErrNotEnabled = serializer.NewError(serializer.CodeNoPermissionErr, "离线下载功能未开启", nil)
ErrNotEnabled = serializer.NewError(serializer.CodeNoPermissionErr, "离线下载功能未开启", nil)
// ErrUserNotFound 未找到下载任务创建者
ErrUserNotFound = serializer.NewError(serializer.CodeNotFound, "无法找到任务创建者", nil)
)
@@ -61,7 +63,7 @@ type DummyAria2 struct {
}
// CreateTask 创建新任务，此处直接返回未开启错误
func (instance *DummyAria2) CreateTask(task *model.Download) error {
func (instance *DummyAria2) CreateTask(model *model.Download, options []interface{}) error {
return ErrNotEnabled
}
@@ -104,7 +106,13 @@ func Init() {
server.Path = "/jsonrpc"
// todo 加载自定义下载配置
if err := client.Init(server.String(), options["aria2_token"], timeout, []interface{}{}); err != nil {
var globalOptions []interface{}
err = json.Unmarshal([]byte(options["aria2_options"]), &globalOptions)
if err != nil {
util.Log().Warning("无法解析 aria2 全局配置，%s", err)
}
if err := client.Init(server.String(), options["aria2_token"], timeout, globalOptions); err != nil {
util.Log().Warning("初始化 aria2 RPC 服务失败，%s", err)
return
}

5
pkg/aria2/caller.go
View File

@@ -78,7 +78,7 @@ func (client *RPCService) Select(task *model.Download, files []int) error {
}
// CreateTask 创建新任务
func (client *RPCService) CreateTask(task *model.Download) error {
func (client *RPCService) CreateTask(task *model.Download, groupOptions []interface{}) error {
// 生成存储路径
path := filepath.Join(
model.GetSettingByName("aria2_temp_path"),
@@ -89,8 +89,9 @@ func (client *RPCService) CreateTask(task *model.Download) error {
// 创建下载任务
options := []interface{}{map[string]string{"dir": path}}
if len(client.options.Options) > 0 {
options = append(options, client.options.Options)
options = append(options, client.options.Options...)
}
options = append(options, groupOptions...)
gid, err := client.caller.AddURI(task.Source, options...)
if err != nil || gid == "" {